Title: [208836] tags/Safari-603.1.13/Source/WebKit2
- Revision
- 208836
- Author
- [email protected]
- Date
- 2016-11-16 19:30:09 -0800 (Wed, 16 Nov 2016)
Log Message
Merge r208835. rdar://problem/29277451
Modified Paths
Diff
Modified: tags/Safari-603.1.13/Source/WebKit2/ChangeLog (208835 => 208836)
--- tags/Safari-603.1.13/Source/WebKit2/ChangeLog 2016-11-17 02:23:16 UTC (rev 208835)
+++ tags/Safari-603.1.13/Source/WebKit2/ChangeLog 2016-11-17 03:30:09 UTC (rev 208836)
@@ -1,3 +1,18 @@
+2016-11-16 Matthew Hanson <[email protected]>
+
+ Merge r208835. rdar://problem/29277451
+
+ 2016-11-16 Brent Fulgham <[email protected]>
+
+ Unreviewed build fix after r208589
+
+ The generated com.apple.WebKit.plugin-common.sb file was not getting copied into
+ the Resources folder, so was not deployed with WebKit. We need to treat it like
+ com.apple.WebProcess.sb and the other generated files.
+
+ * WebKit2.xcodeproj/project.pbxproj: Tell Xcode to include the generated file in
+ the framework Resources.
+
2016-11-15 Jon Lee <[email protected]>
Report active video and audio capture devices separately
Modified: tags/Safari-603.1.13/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (208835 => 208836)
--- tags/Safari-603.1.13/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-11-17 02:23:16 UTC (rev 208835)
+++ tags/Safari-603.1.13/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-11-17 03:30:09 UTC (rev 208836)
@@ -1083,6 +1083,7 @@
75A8D2D6187D1C0E00C39C9E /* WKWebsiteDataStoreInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 75A8D2D4187D1C0100C39C9E /* WKWebsiteDataStoreInternal.h */; };
762B748D120BC75C00819339 /* WKPreferencesRefPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 762B7484120BBA2D00819339 /* WKPreferencesRefPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
7A5E394A1D5BD8BE00B4B7CE /* com.macromedia.Flash Player ESR.plugin.sb in Resources */ = {isa = PBXBuildFile; fileRef = 7A5E39491D5BD8A700B4B7CE /* com.macromedia.Flash Player ESR.plugin.sb */; };
+ 7A772C8D1DDD4A25000F34F1 /* com.apple.WebKit.plugin-common.sb in Resources */ = {isa = PBXBuildFile; fileRef = 7A1506721DD56298001F4B58 /* com.apple.WebKit.plugin-common.sb */; };
7A791EFA1C7CFCF100C4C52B /* WebResourceLoadStatisticsStoreMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A791EF91C7CFB3700C4C52B /* WebResourceLoadStatisticsStoreMessageReceiver.cpp */; };
7A791EFB1C7CFD0100C4C52B /* WebResourceLoadStatisticsStoreMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A791EF81C7CFB1000C4C52B /* WebResourceLoadStatisticsStoreMessages.h */; };
7A791EFC1C7D08C500C4C52B /* WebResourceLoadStatisticsStore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A9CD8C01C77984900D9F6C7 /* WebResourceLoadStatisticsStore.cpp */; };
@@ -3258,7 +3259,7 @@
7CAB93791D459E4B0070F540 /* NetworkCacheCodersCocoa.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkCacheCodersCocoa.cpp; sourceTree = "<group>"; };
7CB16FE21724B9B5007A0A95 /* com.apple.ist.ds.appleconnect.webplugin.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = com.apple.ist.ds.appleconnect.webplugin.sb; sourceTree = "<group>"; };
7CB16FE31724B9B5007A0A95 /* com.apple.QuickTime Plugin.plugin.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "com.apple.QuickTime Plugin.plugin.sb"; sourceTree = "<group>"; };
- 7CB16FE41724B9B5007A0A95 /* com.apple.WebKit.plugin-common.sb.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "com.apple.WebKit.plugin-common.sb.in"; sourceTree = "<group>"; };
+ 7CB16FE41724B9B5007A0A95 /* com.apple.WebKit.plugin-common.sb.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "com.apple.WebKit.plugin-common.sb.in"; sourceTree = "<group>"; };
7CB16FE51724B9B5007A0A95 /* com.macromedia.Flash Player.plugin.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "com.macromedia.Flash Player.plugin.sb"; sourceTree = "<group>"; };
7CB16FE61724B9B5007A0A95 /* com.microsoft.SilverlightPlugin.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = com.microsoft.SilverlightPlugin.sb; sourceTree = "<group>"; };
7CB16FE71724B9B5007A0A95 /* com.oracle.java.JavaAppletPlugin.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = com.oracle.java.JavaAppletPlugin.sb; sourceTree = "<group>"; };
@@ -8691,6 +8692,7 @@
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
