Title: [209107] tags/Safari-603.1.13.1/Source/WebKit2
Revision
209107
Author
[email protected]
Date
2016-11-29 17:58:48 -0800 (Tue, 29 Nov 2016)

Log Message

Merge r209057. rdar://problem/26899976

Modified Paths

Diff

Modified: tags/Safari-603.1.13.1/Source/WebKit2/ChangeLog (209106 => 209107)


--- tags/Safari-603.1.13.1/Source/WebKit2/ChangeLog	2016-11-30 01:58:46 UTC (rev 209106)
+++ tags/Safari-603.1.13.1/Source/WebKit2/ChangeLog	2016-11-30 01:58:48 UTC (rev 209107)
@@ -1,5 +1,19 @@
 2016-11-29  Matthew Hanson  <[email protected]>
 
+        Merge r209057. rdar://problem/26899976
+
+    2016-11-28  Brent Fulgham  <[email protected]>
+
+            Generated sandbox profile is not being put in the correct Resources directory
+            https://bugs.webkit.org/show_bug.cgi?id=165126
+
+            Reviewed by Tim Horton.
+
+            * WebKit2.xcodeproj/project.pbxproj: Copy the generated file to the 'PlugInSandboxProfiles'
+            sub-directory.
+
+2016-11-29  Matthew Hanson  <[email protected]>
+
         Merge r208835. rdar://problem/26899976
 
     2016-11-16  Brent Fulgham  <[email protected]>

Modified: tags/Safari-603.1.13.1/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (209106 => 209107)


--- tags/Safari-603.1.13.1/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj	2016-11-30 01:58:46 UTC (rev 209106)
+++ tags/Safari-603.1.13.1/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj	2016-11-30 01:58:48 UTC (rev 209107)
@@ -2019,6 +2019,7 @@
 				7CB16FF21724BA28007A0A95 /* com.macromedia.Flash Player.plugin.sb in Copy Plug-in Sandbox Profiles */,
 				7CB16FF31724BA2F007A0A95 /* com.microsoft.SilverlightPlugin.sb in Copy Plug-in Sandbox Profiles */,
 				7CB16FF41724BA30007A0A95 /* com.oracle.java.JavaAppletPlugin.sb in Copy Plug-in Sandbox Profiles */,
+				7A772C8D1DDD4A25000F34F1 /* com.apple.WebKit.plugin-common.sb in Copy Plug-in Sandbox Profiles */,
 			);
 			name = "Copy Plug-in Sandbox Profiles";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -8692,7 +8693,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				7A772C8D1DDD4A25000F34F1 /* com.apple.WebKit.plugin-common.sb in Resources */,
 				E115C716190F8A2500ECC516 /* com.apple.WebKit.Databases.sb in Resources */,
 				E17AE2C316B9C63A001C42F1 /* com.apple.WebKit.NetworkProcess.sb in Resources */,
 				E11D35AE16B63D1B006D23D7 /* com.apple.WebProcess.sb in Resources */,
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to