Diff
Modified: tags/Safari-603.1.4.0.1/Source/_javascript_Core/ChangeLog (205337 => 205338)
--- tags/Safari-603.1.4.0.1/Source/_javascript_Core/ChangeLog 2016-09-02 03:59:09 UTC (rev 205337)
+++ tags/Safari-603.1.4.0.1/Source/_javascript_Core/ChangeLog 2016-09-02 04:02:21 UTC (rev 205338)
@@ -1,3 +1,13 @@
+2016-09-01 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r205333.
+
+ 2016-09-01 Dan Bernstein <m...@apple.com>
+
+ Build fix.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2016-08-30 Benjamin Poulain <bpoul...@apple.com>
[JSC] Some arith nodes are too pessimistic with the types supported on the fast path
Modified: tags/Safari-603.1.4.0.1/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (205337 => 205338)
--- tags/Safari-603.1.4.0.1/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2016-09-02 03:59:09 UTC (rev 205337)
+++ tags/Safari-603.1.4.0.1/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2016-09-02 04:02:21 UTC (rev 205338)
@@ -81,6 +81,7 @@
ENABLE_FONT_LOAD_EVENTS = ;
ENABLE_FULLSCREEN_API[sdk=macosx*] = ENABLE_FULLSCREEN_API;
ENABLE_GAMEPAD[sdk=macosx*] = ENABLE_GAMEPAD;
+ENABLE_GAMEPAD[sdk=watch*] = ;
ENABLE_GAMEPAD_DEPRECATED = ;
ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
ENABLE_ICONDATABASE[sdk=macosx*] = ENABLE_ICONDATABASE;
Modified: tags/Safari-603.1.4.0.1/Source/WebCore/ChangeLog (205337 => 205338)
--- tags/Safari-603.1.4.0.1/Source/WebCore/ChangeLog 2016-09-02 03:59:09 UTC (rev 205337)
+++ tags/Safari-603.1.4.0.1/Source/WebCore/ChangeLog 2016-09-02 04:02:21 UTC (rev 205338)
@@ -1,3 +1,15 @@
+2016-09-01 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r205333.
+
+ 2016-09-01 Dan Bernstein <m...@apple.com>
+
+ Build fix.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * Configurations/WebCore.xcconfig:
+ * WebCore.xcodeproj/project.pbxproj:
+
2016-08-31 Joseph Pecoraro <pecor...@apple.com>
Remove unused member variable in WebCore::File
Modified: tags/Safari-603.1.4.0.1/Source/WebCore/Configurations/FeatureDefines.xcconfig (205337 => 205338)
--- tags/Safari-603.1.4.0.1/Source/WebCore/Configurations/FeatureDefines.xcconfig 2016-09-02 03:59:09 UTC (rev 205337)
+++ tags/Safari-603.1.4.0.1/Source/WebCore/Configurations/FeatureDefines.xcconfig 2016-09-02 04:02:21 UTC (rev 205338)
@@ -81,6 +81,7 @@
ENABLE_FONT_LOAD_EVENTS = ;
ENABLE_FULLSCREEN_API[sdk=macosx*] = ENABLE_FULLSCREEN_API;
ENABLE_GAMEPAD[sdk=macosx*] = ENABLE_GAMEPAD;
+ENABLE_GAMEPAD[sdk=watch*] = ;
ENABLE_GAMEPAD_DEPRECATED = ;
ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
ENABLE_ICONDATABASE[sdk=macosx*] = ENABLE_ICONDATABASE;
Modified: tags/Safari-603.1.4.0.1/Source/WebCore/Configurations/WebCore.xcconfig (205337 => 205338)
--- tags/Safari-603.1.4.0.1/Source/WebCore/Configurations/WebCore.xcconfig 2016-09-02 03:59:09 UTC (rev 205337)
+++ tags/Safari-603.1.4.0.1/Source/WebCore/Configurations/WebCore.xcconfig 2016-09-02 04:02:21 UTC (rev 205338)
@@ -65,7 +65,10 @@
WK_IOS_BINCOMPAT_LDFLAGS_V9_3 = $(WK_IOS_BINCOMPAT_LDFLAGS_V9_0);
WK_IOS_BINCOMPAT_LDFLAGS_V10_0 = $(WK_IOS_BINCOMPAT_LDFLAGS_V9_3);
-OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_PLATFORM);
+WK_GAMECONTROLLER_LDFLAGS = $(WK_GAMECONTROLLER_LDFLAGS_$(ENABLE_GAMEPAD));
+WK_GAMECONTROLLER_LDFLAGS_ENABLE_GAMEPAD = -framework GameController;
+
+OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_PLATFORM) $(WK_GAMECONTROLLER_LDFLAGS);
OTHER_LDFLAGS_BASE = -lsqlite3 -lobjc -lANGLE;
OTHER_LDFLAGS_BASE_ios = $(OTHER_LDFLAGS_BASE) -framework CFNetwork -framework CoreGraphics -framework CoreText -framework Foundation -framework ImageIO -framework OpenGLES -lMobileGestalt $(WK_IOS_BINCOMPAT_LDFLAGS);
OTHER_LDFLAGS_PLATFORM[sdk=iphoneos*] = $(OTHER_LDFLAGS_BASE_ios) -framework IOSurface;
Modified: tags/Safari-603.1.4.0.1/Source/WebCore/WebCore.xcodeproj/project.pbxproj (205337 => 205338)
--- tags/Safari-603.1.4.0.1/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-09-02 03:59:09 UTC (rev 205337)
+++ tags/Safari-603.1.4.0.1/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-09-02 04:02:21 UTC (rev 205338)
@@ -2174,7 +2174,6 @@
51ABAE1E103C1913008C5260 /* SocketStreamHandleImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 51ABAE1C103C1913008C5260 /* SocketStreamHandleImpl.h */; settings = {ATTRIBUTES = (Private, ); }; };
51ABAE1F103C1913008C5260 /* SocketStreamHandleImplCFNet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51ABAE1D103C1913008C5260 /* SocketStreamHandleImplCFNet.cpp */; };
51ABF64D16392E2800132A7A /* LoaderStrategy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51ABF64C16392E2800132A7A /* LoaderStrategy.cpp */; };
- 51AEA4C91D6E3CC900E0269D /* GameController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51AEA4C81D6E3CC100E0269D /* GameController.framework */; };
51AF503616F100F60095B2E8 /* ResourceLoaderTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 51AF503516F100F60095B2E8 /* ResourceLoaderTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
51B2417B0D931F3F00E83F5C /* LegacyWebArchiveMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51B2417A0D931F3F00E83F5C /* LegacyWebArchiveMac.mm */; };
51B454EA1B4DAE7D0085EAA6 /* PingHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = 51B454E91B4DAE7D0085EAA6 /* PingHandle.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -14329,7 +14328,6 @@
93F19B1608245E59001E9ABC /* _javascript_Core.framework in Frameworks */,
93F19B1708245E59001E9ABC /* libicucore.dylib in Frameworks */,
1CFAE3230A6D6A3F0032593D /* libobjc.dylib in Frameworks */,
- 51AEA4C91D6E3CC900E0269D /* GameController.framework in Frameworks */,
DD763BB20992C2C900740B8E /* libxml2.dylib in Frameworks */,
379919B21200DE5000EA041C /* libz.dylib in Frameworks */,
A88AD52F09524B92001DD196 /* QuartzCore.framework in Frameworks */,
Modified: tags/Safari-603.1.4.0.1/Source/WebKit/mac/ChangeLog (205337 => 205338)
--- tags/Safari-603.1.4.0.1/Source/WebKit/mac/ChangeLog 2016-09-02 03:59:09 UTC (rev 205337)
+++ tags/Safari-603.1.4.0.1/Source/WebKit/mac/ChangeLog 2016-09-02 04:02:21 UTC (rev 205338)
@@ -1,3 +1,13 @@
+2016-09-01 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r205333.
+
+ 2016-09-01 Dan Bernstein <m...@apple.com>
+
+ Build fix.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2016-08-30 Mark Lam <mark....@apple.com>
Introduce the ThrowScope and force every throw site to instantiate a ThrowScope.
Modified: tags/Safari-603.1.4.0.1/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (205337 => 205338)
--- tags/Safari-603.1.4.0.1/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2016-09-02 03:59:09 UTC (rev 205337)
+++ tags/Safari-603.1.4.0.1/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2016-09-02 04:02:21 UTC (rev 205338)
@@ -81,6 +81,7 @@
ENABLE_FONT_LOAD_EVENTS = ;
ENABLE_FULLSCREEN_API[sdk=macosx*] = ENABLE_FULLSCREEN_API;
ENABLE_GAMEPAD[sdk=macosx*] = ENABLE_GAMEPAD;
+ENABLE_GAMEPAD[sdk=watch*] = ;
ENABLE_GAMEPAD_DEPRECATED = ;
ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
ENABLE_ICONDATABASE[sdk=macosx*] = ENABLE_ICONDATABASE;
Modified: tags/Safari-603.1.4.0.1/Source/WebKit2/ChangeLog (205337 => 205338)
--- tags/Safari-603.1.4.0.1/Source/WebKit2/ChangeLog 2016-09-02 03:59:09 UTC (rev 205337)
+++ tags/Safari-603.1.4.0.1/Source/WebKit2/ChangeLog 2016-09-02 04:02:21 UTC (rev 205338)
@@ -1,3 +1,13 @@
+2016-09-01 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r205333.
+
+ 2016-09-01 Dan Bernstein <m...@apple.com>
+
+ Build fix.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2016-08-30 Anders Carlsson <ander...@apple.com>
Try to fix the 32-bit build.
Modified: tags/Safari-603.1.4.0.1/Source/WebKit2/Configurations/FeatureDefines.xcconfig (205337 => 205338)
--- tags/Safari-603.1.4.0.1/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2016-09-02 03:59:09 UTC (rev 205337)
+++ tags/Safari-603.1.4.0.1/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2016-09-02 04:02:21 UTC (rev 205338)
@@ -81,6 +81,7 @@
ENABLE_FONT_LOAD_EVENTS = ;
ENABLE_FULLSCREEN_API[sdk=macosx*] = ENABLE_FULLSCREEN_API;
ENABLE_GAMEPAD[sdk=macosx*] = ENABLE_GAMEPAD;
+ENABLE_GAMEPAD[sdk=watch*] = ;
ENABLE_GAMEPAD_DEPRECATED = ;
ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
ENABLE_ICONDATABASE[sdk=macosx*] = ENABLE_ICONDATABASE;
Modified: tags/Safari-603.1.4.0.1/Tools/ChangeLog (205337 => 205338)
--- tags/Safari-603.1.4.0.1/Tools/ChangeLog 2016-09-02 03:59:09 UTC (rev 205337)
+++ tags/Safari-603.1.4.0.1/Tools/ChangeLog 2016-09-02 04:02:21 UTC (rev 205338)
@@ -1,3 +1,13 @@
+2016-09-01 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r205333.
+
+ 2016-09-01 Dan Bernstein <m...@apple.com>
+
+ Build fix.
+
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
2016-08-30 Ricky Mondello <rmonde...@apple.com>
YouTubePluginReplacementTest's URL transformation logic should have tests
Modified: tags/Safari-603.1.4.0.1/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig (205337 => 205338)
--- tags/Safari-603.1.4.0.1/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2016-09-02 03:59:09 UTC (rev 205337)
+++ tags/Safari-603.1.4.0.1/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2016-09-02 04:02:21 UTC (rev 205338)
@@ -81,6 +81,7 @@
ENABLE_FONT_LOAD_EVENTS = ;
ENABLE_FULLSCREEN_API[sdk=macosx*] = ENABLE_FULLSCREEN_API;
ENABLE_GAMEPAD[sdk=macosx*] = ENABLE_GAMEPAD;
+ENABLE_GAMEPAD[sdk=watch*] = ;
ENABLE_GAMEPAD_DEPRECATED = ;
ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
ENABLE_ICONDATABASE[sdk=macosx*] = ENABLE_ICONDATABASE;
