Title: [209002] tags/Safari-603.1.13

Diff

Modified: tags/Safari-603.1.13/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (209001 => 209002)


--- tags/Safari-603.1.13/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig	2016-11-28 19:11:38 UTC (rev 209001)
+++ tags/Safari-603.1.13/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig	2016-11-28 19:52:38 UTC (rev 209002)
@@ -90,7 +90,7 @@
 ENABLE_GAMEPAD_DEPRECATED = ;
 ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
 ENABLE_ICONDATABASE[sdk=macosx*] = ENABLE_ICONDATABASE;
-ENABLE_INTERSECTION_OBSERVER = ;
+ENABLE_INTERSECTION_OBSERVER = ENABLE_INTERSECTION_OBSERVER;
 ENABLE_SERVICE_CONTROLS[sdk=macosx*] = ENABLE_SERVICE_CONTROLS;
 ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
 ENABLE_INDEXED_DATABASE_IN_WORKERS = ENABLE_INDEXED_DATABASE_IN_WORKERS;

Modified: tags/Safari-603.1.13/Source/WebCore/Configurations/FeatureDefines.xcconfig (209001 => 209002)


--- tags/Safari-603.1.13/Source/WebCore/Configurations/FeatureDefines.xcconfig	2016-11-28 19:11:38 UTC (rev 209001)
+++ tags/Safari-603.1.13/Source/WebCore/Configurations/FeatureDefines.xcconfig	2016-11-28 19:52:38 UTC (rev 209002)
@@ -90,7 +90,7 @@
 ENABLE_GAMEPAD_DEPRECATED = ;
 ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
 ENABLE_ICONDATABASE[sdk=macosx*] = ENABLE_ICONDATABASE;
-ENABLE_INTERSECTION_OBSERVER = ;
+ENABLE_INTERSECTION_OBSERVER = ENABLE_INTERSECTION_OBSERVER;
 ENABLE_SERVICE_CONTROLS[sdk=macosx*] = ENABLE_SERVICE_CONTROLS;
 ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
 ENABLE_INDEXED_DATABASE_IN_WORKERS = ENABLE_INDEXED_DATABASE_IN_WORKERS;

Modified: tags/Safari-603.1.13/Source/WebKit/mac/ChangeLog (209001 => 209002)


--- tags/Safari-603.1.13/Source/WebKit/mac/ChangeLog	2016-11-28 19:11:38 UTC (rev 209001)
+++ tags/Safari-603.1.13/Source/WebKit/mac/ChangeLog	2016-11-28 19:52:38 UTC (rev 209002)
@@ -1,13 +1,3 @@
-2016-11-18  Matthew Hanson  <[email protected]>
-
-        Merge r208877. rdar://problem/29326204
-
-    2016-11-17  Dan Bernstein  <[email protected]>
-
-            Try to fix some non-macOS builds.
-
-            * WebView/WebView.mm:
-
 2016-11-14  Alex Christensen  <[email protected]>
 
         Move SecurityOrigin::createFromDatabaseIdentifier to SecurityOriginData

Modified: tags/Safari-603.1.13/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (209001 => 209002)


--- tags/Safari-603.1.13/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig	2016-11-28 19:11:38 UTC (rev 209001)
+++ tags/Safari-603.1.13/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig	2016-11-28 19:52:38 UTC (rev 209002)
@@ -90,7 +90,7 @@
 ENABLE_GAMEPAD_DEPRECATED = ;
 ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
 ENABLE_ICONDATABASE[sdk=macosx*] = ENABLE_ICONDATABASE;
-ENABLE_INTERSECTION_OBSERVER = ;
+ENABLE_INTERSECTION_OBSERVER = ENABLE_INTERSECTION_OBSERVER;
 ENABLE_SERVICE_CONTROLS[sdk=macosx*] = ENABLE_SERVICE_CONTROLS;
 ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
 ENABLE_INDEXED_DATABASE_IN_WORKERS = ENABLE_INDEXED_DATABASE_IN_WORKERS;

Modified: tags/Safari-603.1.13/Source/WebKit/mac/WebView/WebView.mm (209001 => 209002)


--- tags/Safari-603.1.13/Source/WebKit/mac/WebView/WebView.mm	2016-11-28 19:11:38 UTC (rev 209001)
+++ tags/Safari-603.1.13/Source/WebKit/mac/WebView/WebView.mm	2016-11-28 19:52:38 UTC (rev 209002)
@@ -118,6 +118,7 @@
 #import <_javascript_Core/APICast.h>
 #import <_javascript_Core/Exception.h>
 #import <_javascript_Core/JSValueRef.h>
+#import <WebCore/AVKitSPI.h>
 #import <WebCore/AlternativeTextUIController.h>
 #import <WebCore/AnimationController.h>
 #import <WebCore/ApplicationCacheStorage.h>
@@ -231,7 +232,6 @@
 #import "WebNSPasteboardExtras.h"
 #import "WebNSPrintOperationExtras.h"
 #import "WebPDFView.h"
-#import <WebCore/AVKitSPI.h>
 #import <WebCore/LookupSPI.h>
 #import <WebCore/NSImmediateActionGestureRecognizerSPI.h>
 #import <WebCore/SoftLinking.h>

Modified: tags/Safari-603.1.13/Source/WebKit2/ChangeLog (209001 => 209002)


--- tags/Safari-603.1.13/Source/WebKit2/ChangeLog	2016-11-28 19:11:38 UTC (rev 209001)
+++ tags/Safari-603.1.13/Source/WebKit2/ChangeLog	2016-11-28 19:52:38 UTC (rev 209002)
@@ -1,18 +1,3 @@
-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/Configurations/FeatureDefines.xcconfig (209001 => 209002)


--- tags/Safari-603.1.13/Source/WebKit2/Configurations/FeatureDefines.xcconfig	2016-11-28 19:11:38 UTC (rev 209001)
+++ tags/Safari-603.1.13/Source/WebKit2/Configurations/FeatureDefines.xcconfig	2016-11-28 19:52:38 UTC (rev 209002)
@@ -90,7 +90,7 @@
 ENABLE_GAMEPAD_DEPRECATED = ;
 ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
 ENABLE_ICONDATABASE[sdk=macosx*] = ENABLE_ICONDATABASE;
-ENABLE_INTERSECTION_OBSERVER = ;
+ENABLE_INTERSECTION_OBSERVER = ENABLE_INTERSECTION_OBSERVER;
 ENABLE_SERVICE_CONTROLS[sdk=macosx*] = ENABLE_SERVICE_CONTROLS;
 ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
 ENABLE_INDEXED_DATABASE_IN_WORKERS = ENABLE_INDEXED_DATABASE_IN_WORKERS;

Modified: tags/Safari-603.1.13/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (209001 => 209002)


--- tags/Safari-603.1.13/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj	2016-11-28 19:11:38 UTC (rev 209001)
+++ tags/Safari-603.1.13/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj	2016-11-28 19:52:38 UTC (rev 209002)
@@ -1083,7 +1083,6 @@
 		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 */; };
@@ -3259,7 +3258,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; path = "com.apple.WebKit.plugin-common.sb.in"; 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>"; };
 		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>"; };
@@ -8692,7 +8691,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 */,

Modified: tags/Safari-603.1.13/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig (209001 => 209002)


--- tags/Safari-603.1.13/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig	2016-11-28 19:11:38 UTC (rev 209001)
+++ tags/Safari-603.1.13/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig	2016-11-28 19:52:38 UTC (rev 209002)
@@ -90,7 +90,7 @@
 ENABLE_GAMEPAD_DEPRECATED = ;
 ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
 ENABLE_ICONDATABASE[sdk=macosx*] = ENABLE_ICONDATABASE;
-ENABLE_INTERSECTION_OBSERVER = ;
+ENABLE_INTERSECTION_OBSERVER = ENABLE_INTERSECTION_OBSERVER;
 ENABLE_SERVICE_CONTROLS[sdk=macosx*] = ENABLE_SERVICE_CONTROLS;
 ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
 ENABLE_INDEXED_DATABASE_IN_WORKERS = ENABLE_INDEXED_DATABASE_IN_WORKERS;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to