Diff
Modified: branches/safari-601.1.32.2-branch/Source/_javascript_Core/ChangeLog (184508 => 184509)
--- branches/safari-601.1.32.2-branch/Source/_javascript_Core/ChangeLog 2015-05-18 19:53:28 UTC (rev 184508)
+++ branches/safari-601.1.32.2-branch/Source/_javascript_Core/ChangeLog 2015-05-18 20:15:49 UTC (rev 184509)
@@ -1,5 +1,34 @@
2015-05-18 Matthew Hanson <matthew_han...@apple.com>
+ Merge custom patch. rdar://problem/20950052
+
+ 2015-05-15 Dean Jackson <d...@apple.com>
+
+ Disable some features on the safari-601.1.32.2-branch
+ https://bugs.webkit.org/show_bug.cgi?id=145077
+ <rdar://problem/20950052>
+
+ Reviewed by Tim Horton.
+
+ Disable the following features:
+
+ - ATTACHMENT_ELEMENT
+ - CSS_ANIMATIONS_LEVEL_2
+ - CSS_GRID_LAYOUT
+ - CSS_SELECTORS_LEVEL4
+ - GAMEPAD
+ - INDIE_UI
+ - INPUT_TYPE_COLOR
+ - INPUT_TYPE_COLOR_POPOVER
+ - NAVIGATOR_HWCONCURRENCY
+ - STREAMS_API
+ - WEB_REPLAY
+ - WILL_REVEAL_EDGE_EVENTS
+
+ * Configurations/FeatureDefines.xcconfig:
+
+2015-05-18 Matthew Hanson <matthew_han...@apple.com>
+
Merge r184445. rdar://problem/20979071
2015-05-17 Filip Pizlo <fpi...@apple.com>
Modified: branches/safari-601.1.32.2-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (184508 => 184509)
--- branches/safari-601.1.32.2-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2015-05-18 19:53:28 UTC (rev 184508)
+++ branches/safari-601.1.32.2-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2015-05-18 20:15:49 UTC (rev 184509)
@@ -34,7 +34,7 @@
ENABLE_3D_TRANSFORMS = ENABLE_3D_TRANSFORMS;
ENABLE_ACCELERATED_2D_CANVAS = ;
ENABLE_ACCELERATED_OVERFLOW_SCROLLING[sdk=iphone*] = ENABLE_ACCELERATED_OVERFLOW_SCROLLING;
-ENABLE_ATTACHMENT_ELEMENT = ENABLE_ATTACHMENT_ELEMENT;
+ENABLE_ATTACHMENT_ELEMENT = ;
ENABLE_AVF_CAPTIONS[sdk=iphone*] = ENABLE_AVF_CAPTIONS;
ENABLE_AVF_CAPTIONS[sdk=macosx*] = $(ENABLE_AVF_CAPTIONS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
ENABLE_AVF_CAPTIONS_macosx_1090 = ;
@@ -48,15 +48,15 @@
ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX = ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX;
ENABLE_CONTENT_FILTERING = ENABLE_CONTENT_FILTERING;
ENABLE_CSP_NEXT = ;
-ENABLE_CSS_ANIMATIONS_LEVEL_2 = ENABLE_CSS_ANIMATIONS_LEVEL_2;
+ENABLE_CSS_ANIMATIONS_LEVEL_2 = ;
ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;
ENABLE_CSS_COMPOSITING = ENABLE_CSS_COMPOSITING;
ENABLE_CSS_DEVICE_ADAPTATION = ;
-ENABLE_CSS_GRID_LAYOUT = ENABLE_CSS_GRID_LAYOUT;
+ENABLE_CSS_GRID_LAYOUT = ;
ENABLE_CSS_IMAGE_ORIENTATION = ;
ENABLE_CSS_IMAGE_RESOLUTION = ;
ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
-ENABLE_CSS_SELECTORS_LEVEL4 = ENABLE_CSS_SELECTORS_LEVEL4;
+ENABLE_CSS_SELECTORS_LEVEL4 = ;
ENABLE_CSS_SHAPES = ENABLE_CSS_SHAPES;
ENABLE_CSS3_TEXT = ;
ENABLE_CSS3_TEXT_LINE_BREAK = ;
@@ -77,7 +77,7 @@
ENABLE_FILTERS_LEVEL_2_macosx_101100 = ENABLE_FILTERS_LEVEL_2;
ENABLE_FONT_LOAD_EVENTS = ;
ENABLE_FULLSCREEN_API[sdk=macosx*] = ENABLE_FULLSCREEN_API;
-ENABLE_GAMEPAD[sdk=macosx*] = ENABLE_GAMEPAD;
+ENABLE_GAMEPAD[sdk=macosx*] = ;
ENABLE_GAMEPAD_DEPRECATED = ;
ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING[sdk=macosx*] = ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING;
@@ -88,9 +88,9 @@
ENABLE_SERVICE_CONTROLS_macosx_101100 = ENABLE_SERVICE_CONTROLS;
ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
ENABLE_INDEXED_DATABASE_IN_WORKERS = ;
-ENABLE_INDIE_UI = ENABLE_INDIE_UI;
-ENABLE_INPUT_TYPE_COLOR[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR;
-ENABLE_INPUT_TYPE_COLOR_POPOVER[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR_POPOVER;
+ENABLE_INDIE_UI = ;
+ENABLE_INPUT_TYPE_COLOR[sdk=macosx*] = ;
+ENABLE_INPUT_TYPE_COLOR_POPOVER[sdk=macosx*] = ;
ENABLE_INPUT_TYPE_DATE[sdk=iphone*] = ENABLE_INPUT_TYPE_DATE;
ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE = ;
ENABLE_INPUT_TYPE_DATETIMELOCAL[sdk=iphone*] = ENABLE_INPUT_TYPE_DATETIMELOCAL;
@@ -137,7 +137,7 @@
ENABLE_MHTML = ;
ENABLE_MOUSE_CURSOR_SCALE[sdk=macosx*] = ENABLE_MOUSE_CURSOR_SCALE;
ENABLE_NAVIGATOR_CONTENT_UTILS = ;
-ENABLE_NAVIGATOR_HWCONCURRENCY = ENABLE_NAVIGATOR_HWCONCURRENCY;
+ENABLE_NAVIGATOR_HWCONCURRENCY = ;
ENABLE_NOSNIFF = ;
ENABLE_NOTIFICATIONS[sdk=macosx*] = ENABLE_NOTIFICATIONS;
ENABLE_PDFKIT_PLUGIN[sdk=macosx*] = ENABLE_PDFKIT_PLUGIN;
@@ -158,7 +158,7 @@
ENABLE_RUBBER_BANDING[sdk=macosx*] = ENABLE_RUBBER_BANDING;
ENABLE_CSS_SCROLL_SNAP = ENABLE_CSS_SCROLL_SNAP;
ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
-ENABLE_STREAMS_API = ENABLE_STREAMS_API;
+ENABLE_STREAMS_API = ;
ENABLE_SUBTLE_CRYPTO = ENABLE_SUBTLE_CRYPTO;
ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
ENABLE_SVG_OTF_CONVERTER = ENABLE_SVG_OTF_CONVERTER;
@@ -189,8 +189,8 @@
ENABLE_WEBGL = ENABLE_WEBGL;
ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
ENABLE_WEB_REPLAY = $(ENABLE_WEB_REPLAY_$(PLATFORM_NAME)_$(CONFIGURATION));
-ENABLE_WEB_REPLAY_macosx_Debug = ENABLE_WEB_REPLAY;
-ENABLE_WEB_REPLAY_macosx_Release = ENABLE_WEB_REPLAY;
+ENABLE_WEB_REPLAY_macosx_Debug = ;
+ENABLE_WEB_REPLAY_macosx_Release = ;
ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
ENABLE_WEB_TIMING[sdk=iphone*] = ENABLE_WEB_TIMING;
Modified: branches/safari-601.1.32.2-branch/Source/WTF/ChangeLog (184508 => 184509)
--- branches/safari-601.1.32.2-branch/Source/WTF/ChangeLog 2015-05-18 19:53:28 UTC (rev 184508)
+++ branches/safari-601.1.32.2-branch/Source/WTF/ChangeLog 2015-05-18 20:15:49 UTC (rev 184509)
@@ -1,5 +1,34 @@
2015-05-18 Matthew Hanson <matthew_han...@apple.com>
+ Merge custom patch. rdar://problem/20950052
+
+ 2015-05-15 Dean Jackson <d...@apple.com>
+
+ Disable some features on the safari-601.1.32.2-branch
+ https://bugs.webkit.org/show_bug.cgi?id=145077
+ <rdar://problem/20950052>
+
+ Reviewed by Tim Horton.
+
+ Disable the following features:
+
+ - ATTACHMENT_ELEMENT
+ - CSS_ANIMATIONS_LEVEL_2
+ - CSS_GRID_LAYOUT
+ - CSS_SELECTORS_LEVEL4
+ - GAMEPAD
+ - INDIE_UI
+ - INPUT_TYPE_COLOR
+ - INPUT_TYPE_COLOR_POPOVER
+ - NAVIGATOR_HWCONCURRENCY
+ - STREAMS_API
+ - WEB_REPLAY
+ - WILL_REVEAL_EDGE_EVENTS
+
+ * Configurations/FeatureDefines.xcconfig:
+
+2015-05-18 Matthew Hanson <matthew_han...@apple.com>
+
Merge r184341. rdar://problem/20809399
2015-05-14 Myles C. Maxfield <mmaxfi...@apple.com>
Modified: branches/safari-601.1.32.2-branch/Source/WTF/wtf/FeatureDefines.h (184508 => 184509)
--- branches/safari-601.1.32.2-branch/Source/WTF/wtf/FeatureDefines.h 2015-05-18 19:53:28 UTC (rev 184508)
+++ branches/safari-601.1.32.2-branch/Source/WTF/wtf/FeatureDefines.h 2015-05-18 20:15:49 UTC (rev 184509)
@@ -235,11 +235,11 @@
#endif
#if !defined(ENABLE_INPUT_TYPE_COLOR)
-#define ENABLE_INPUT_TYPE_COLOR 1
+#define ENABLE_INPUT_TYPE_COLOR 0
#endif
#if !defined(ENABLE_INPUT_TYPE_COLOR_POPOVER)
-#define ENABLE_INPUT_TYPE_COLOR_POPOVER 1
+#define ENABLE_INPUT_TYPE_COLOR_POPOVER 0
#endif
#if !defined(ENABLE_FILE_REPLACEMENT)
@@ -600,7 +600,7 @@
#endif
#if !defined(ENABLE_NAVIGATOR_HWCONCURRENCY)
-#define ENABLE_NAVIGATOR_HWCONCURRENCY 1
+#define ENABLE_NAVIGATOR_HWCONCURRENCY 0
#endif
#if !defined(ENABLE_NETSCAPE_PLUGIN_API)
@@ -682,7 +682,7 @@
#endif
#if !defined(ENABLE_STREAMS_API)
-#define ENABLE_STREAMS_API 1
+#define ENABLE_STREAMS_API 0
#endif
#if !defined(ENABLE_SVG_FONTS)
@@ -774,7 +774,7 @@
#endif
#if !defined(ENABLE_WILL_REVEAL_EDGE_EVENTS)
-#define ENABLE_WILL_REVEAL_EDGE_EVENTS 1
+#define ENABLE_WILL_REVEAL_EDGE_EVENTS 0
#endif
#if !defined(ENABLE_XHR_TIMEOUT)
Modified: branches/safari-601.1.32.2-branch/Source/WebCore/ChangeLog (184508 => 184509)
--- branches/safari-601.1.32.2-branch/Source/WebCore/ChangeLog 2015-05-18 19:53:28 UTC (rev 184508)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/ChangeLog 2015-05-18 20:15:49 UTC (rev 184509)
@@ -1,5 +1,34 @@
2015-05-18 Matthew Hanson <matthew_han...@apple.com>
+ Merge custom patch. rdar://problem/20950052
+
+ 2015-05-15 Dean Jackson <d...@apple.com>
+
+ Disable some features on the safari-601.1.32.2-branch
+ https://bugs.webkit.org/show_bug.cgi?id=145077
+ <rdar://problem/20950052>
+
+ Reviewed by Tim Horton.
+
+ Disable the following features:
+
+ - ATTACHMENT_ELEMENT
+ - CSS_ANIMATIONS_LEVEL_2
+ - CSS_GRID_LAYOUT
+ - CSS_SELECTORS_LEVEL4
+ - GAMEPAD
+ - INDIE_UI
+ - INPUT_TYPE_COLOR
+ - INPUT_TYPE_COLOR_POPOVER
+ - NAVIGATOR_HWCONCURRENCY
+ - STREAMS_API
+ - WEB_REPLAY
+ - WILL_REVEAL_EDGE_EVENTS
+
+ * Configurations/FeatureDefines.xcconfig:
+
+2015-05-18 Matthew Hanson <matthew_han...@apple.com>
+
Merge r184360. rdar://problem/20865442
2015-05-14 Dean Jackson <d...@apple.com>
Modified: branches/safari-601.1.32.2-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig (184508 => 184509)
--- branches/safari-601.1.32.2-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig 2015-05-18 19:53:28 UTC (rev 184508)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig 2015-05-18 20:15:49 UTC (rev 184509)
@@ -34,7 +34,7 @@
ENABLE_3D_TRANSFORMS = ENABLE_3D_TRANSFORMS;
ENABLE_ACCELERATED_2D_CANVAS = ;
ENABLE_ACCELERATED_OVERFLOW_SCROLLING[sdk=iphone*] = ENABLE_ACCELERATED_OVERFLOW_SCROLLING;
-ENABLE_ATTACHMENT_ELEMENT = ENABLE_ATTACHMENT_ELEMENT;
+ENABLE_ATTACHMENT_ELEMENT = ;
ENABLE_AVF_CAPTIONS[sdk=iphone*] = ENABLE_AVF_CAPTIONS;
ENABLE_AVF_CAPTIONS[sdk=macosx*] = $(ENABLE_AVF_CAPTIONS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
ENABLE_AVF_CAPTIONS_macosx_1090 = ;
@@ -48,15 +48,15 @@
ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX = ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX;
ENABLE_CONTENT_FILTERING = ENABLE_CONTENT_FILTERING;
ENABLE_CSP_NEXT = ;
-ENABLE_CSS_ANIMATIONS_LEVEL_2 = ENABLE_CSS_ANIMATIONS_LEVEL_2;
+ENABLE_CSS_ANIMATIONS_LEVEL_2 = ;
ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;
ENABLE_CSS_COMPOSITING = ENABLE_CSS_COMPOSITING;
ENABLE_CSS_DEVICE_ADAPTATION = ;
-ENABLE_CSS_GRID_LAYOUT = ENABLE_CSS_GRID_LAYOUT;
+ENABLE_CSS_GRID_LAYOUT = ;
ENABLE_CSS_IMAGE_ORIENTATION = ;
ENABLE_CSS_IMAGE_RESOLUTION = ;
ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
-ENABLE_CSS_SELECTORS_LEVEL4 = ENABLE_CSS_SELECTORS_LEVEL4;
+ENABLE_CSS_SELECTORS_LEVEL4 = ;
ENABLE_CSS_SHAPES = ENABLE_CSS_SHAPES;
ENABLE_CSS3_TEXT = ;
ENABLE_CSS3_TEXT_LINE_BREAK = ;
@@ -77,7 +77,7 @@
ENABLE_FILTERS_LEVEL_2_macosx_101100 = ENABLE_FILTERS_LEVEL_2;
ENABLE_FONT_LOAD_EVENTS = ;
ENABLE_FULLSCREEN_API[sdk=macosx*] = ENABLE_FULLSCREEN_API;
-ENABLE_GAMEPAD[sdk=macosx*] = ENABLE_GAMEPAD;
+ENABLE_GAMEPAD[sdk=macosx*] = ;
ENABLE_GAMEPAD_DEPRECATED = ;
ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING[sdk=macosx*] = ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING;
@@ -88,9 +88,9 @@
ENABLE_SERVICE_CONTROLS_macosx_101100 = ENABLE_SERVICE_CONTROLS;
ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
ENABLE_INDEXED_DATABASE_IN_WORKERS = ;
-ENABLE_INDIE_UI = ENABLE_INDIE_UI;
-ENABLE_INPUT_TYPE_COLOR[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR;
-ENABLE_INPUT_TYPE_COLOR_POPOVER[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR_POPOVER;
+ENABLE_INDIE_UI = ;
+ENABLE_INPUT_TYPE_COLOR[sdk=macosx*] = ;
+ENABLE_INPUT_TYPE_COLOR_POPOVER[sdk=macosx*] = ;
ENABLE_INPUT_TYPE_DATE[sdk=iphone*] = ENABLE_INPUT_TYPE_DATE;
ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE = ;
ENABLE_INPUT_TYPE_DATETIMELOCAL[sdk=iphone*] = ENABLE_INPUT_TYPE_DATETIMELOCAL;
@@ -137,7 +137,7 @@
ENABLE_MHTML = ;
ENABLE_MOUSE_CURSOR_SCALE[sdk=macosx*] = ENABLE_MOUSE_CURSOR_SCALE;
ENABLE_NAVIGATOR_CONTENT_UTILS = ;
-ENABLE_NAVIGATOR_HWCONCURRENCY = ENABLE_NAVIGATOR_HWCONCURRENCY;
+ENABLE_NAVIGATOR_HWCONCURRENCY = ;
ENABLE_NOSNIFF = ;
ENABLE_NOTIFICATIONS[sdk=macosx*] = ENABLE_NOTIFICATIONS;
ENABLE_PDFKIT_PLUGIN[sdk=macosx*] = ENABLE_PDFKIT_PLUGIN;
@@ -158,7 +158,7 @@
ENABLE_RUBBER_BANDING[sdk=macosx*] = ENABLE_RUBBER_BANDING;
ENABLE_CSS_SCROLL_SNAP = ENABLE_CSS_SCROLL_SNAP;
ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
-ENABLE_STREAMS_API = ENABLE_STREAMS_API;
+ENABLE_STREAMS_API = ;
ENABLE_SUBTLE_CRYPTO = ENABLE_SUBTLE_CRYPTO;
ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
ENABLE_SVG_OTF_CONVERTER = ENABLE_SVG_OTF_CONVERTER;
@@ -189,8 +189,8 @@
ENABLE_WEBGL = ENABLE_WEBGL;
ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
ENABLE_WEB_REPLAY = $(ENABLE_WEB_REPLAY_$(PLATFORM_NAME)_$(CONFIGURATION));
-ENABLE_WEB_REPLAY_macosx_Debug = ENABLE_WEB_REPLAY;
-ENABLE_WEB_REPLAY_macosx_Release = ENABLE_WEB_REPLAY;
+ENABLE_WEB_REPLAY_macosx_Debug = ;
+ENABLE_WEB_REPLAY_macosx_Release = ;
ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
ENABLE_WEB_TIMING[sdk=iphone*] = ENABLE_WEB_TIMING;
Modified: branches/safari-601.1.32.2-branch/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (184508 => 184509)
--- branches/safari-601.1.32.2-branch/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2015-05-18 19:53:28 UTC (rev 184508)
+++ branches/safari-601.1.32.2-branch/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2015-05-18 20:15:49 UTC (rev 184509)
@@ -34,7 +34,7 @@
ENABLE_3D_TRANSFORMS = ENABLE_3D_TRANSFORMS;
ENABLE_ACCELERATED_2D_CANVAS = ;
ENABLE_ACCELERATED_OVERFLOW_SCROLLING[sdk=iphone*] = ENABLE_ACCELERATED_OVERFLOW_SCROLLING;
-ENABLE_ATTACHMENT_ELEMENT = ENABLE_ATTACHMENT_ELEMENT;
+ENABLE_ATTACHMENT_ELEMENT = ;
ENABLE_AVF_CAPTIONS[sdk=iphone*] = ENABLE_AVF_CAPTIONS;
ENABLE_AVF_CAPTIONS[sdk=macosx*] = $(ENABLE_AVF_CAPTIONS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
ENABLE_AVF_CAPTIONS_macosx_1090 = ;
@@ -48,15 +48,15 @@
ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX = ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX;
ENABLE_CONTENT_FILTERING = ENABLE_CONTENT_FILTERING;
ENABLE_CSP_NEXT = ;
-ENABLE_CSS_ANIMATIONS_LEVEL_2 = ENABLE_CSS_ANIMATIONS_LEVEL_2;
+ENABLE_CSS_ANIMATIONS_LEVEL_2 = ;
ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;
ENABLE_CSS_COMPOSITING = ENABLE_CSS_COMPOSITING;
ENABLE_CSS_DEVICE_ADAPTATION = ;
-ENABLE_CSS_GRID_LAYOUT = ENABLE_CSS_GRID_LAYOUT;
+ENABLE_CSS_GRID_LAYOUT = ;
ENABLE_CSS_IMAGE_ORIENTATION = ;
ENABLE_CSS_IMAGE_RESOLUTION = ;
ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
-ENABLE_CSS_SELECTORS_LEVEL4 = ENABLE_CSS_SELECTORS_LEVEL4;
+ENABLE_CSS_SELECTORS_LEVEL4 = ;
ENABLE_CSS_SHAPES = ENABLE_CSS_SHAPES;
ENABLE_CSS3_TEXT = ;
ENABLE_CSS3_TEXT_LINE_BREAK = ;
@@ -77,7 +77,7 @@
ENABLE_FILTERS_LEVEL_2_macosx_101100 = ENABLE_FILTERS_LEVEL_2;
ENABLE_FONT_LOAD_EVENTS = ;
ENABLE_FULLSCREEN_API[sdk=macosx*] = ENABLE_FULLSCREEN_API;
-ENABLE_GAMEPAD[sdk=macosx*] = ENABLE_GAMEPAD;
+ENABLE_GAMEPAD[sdk=macosx*] = ;
ENABLE_GAMEPAD_DEPRECATED = ;
ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING[sdk=macosx*] = ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING;
@@ -88,9 +88,9 @@
ENABLE_SERVICE_CONTROLS_macosx_101100 = ENABLE_SERVICE_CONTROLS;
ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
ENABLE_INDEXED_DATABASE_IN_WORKERS = ;
-ENABLE_INDIE_UI = ENABLE_INDIE_UI;
-ENABLE_INPUT_TYPE_COLOR[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR;
-ENABLE_INPUT_TYPE_COLOR_POPOVER[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR_POPOVER;
+ENABLE_INDIE_UI = ;
+ENABLE_INPUT_TYPE_COLOR[sdk=macosx*] = ;
+ENABLE_INPUT_TYPE_COLOR_POPOVER[sdk=macosx*] = ;
ENABLE_INPUT_TYPE_DATE[sdk=iphone*] = ENABLE_INPUT_TYPE_DATE;
ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE = ;
ENABLE_INPUT_TYPE_DATETIMELOCAL[sdk=iphone*] = ENABLE_INPUT_TYPE_DATETIMELOCAL;
@@ -137,7 +137,7 @@
ENABLE_MHTML = ;
ENABLE_MOUSE_CURSOR_SCALE[sdk=macosx*] = ENABLE_MOUSE_CURSOR_SCALE;
ENABLE_NAVIGATOR_CONTENT_UTILS = ;
-ENABLE_NAVIGATOR_HWCONCURRENCY = ENABLE_NAVIGATOR_HWCONCURRENCY;
+ENABLE_NAVIGATOR_HWCONCURRENCY = ;
ENABLE_NOSNIFF = ;
ENABLE_NOTIFICATIONS[sdk=macosx*] = ENABLE_NOTIFICATIONS;
ENABLE_PDFKIT_PLUGIN[sdk=macosx*] = ENABLE_PDFKIT_PLUGIN;
@@ -158,7 +158,7 @@
ENABLE_RUBBER_BANDING[sdk=macosx*] = ENABLE_RUBBER_BANDING;
ENABLE_CSS_SCROLL_SNAP = ENABLE_CSS_SCROLL_SNAP;
ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
-ENABLE_STREAMS_API = ENABLE_STREAMS_API;
+ENABLE_STREAMS_API = ;
ENABLE_SUBTLE_CRYPTO = ENABLE_SUBTLE_CRYPTO;
ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
ENABLE_SVG_OTF_CONVERTER = ENABLE_SVG_OTF_CONVERTER;
@@ -189,8 +189,8 @@
ENABLE_WEBGL = ENABLE_WEBGL;
ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
ENABLE_WEB_REPLAY = $(ENABLE_WEB_REPLAY_$(PLATFORM_NAME)_$(CONFIGURATION));
-ENABLE_WEB_REPLAY_macosx_Debug = ENABLE_WEB_REPLAY;
-ENABLE_WEB_REPLAY_macosx_Release = ENABLE_WEB_REPLAY;
+ENABLE_WEB_REPLAY_macosx_Debug = ;
+ENABLE_WEB_REPLAY_macosx_Release = ;
ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
ENABLE_WEB_TIMING[sdk=iphone*] = ENABLE_WEB_TIMING;
Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog (184508 => 184509)
--- branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog 2015-05-18 19:53:28 UTC (rev 184508)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog 2015-05-18 20:15:49 UTC (rev 184509)
@@ -1,5 +1,34 @@
2015-05-18 Matthew Hanson <matthew_han...@apple.com>
+ Merge custom patch. rdar://problem/20950052
+
+ 2015-05-15 Dean Jackson <d...@apple.com>
+
+ Disable some features on the safari-601.1.32.2-branch
+ https://bugs.webkit.org/show_bug.cgi?id=145077
+ <rdar://problem/20950052>
+
+ Reviewed by Tim Horton.
+
+ Disable the following features:
+
+ - ATTACHMENT_ELEMENT
+ - CSS_ANIMATIONS_LEVEL_2
+ - CSS_GRID_LAYOUT
+ - CSS_SELECTORS_LEVEL4
+ - GAMEPAD
+ - INDIE_UI
+ - INPUT_TYPE_COLOR
+ - INPUT_TYPE_COLOR_POPOVER
+ - NAVIGATOR_HWCONCURRENCY
+ - STREAMS_API
+ - WEB_REPLAY
+ - WILL_REVEAL_EDGE_EVENTS
+
+ * Configurations/FeatureDefines.xcconfig:
+
+2015-05-18 Matthew Hanson <matthew_han...@apple.com>
+
Merge r184422. rdar://problem/20410944
2015-05-15 James Savage <james.sav...@apple.com>
Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/Configurations/FeatureDefines.xcconfig (184508 => 184509)
--- branches/safari-601.1.32.2-branch/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2015-05-18 19:53:28 UTC (rev 184508)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2015-05-18 20:15:49 UTC (rev 184509)
@@ -34,7 +34,7 @@
ENABLE_3D_TRANSFORMS = ENABLE_3D_TRANSFORMS;
ENABLE_ACCELERATED_2D_CANVAS = ;
ENABLE_ACCELERATED_OVERFLOW_SCROLLING[sdk=iphone*] = ENABLE_ACCELERATED_OVERFLOW_SCROLLING;
-ENABLE_ATTACHMENT_ELEMENT = ENABLE_ATTACHMENT_ELEMENT;
+ENABLE_ATTACHMENT_ELEMENT = ;
ENABLE_AVF_CAPTIONS[sdk=iphone*] = ENABLE_AVF_CAPTIONS;
ENABLE_AVF_CAPTIONS[sdk=macosx*] = $(ENABLE_AVF_CAPTIONS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
ENABLE_AVF_CAPTIONS_macosx_1090 = ;
@@ -48,15 +48,15 @@
ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX = ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX;
ENABLE_CONTENT_FILTERING = ENABLE_CONTENT_FILTERING;
ENABLE_CSP_NEXT = ;
-ENABLE_CSS_ANIMATIONS_LEVEL_2 = ENABLE_CSS_ANIMATIONS_LEVEL_2;
+ENABLE_CSS_ANIMATIONS_LEVEL_2 = ;
ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;
ENABLE_CSS_COMPOSITING = ENABLE_CSS_COMPOSITING;
ENABLE_CSS_DEVICE_ADAPTATION = ;
-ENABLE_CSS_GRID_LAYOUT = ENABLE_CSS_GRID_LAYOUT;
+ENABLE_CSS_GRID_LAYOUT = ;
ENABLE_CSS_IMAGE_ORIENTATION = ;
ENABLE_CSS_IMAGE_RESOLUTION = ;
ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
-ENABLE_CSS_SELECTORS_LEVEL4 = ENABLE_CSS_SELECTORS_LEVEL4;
+ENABLE_CSS_SELECTORS_LEVEL4 = ;
ENABLE_CSS_SHAPES = ENABLE_CSS_SHAPES;
ENABLE_CSS3_TEXT = ;
ENABLE_CSS3_TEXT_LINE_BREAK = ;
@@ -77,7 +77,7 @@
ENABLE_FILTERS_LEVEL_2_macosx_101100 = ENABLE_FILTERS_LEVEL_2;
ENABLE_FONT_LOAD_EVENTS = ;
ENABLE_FULLSCREEN_API[sdk=macosx*] = ENABLE_FULLSCREEN_API;
-ENABLE_GAMEPAD[sdk=macosx*] = ENABLE_GAMEPAD;
+ENABLE_GAMEPAD[sdk=macosx*] = ;
ENABLE_GAMEPAD_DEPRECATED = ;
ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING[sdk=macosx*] = ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING;
@@ -88,9 +88,9 @@
ENABLE_SERVICE_CONTROLS_macosx_101100 = ENABLE_SERVICE_CONTROLS;
ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
ENABLE_INDEXED_DATABASE_IN_WORKERS = ;
-ENABLE_INDIE_UI = ENABLE_INDIE_UI;
-ENABLE_INPUT_TYPE_COLOR[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR;
-ENABLE_INPUT_TYPE_COLOR_POPOVER[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR_POPOVER;
+ENABLE_INDIE_UI = ;
+ENABLE_INPUT_TYPE_COLOR[sdk=macosx*] = ;
+ENABLE_INPUT_TYPE_COLOR_POPOVER[sdk=macosx*] = ;
ENABLE_INPUT_TYPE_DATE[sdk=iphone*] = ENABLE_INPUT_TYPE_DATE;
ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE = ;
ENABLE_INPUT_TYPE_DATETIMELOCAL[sdk=iphone*] = ENABLE_INPUT_TYPE_DATETIMELOCAL;
@@ -137,7 +137,7 @@
ENABLE_MHTML = ;
ENABLE_MOUSE_CURSOR_SCALE[sdk=macosx*] = ENABLE_MOUSE_CURSOR_SCALE;
ENABLE_NAVIGATOR_CONTENT_UTILS = ;
-ENABLE_NAVIGATOR_HWCONCURRENCY = ENABLE_NAVIGATOR_HWCONCURRENCY;
+ENABLE_NAVIGATOR_HWCONCURRENCY = ;
ENABLE_NOSNIFF = ;
ENABLE_NOTIFICATIONS[sdk=macosx*] = ENABLE_NOTIFICATIONS;
ENABLE_PDFKIT_PLUGIN[sdk=macosx*] = ENABLE_PDFKIT_PLUGIN;
@@ -158,7 +158,7 @@
ENABLE_RUBBER_BANDING[sdk=macosx*] = ENABLE_RUBBER_BANDING;
ENABLE_CSS_SCROLL_SNAP = ENABLE_CSS_SCROLL_SNAP;
ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
-ENABLE_STREAMS_API = ENABLE_STREAMS_API;
+ENABLE_STREAMS_API = ;
ENABLE_SUBTLE_CRYPTO = ENABLE_SUBTLE_CRYPTO;
ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
ENABLE_SVG_OTF_CONVERTER = ENABLE_SVG_OTF_CONVERTER;
@@ -189,8 +189,8 @@
ENABLE_WEBGL = ENABLE_WEBGL;
ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
ENABLE_WEB_REPLAY = $(ENABLE_WEB_REPLAY_$(PLATFORM_NAME)_$(CONFIGURATION));
-ENABLE_WEB_REPLAY_macosx_Debug = ENABLE_WEB_REPLAY;
-ENABLE_WEB_REPLAY_macosx_Release = ENABLE_WEB_REPLAY;
+ENABLE_WEB_REPLAY_macosx_Debug = ;
+ENABLE_WEB_REPLAY_macosx_Release = ;
ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
ENABLE_WEB_TIMING[sdk=iphone*] = ENABLE_WEB_TIMING;
