<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[182984] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/182984">182984</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2015-04-18 07:57:19 -0700 (Sat, 18 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>SwipeShadow images are installed on iOS
https://bugs.webkit.org/show_bug.cgi?id=143915
Reviewed by Tim Horton.
* Configurations/WebKit.xcconfig: Added Resources/Mac/* to
EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*]. We could move more resources there and remove
individual patterns.
* Resources/SwipeShadow.png: Moved to mac.
* Resources/SwipeShadow@2x.png: Moved to mac.
* Resources/mac: Added.
* Resources/mac/SwipeShadow.png: Moved from Source/WebKit2/Resources/SwipeShadow.png.
* Resources/mac/SwipeShadow@2x.png: Moved from Source/WebKit2/Resources/SwipeShadow@2x.png.
* WebKit2.xcodeproj/project.pbxproj: Created mac group in the Resources group and moved
SwipeShadow*.png into it. Updated for file moves.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsWebKitxcconfig">trunk/Source/WebKit2/Configurations/WebKit.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/Source/WebKit2/Resources/mac/</li>
<li><a href="#trunkSourceWebKit2ResourcesmacSwipeShadowpng">trunk/Source/WebKit2/Resources/mac/SwipeShadow.png</a></li>
<li><a href="#trunkSourceWebKit2ResourcesmacSwipeShadow2xpng">trunk/Source/WebKit2/Resources/mac/SwipeShadow@2x.png</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ResourcesSwipeShadowpng">trunk/Source/WebKit2/Resources/SwipeShadow.png</a></li>
<li><a href="#trunkSourceWebKit2ResourcesSwipeShadow2xpng">trunk/Source/WebKit2/Resources/SwipeShadow@2x.png</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (182983 => 182984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-04-18 14:42:08 UTC (rev 182983)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-18 14:57:19 UTC (rev 182984)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-04-18 Dan Bernstein <mitz@apple.com>
+
+ SwipeShadow images are installed on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=143915
+
+ Reviewed by Tim Horton.
+
+ * Configurations/WebKit.xcconfig: Added Resources/Mac/* to
+ EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*]. We could move more resources there and remove
+ individual patterns.
+ * Resources/SwipeShadow.png: Moved to mac.
+ * Resources/SwipeShadow@2x.png: Moved to mac.
+ * Resources/mac: Added.
+ * Resources/mac/SwipeShadow.png: Moved from Source/WebKit2/Resources/SwipeShadow.png.
+ * Resources/mac/SwipeShadow@2x.png: Moved from Source/WebKit2/Resources/SwipeShadow@2x.png.
+ * WebKit2.xcodeproj/project.pbxproj: Created mac group in the Resources group and moved
+ SwipeShadow*.png into it. Updated for file moves.
+
</ins><span class="cx"> 2015-04-18 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix NetworkCache Statistics database bootstrapping after r182803
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsWebKitxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/WebKit.xcconfig (182983 => 182984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/WebKit.xcconfig 2015-04-18 14:42:08 UTC (rev 182983)
+++ trunk/Source/WebKit2/Configurations/WebKit.xcconfig 2015-04-18 14:57:19 UTC (rev 182984)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> SECTORDER_FLAGS_Production[sdk=iphoneos*] = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/WebKit.order;
</span><span class="cx"> SECTORDER_FLAGS_Production[sdk=macosx*] = -Wl,-order_file,mac/WebKit2.order;
</span><span class="cx">
</span><del>-EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *.pdf WKActionMenuController.* com.apple.WebKit.Databases.sb com.apple.WebKit.NetworkProcess.sb com.apple.WebProcess.sb PlugInSandboxProfiles/*.sb;
</del><ins>+EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *.pdf Resources/mac/* WKActionMenuController.* com.apple.WebKit.Databases.sb com.apple.WebKit.NetworkProcess.sb com.apple.WebProcess.sb PlugInSandboxProfiles/*.sb;
</ins><span class="cx">
</span><span class="cx"> INSTALLHDRS_SCRIPT_PHASE = YES;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ResourcesSwipeShadowpng"></a>
<div class="binary"><h4>Deleted: trunk/Source/WebKit2/Resources/SwipeShadow.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkSourceWebKit2ResourcesSwipeShadow2xpng"></a>
<div class="binary"><h4>Deleted: trunk/Source/WebKit2/Resources/SwipeShadow@2x.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkSourceWebKit2ResourcesmacSwipeShadowpngfromrev182982trunkSourceWebKit2ResourcesSwipeShadowpng"></a>
<div class="binary"><h4>Copied: trunk/Source/WebKit2/Resources/mac/SwipeShadow.png (from rev 182982, trunk/Source/WebKit2/Resources/SwipeShadow.png)</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkSourceWebKit2ResourcesmacSwipeShadow2xpngfromrev182982trunkSourceWebKit2ResourcesSwipeShadow2xpng"></a>
<div class="binary"><h4>Copied: trunk/Source/WebKit2/Resources/mac/SwipeShadow@2x.png (from rev 182982, trunk/Source/WebKit2/Resources/SwipeShadow@2x.png)</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (182983 => 182984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-04-18 14:42:08 UTC (rev 182983)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-04-18 14:57:19 UTC (rev 182984)
</span><span class="lines">@@ -2843,8 +2843,8 @@
</span><span class="cx"> 2DAF06D418BD1A470081CEB1 /* SmartMagnificationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SmartMagnificationController.h; path = ios/SmartMagnificationController.h; sourceTree = "<group>"; };
</span><span class="cx"> 2DAF06D518BD1A470081CEB1 /* SmartMagnificationController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SmartMagnificationController.mm; path = ios/SmartMagnificationController.mm; sourceTree = "<group>"; };
</span><span class="cx"> 2DAF06D818BD23BA0081CEB1 /* SmartMagnificationController.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; name = SmartMagnificationController.messages.in; path = ios/SmartMagnificationController.messages.in; sourceTree = "<group>"; };
</span><del>- 2DC658331AD7237600D44508 /* SwipeShadow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = SwipeShadow.png; path = Resources/SwipeShadow.png; sourceTree = "<group>"; };
- 2DC658341AD7237600D44508 /* SwipeShadow@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "SwipeShadow@2x.png"; path = "Resources/SwipeShadow@2x.png"; sourceTree = "<group>"; };
</del><ins>+ 2DC658331AD7237600D44508 /* SwipeShadow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = SwipeShadow.png; sourceTree = "<group>"; };
+ 2DC658341AD7237600D44508 /* SwipeShadow@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "SwipeShadow@2x.png"; sourceTree = "<group>"; };
</ins><span class="cx"> 2DC6D9C118C44A610043BAD4 /* WKWebViewContentProviderRegistry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebViewContentProviderRegistry.h; sourceTree = "<group>"; };
</span><span class="cx"> 2DC6D9C218C44A610043BAD4 /* WKWebViewContentProviderRegistry.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebViewContentProviderRegistry.mm; sourceTree = "<group>"; };
</span><span class="cx"> 2DD12A071A8177F3002C74E6 /* WKPageRenderingProgressEvents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPageRenderingProgressEvents.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -4321,8 +4321,6 @@
</span><span class="cx"> 089C1665FE841158C02AAC07 /* Resources */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><del>- 7CB16FE11724B9B5007A0A95 /* PlugInSandboxProfiles */,
- A78CCDD5193AC9E3005ECC25 /* SandboxProfiles */,
</del><span class="cx"> 6D8A91A511F0EFD100DD01FE /* com.apple.WebProcess.sb.in */,
</span><span class="cx"> 1CBC945D16515ED200D68AAE /* DockBottom.pdf */,
</span><span class="cx"> 1C8AE75F1992F62F00ABF6EC /* DockBottomLegacy.pdf */,
</span><span class="lines">@@ -4330,8 +4328,9 @@
</span><span class="cx"> 1C8AE7601992F62F00ABF6EC /* DockRightLegacy.pdf */,
</span><span class="cx"> 8DC2EF5A0486A6940098B216 /* Info.plist */,
</span><span class="cx"> 089C1666FE841158C02AAC07 /* InfoPlist.strings */,
</span><del>- 2DC658331AD7237600D44508 /* SwipeShadow.png */,
- 2DC658341AD7237600D44508 /* SwipeShadow@2x.png */,
</del><ins>+ 37F8C94F1AE22BD8007DAB9E /* mac */,
+ 7CB16FE11724B9B5007A0A95 /* PlugInSandboxProfiles */,
+ A78CCDD5193AC9E3005ECC25 /* SandboxProfiles */,
</ins><span class="cx"> E1D26A4C1759634E0095BFD1 /* WebContentProcess.xib */,
</span><span class="cx"> E133FD891423DD7F00FC7BFB /* WebKit.icns */,
</span><span class="cx"> );
</span><span class="lines">@@ -5529,6 +5528,16 @@
</span><span class="cx"> path = Cocoa;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="cx"> };
</span><ins>+ 37F8C94F1AE22BD8007DAB9E /* mac */ = {
+ isa = PBXGroup;
+ children = (
+ 2DC658331AD7237600D44508 /* SwipeShadow.png */,
+ 2DC658341AD7237600D44508 /* SwipeShadow@2x.png */,
+ );
+ name = mac;
+ path = Resources/mac;
+ sourceTree = "<group>";
+ };
</ins><span class="cx"> 4A410F4119AF7B27002EBAB5 /* MediaStream */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><span class="lines">@@ -8419,7 +8428,6 @@
</span><span class="cx"> 7C89D2B61A6B0DD9003A5FDE /* WKUserContentControllerPrivate.h in Headers */,
</span><span class="cx"> 7C89D2A01A678554003A5FDE /* WKUserContentControllerRef.h in Headers */,
</span><span class="cx"> 7C2413091AACFCB400A58C15 /* WKUserContentExtensionStoreRef.h in Headers */,
</span><del>- 7C89D2C01A6B11EF003A5FDE /* WKUserContentFilterRef.h in Headers */,
</del><span class="cx"> 377EAD4817E2C77B002D193D /* WKUserContentInjectedFrames.h in Headers */,
</span><span class="cx"> F6113E29126CE19B0057D0A7 /* WKUserContentURLPattern.h in Headers */,
</span><span class="cx"> 4A3CC18F19B07B8A00D14AEF /* WKUserMediaPermissionRequest.h in Headers */,
</span><span class="lines">@@ -10150,7 +10158,6 @@
</span><span class="cx"> 1AFA3AC818E61C61003CCBAE /* WKUserContentController.mm in Sources */,
</span><span class="cx"> 7C89D29F1A678554003A5FDE /* WKUserContentControllerRef.cpp in Sources */,
</span><span class="cx"> 7C2413081AACFCB400A58C15 /* WKUserContentExtensionStoreRef.cpp in Sources */,
</span><del>- 7C89D2BF1A6B11EF003A5FDE /* WKUserContentFilterRef.cpp in Sources */,
</del><span class="cx"> F6113E28126CE19B0057D0A7 /* WKUserContentURLPattern.cpp in Sources */,
</span><span class="cx"> 4A3CC18E19B07B8500D14AEF /* WKUserMediaPermissionRequest.cpp in Sources */,
</span><span class="cx"> 1AAF089A19267EE500B6390C /* WKUserScript.mm in Sources */,
</span></span></pre>
</div>
</div>
</body>
</html>