Skip to content

Commit c33fad6

Browse files
author
Dan Bernstein
committed
[Mac] WebKit contains dead source code for OS X Mavericks and earlier
https://bugs.webkit.org/show_bug.cgi?id=152462 Reviewed by Alexey Proskuryakov. Source/bmalloc: * Configurations/DebugRelease.xcconfig: Removed definition of MACOSX_DEPLOYMENT_TARGET for OS X 10.9. Source/JavaScriptCore: - Removed build setting definitions for OS X 10.9 and earlier, and simplified defintions that became uniform across all OS X versions as a result: * Configurations/DebugRelease.xcconfig: * Configurations/FeatureDefines.xcconfig: * Configurations/Version.xcconfig: * API/JSBase.h: Removed check against __MAC_OS_X_VERSION_MIN_REQUIRED that was always true. Source/ThirdParty/ANGLE: * Configurations/DebugRelease.xcconfig: Removed definitions of MACOSX_DEPLOYMENT_TARGET for OS X 10.8 and 10.9. Source/WebCore: - Removed build setting definitions for OS X 10.9 and earlier, and simplified defintions that became uniform across all OS X versions as a result: * Configurations/DebugRelease.xcconfig: * Configurations/FeatureDefines.xcconfig: * Configurations/Version.xcconfig: - Removed support for animating default buttons: * rendering/RenderButton.cpp: (WebCore::RenderButton::RenderButton): Removed m_default initialization. (WebCore::RenderButton::styleDidChange): Removed checking for animating default button and starting the animation timer. (WebCore::RenderButton::timerFired): Deleted. * rendering/RenderButton.h: Removed m_timer and m_default member variables * rendering/RenderTheme.h: (WebCore::RenderTheme::defaultButtonHasAnimation): Deleted. * rendering/RenderThemeMac.h: Deleted override. * rendering/RenderThemeMac.mm: (WebCore::RenderThemeMac::defaultButtonHasAnimation): Deleted. - Simplified expressions involving __MAC_OS_X_VERSION_MIN_REQUIRED and removed code that was never getting compiled: * accessibility/mac/WebAccessibilityObjectWrapperMac.mm: * editing/mac/DictionaryLookup.h: * editing/mac/DictionaryLookup.mm: * html/canvas/WebGLDrawBuffers.cpp: * loader/DocumentLoader.cpp: * loader/cache/CachedFont.cpp: * loader/cocoa/DiskCacheMonitorCocoa.h: * page/cocoa/SettingsCocoa.mm: * platform/Scrollbar.cpp: * platform/cocoa/MemoryPressureHandlerCocoa.mm: * platform/cocoa/NetworkExtensionContentFilter.h: * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm: * platform/graphics/cg/ImageSourceCG.cpp: * platform/graphics/cocoa/FontCacheCoreText.cpp: * platform/graphics/cocoa/FontCascadeCocoa.mm: * platform/graphics/mac/GraphicsContext3DMac.mm: * platform/mac/NSScrollerImpDetails.h: * platform/mac/ScrollAnimatorMac.mm: * platform/mac/ScrollViewMac.mm: * platform/mac/ScrollbarThemeMac.mm: * platform/mac/ThemeMac.mm: * platform/mac/WebCoreFullScreenPlaceholderView.h: * platform/mac/WebCoreFullScreenPlaceholderView.mm: * platform/network/cf/CookieJarCFNet.cpp: * platform/network/cf/ResourceRequest.h: * platform/spi/cf/CFNetworkSPI.h: * platform/spi/cocoa/CoreTextSPI.h: * platform/spi/cocoa/NSButtonCellSPI.h: * platform/spi/cocoa/NSColorSPI.h: * platform/spi/cocoa/QuartzCoreSPI.h: * platform/spi/mac/LookupSPI.h: * platform/spi/mac/NSFontSPI.h: * platform/spi/mac/NSImmediateActionGestureRecognizerSPI.h: * platform/spi/mac/NSPopoverSPI.h: * platform/spi/mac/NSSharingServicePickerSPI.h: * platform/spi/mac/NSSharingServiceSPI.h: * platform/spi/mac/TUCallSPI.h: * platform/sql/SQLiteDatabase.cpp: Source/WebInspectorUI: - Removed build setting definitions for OS X 10.9 and earlier, and simplified defintions that became uniform across all OS X versions as a result: * Configurations/Base.xcconfig: * Configurations/DebugRelease.xcconfig: * Configurations/Version.xcconfig: * Scripts/copy-user-interface-resources.pl: Removed code to delete Images/Legacy. * UserInterface/Images/Legacy: Removed this empty directory. Source/WebKit/mac: - Removed build setting definitions for OS X 10.9 and earlier, and simplified defintions that became uniform across all OS X versions as a result: * Configurations/DebugRelease.xcconfig: * Configurations/FeatureDefines.xcconfig: * Configurations/Version.xcconfig: * Configurations/WebKitLegacy.xcconfig: - Simplified expressions involving __MAC_OS_X_VERSION_MIN_REQUIRED and removed code that was never getting compiled: * WebCoreSupport/WebInspectorClient.mm: * WebView/WebDynamicScrollBarsView.mm: * WebView/WebHTMLView.mm: * WebView/WebImmediateActionController.h: * WebView/WebImmediateActionController.mm: * WebView/WebView.mm: * WebView/WebViewData.h: * WebView/WebViewData.mm: * WebView/WebViewInternal.h: Source/WebKit2: - Removed build setting definitions for OS X 10.9 and earlier, and simplified defintions that became uniform across all OS X versions as a result: * Configurations/BaseTarget.xcconfig: * Configurations/BaseXPCService.xcconfig: * Configurations/DebugRelease.xcconfig: * Configurations/FeatureDefines.xcconfig: * Configurations/Version.xcconfig: * Configurations/WebKit.xcconfig: - Removed the definition of BUNDLE_LOCALIZATION_KEY: * Configurations/WebContentService.Development.xcconfig: * Configurations/WebContentService.xcconfig: - Added CFBundleFollowParentLocalization set to true: * WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info-OSX.plist: * WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info-iOS.plist: * WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist: * WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist: * WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist: * WebKit2.xcodeproj/project.pbxproj: Removed the “Add CFBundle Localization Info.plist Key” script build phases from the Web Content Service targets. - Simplified expressions involving __MAC_OS_X_VERSION_MIN_REQUIRED and removed code that was never getting compiled: * DatabaseProcess/mac/com.apple.WebKit.Databases.sb.in: * NetworkProcess/cocoa/NetworkProcessCocoa.mm: * NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in: * Platform/IPC/mac/ConnectionMac.mm: * Platform/IPC/mac/ImportanceAssertion.h: * Platform/mac/MenuUtilities.h: * Platform/mac/MenuUtilities.mm: * Platform/mac/StringUtilities.h: * Platform/mac/StringUtilities.mm: * Shared/API/Cocoa/WKFoundation.h: * Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm: * UIProcess/API/Cocoa/WKViewPrivate.h: * UIProcess/API/Cocoa/WKWebView.mm: * UIProcess/API/Cocoa/WKWebViewPrivate.h: * UIProcess/API/mac/WKView.mm: * UIProcess/Cocoa/WebProcessPoolCocoa.mm: * UIProcess/Cocoa/WebViewImpl.h: * UIProcess/Cocoa/WebViewImpl.mm: * UIProcess/Launcher/mac/ProcessLauncherMac.mm: * UIProcess/mac/PageClientImpl.mm: * UIProcess/mac/WKImmediateActionController.h: * UIProcess/mac/WKImmediateActionController.mm: * UIProcess/mac/WebInspectorProxyMac.mm: * WebProcess/WebPage/FindController.cpp: * WebProcess/WebPage/WebPage.cpp: * WebProcess/com.apple.WebProcess.sb.in: * config.h: Source/WTF: * Configurations/DebugRelease.xcconfig: Removed definition of MACOSX_DEPLOYMENT_TARGET for OS X 10.9. - Simplified expressions involving __MAC_OS_X_VERSION_MIN_REQUIRED and removed code that was never getting compiled: * wtf/FeatureDefines.h: * wtf/MainThread.h: * wtf/OSObjectPtr.h: * wtf/Platform.h: * wtf/mac/DeprecatedSymbolsUsedBySafari.mm: * wtf/spi/darwin/XPCSPI.h: Tools: - Removed definitions of MACOSX_DEPLOYMENT_TARGET and WEBKIT_SYSTEM_INTERFACE_LIBRARY for OS X 10.9: * DumpRenderTree/mac/Configurations/DebugRelease.xcconfig: * LayoutTestRelay/Configurations/DebugRelease.xcconfig: * MiniBrowser/Configurations/DebugRelease.xcconfig: * TestWebKitAPI/Configurations/DebugRelease.xcconfig: * WebKitTestRunner/Configurations/DebugRelease.xcconfig: - Simplified expressions involving __MAC_OS_X_VERSION_MIN_REQUIRED and removed code that was never getting compiled: * DumpRenderTree/mac/TextInputController.m: * MiniBrowser/mac/BrowserWindowController.m: * TestWebKitAPI/Tests/mac/AttributedString.mm: * WebKitTestRunner/mac/EventSenderProxy.mm: WebKitLibraries: * libWebKitSystemInterfaceMavericks.a: Removed. Canonical link: https://commits.webkit.org/170565@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@194318 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent aab061f commit c33fad6

137 files changed

Lines changed: 378 additions & 896 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Source/JavaScriptCore/API/JSBase.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ JS_EXPORT void JSGarbageCollect(JSContextRef ctx);
136136

137137
/* Enable the Objective-C API for platforms with a modern runtime. */
138138
#if !defined(JSC_OBJC_API_ENABLED)
139-
#define JSC_OBJC_API_ENABLED (defined(__clang__) && defined(__APPLE__) && !defined(BUILDING_GTK__) && ((defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090 && !defined(__i386__)) || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)))
139+
#define JSC_OBJC_API_ENABLED (defined(__clang__) && defined(__APPLE__) && !defined(BUILDING_GTK__) && ((defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && !defined(__i386__)) || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)))
140140
#endif
141141

142142
#endif /* JSBase_h */

‎Source/JavaScriptCore/ChangeLog‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
2015-12-19 Dan Bernstein <mitz@apple.com>
2+
3+
[Mac] WebKit contains dead source code for OS X Mavericks and earlier
4+
https://bugs.webkit.org/show_bug.cgi?id=152462
5+
6+
Reviewed by Alexey Proskuryakov.
7+
8+
- Removed build setting definitions for OS X 10.9 and earlier, and simplified defintions
9+
that became uniform across all OS X versions as a result:
10+
11+
* Configurations/DebugRelease.xcconfig:
12+
* Configurations/FeatureDefines.xcconfig:
13+
* Configurations/Version.xcconfig:
14+
15+
* API/JSBase.h: Removed check against __MAC_OS_X_VERSION_MIN_REQUIRED that was always true.
16+
117
2015-12-19 Benjamin Poulain <bpoulain@apple.com>
218

319
[JSC] Streamline Tmp indexing inside the register allocator

‎Source/JavaScriptCore/Configurations/DebugRelease.xcconfig‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ ARCHS = $(ARCHS_STANDARD_32_64_BIT);
2828
ONLY_ACTIVE_ARCH = YES;
2929

3030
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
31-
MACOSX_DEPLOYMENT_TARGET_macosx_1090 = 10.9;
3231
MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
3332
MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
3433
MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;

‎Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig‎

Lines changed: 8 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,7 @@ ENABLE_3D_TRANSFORMS = ENABLE_3D_TRANSFORMS;
3535
ENABLE_ACCELERATED_2D_CANVAS = ;
3636
ENABLE_ACCELERATED_OVERFLOW_SCROLLING[sdk=iphone*] = ENABLE_ACCELERATED_OVERFLOW_SCROLLING;
3737
ENABLE_ATTACHMENT_ELEMENT = ENABLE_ATTACHMENT_ELEMENT;
38-
ENABLE_AVF_CAPTIONS[sdk=iphone*] = ENABLE_AVF_CAPTIONS;
39-
ENABLE_AVF_CAPTIONS[sdk=macosx*] = $(ENABLE_AVF_CAPTIONS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
40-
ENABLE_AVF_CAPTIONS_macosx_1090 = ;
41-
ENABLE_AVF_CAPTIONS_macosx_101000 = ENABLE_AVF_CAPTIONS;
42-
ENABLE_AVF_CAPTIONS_macosx_101100 = ENABLE_AVF_CAPTIONS;
43-
ENABLE_AVF_CAPTIONS_macosx_101200 = ENABLE_AVF_CAPTIONS;
38+
ENABLE_AVF_CAPTIONS = ENABLE_AVF_CAPTIONS;
4439
ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
4540
ENABLE_CANVAS_PATH = ENABLE_CANVAS_PATH;
4641
ENABLE_CANVAS_PROXY = ;
@@ -76,24 +71,15 @@ ENABLE_DOM4_EVENTS_CONSTRUCTOR = ENABLE_DOM4_EVENTS_CONSTRUCTOR;
7671
ENABLE_ENCRYPTED_MEDIA[sdk=macosx*] = ENABLE_ENCRYPTED_MEDIA;
7772
ENABLE_ENCRYPTED_MEDIA_V2[sdk=macosx*] = ENABLE_ENCRYPTED_MEDIA_V2;
7873
ENABLE_FETCH_API = ENABLE_FETCH_API;
79-
ENABLE_FILTERS_LEVEL_2[sdk=iphone*] = ENABLE_FILTERS_LEVEL_2;
80-
ENABLE_FILTERS_LEVEL_2[sdk=macosx*] = $(ENABLE_FILTERS_LEVEL_2_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
81-
ENABLE_FILTERS_LEVEL_2_macosx_1090 = ;
82-
ENABLE_FILTERS_LEVEL_2_macosx_101000 = ENABLE_FILTERS_LEVEL_2;
83-
ENABLE_FILTERS_LEVEL_2_macosx_101100 = ENABLE_FILTERS_LEVEL_2;
84-
ENABLE_FILTERS_LEVEL_2_macosx_101200 = ENABLE_FILTERS_LEVEL_2;
74+
ENABLE_FILTERS_LEVEL_2 = ENABLE_FILTERS_LEVEL_2;
8575
ENABLE_FONT_LOAD_EVENTS = ;
8676
ENABLE_FULLSCREEN_API[sdk=macosx*] = ENABLE_FULLSCREEN_API;
8777
ENABLE_GAMEPAD[sdk=macosx*] = ENABLE_GAMEPAD;
8878
ENABLE_GAMEPAD_DEPRECATED = ;
8979
ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
9080
ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING[sdk=macosx*] = ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING;
9181
ENABLE_ICONDATABASE[sdk=macosx*] = ENABLE_ICONDATABASE;
92-
ENABLE_SERVICE_CONTROLS[sdk=macosx*] = $(ENABLE_SERVICE_CONTROLS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
93-
ENABLE_SERVICE_CONTROLS_macosx_1090 = ;
94-
ENABLE_SERVICE_CONTROLS_macosx_101000 = ENABLE_SERVICE_CONTROLS;
95-
ENABLE_SERVICE_CONTROLS_macosx_101100 = ENABLE_SERVICE_CONTROLS;
96-
ENABLE_SERVICE_CONTROLS_macosx_101200 = ENABLE_SERVICE_CONTROLS;
82+
ENABLE_SERVICE_CONTROLS[sdk=macosx*] = ENABLE_SERVICE_CONTROLS;
9783
ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
9884
ENABLE_INDEXED_DATABASE_IN_WORKERS = ;
9985
ENABLE_INDIE_UI = ENABLE_INDIE_UI;
@@ -106,16 +92,10 @@ ENABLE_INPUT_TYPE_MONTH[sdk=iphone*] = ENABLE_INPUT_TYPE_MONTH;
10692
ENABLE_INPUT_TYPE_TIME[sdk=iphone*] = ENABLE_INPUT_TYPE_TIME;
10793
ENABLE_INPUT_TYPE_WEEK[sdk=iphone*] = ENABLE_INPUT_TYPE_WEEK;
10894

109-
ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS[sdk=iphone*] = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
110-
ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS[sdk=macosx*] = $(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR))
111-
ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_1090 = ;
112-
ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_101000 = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
113-
ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_101100 = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
114-
ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_101200 = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
95+
ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
11596

11697
ENABLE_WIRELESS_PLAYBACK_TARGET[sdk=iphone*] = ENABLE_WIRELESS_PLAYBACK_TARGET;
11798
ENABLE_WIRELESS_PLAYBACK_TARGET[sdk=macosx*] = $(ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR))
118-
ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_1090 = ;
11999
ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_101000 = ;
120100
ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_101100 = ENABLE_WIRELESS_PLAYBACK_TARGET;
121101
ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_101200 = ENABLE_WIRELESS_PLAYBACK_TARGET;
@@ -128,7 +108,6 @@ ENABLE_IOS_GESTURE_EVENTS_ios_WITH_INTERNAL_SDK_YES = ENABLE_IOS_GESTURE_EVENTS;
128108

129109
ENABLE_MAC_GESTURE_EVENTS = ;
130110
ENABLE_MAC_GESTURE_EVENTS[sdk=macosx*] = $(ENABLE_MAC_GESTURE_EVENTS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
131-
ENABLE_MAC_GESTURE_EVENTS_macosx_1090_WITH_INTERNAL_SDK_YES = ;
132111
ENABLE_MAC_GESTURE_EVENTS_macosx_101000_WITH_INTERNAL_SDK_YES = ;
133112
ENABLE_MAC_GESTURE_EVENTS_macosx_101100_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
134113
ENABLE_MAC_GESTURE_EVENTS_macosx_101200_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
@@ -148,11 +127,7 @@ ENABLE_MATHML = ENABLE_MATHML;
148127
ENABLE_MEDIA_CONTROLS_SCRIPT = ENABLE_MEDIA_CONTROLS_SCRIPT;
149128
ENABLE_MEDIA_SESSION = ;
150129

151-
ENABLE_MEDIA_SOURCE[sdk=macosx*] = $(ENABLE_MEDIA_SOURCE_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
152-
ENABLE_MEDIA_SOURCE_macosx_1090 = ;
153-
ENABLE_MEDIA_SOURCE_macosx_101000 = ENABLE_MEDIA_SOURCE;
154-
ENABLE_MEDIA_SOURCE_macosx_101100 = ENABLE_MEDIA_SOURCE;
155-
ENABLE_MEDIA_SOURCE_macosx_101200 = ENABLE_MEDIA_SOURCE;
130+
ENABLE_MEDIA_SOURCE[sdk=macosx*] = ENABLE_MEDIA_SOURCE;
156131

157132
ENABLE_MEDIA_STATISTICS = ;
158133
ENABLE_MEDIA_STREAM = ENABLE_MEDIA_STREAM;
@@ -170,12 +145,7 @@ ENABLE_PUBLIC_SUFFIX_LIST = ENABLE_PUBLIC_SUFFIX_LIST;
170145
ENABLE_QUOTA = ;
171146
ENABLE_REQUEST_ANIMATION_FRAME = ENABLE_REQUEST_ANIMATION_FRAME;
172147
ENABLE_REQUEST_AUTOCOMPLETE = ;
173-
ENABLE_REMOTE_INSPECTOR[sdk=iphone*] = ENABLE_REMOTE_INSPECTOR;
174-
ENABLE_REMOTE_INSPECTOR[sdk=macosx*] = $(ENABLE_REMOTE_INSPECTOR_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
175-
ENABLE_REMOTE_INSPECTOR_macosx_1090 = ;
176-
ENABLE_REMOTE_INSPECTOR_macosx_101000 = ENABLE_REMOTE_INSPECTOR;
177-
ENABLE_REMOTE_INSPECTOR_macosx_101100 = ENABLE_REMOTE_INSPECTOR;
178-
ENABLE_REMOTE_INSPECTOR_macosx_101200 = ENABLE_REMOTE_INSPECTOR;
148+
ENABLE_REMOTE_INSPECTOR = ENABLE_REMOTE_INSPECTOR;
179149
ENABLE_RESOLUTION_MEDIA_QUERY = ;
180150
ENABLE_RUBBER_BANDING[sdk=macosx*] = ENABLE_RUBBER_BANDING;
181151
ENABLE_CSS_SCROLL_SNAP = ENABLE_CSS_SCROLL_SNAP;
@@ -185,12 +155,7 @@ ENABLE_SUBTLE_CRYPTO = ENABLE_SUBTLE_CRYPTO;
185155
ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
186156
ENABLE_SVG_OTF_CONVERTER = ENABLE_SVG_OTF_CONVERTER;
187157

188-
ENABLE_TELEPHONE_NUMBER_DETECTION[sdk=iphone*] = ENABLE_TELEPHONE_NUMBER_DETECTION;
189-
ENABLE_TELEPHONE_NUMBER_DETECTION[sdk=macosx*] = $(ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
190-
ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_1090 = ;
191-
ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_101000 = ENABLE_TELEPHONE_NUMBER_DETECTION;
192-
ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_101100 = ENABLE_TELEPHONE_NUMBER_DETECTION;
193-
ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_101200 = ENABLE_TELEPHONE_NUMBER_DETECTION;
158+
ENABLE_TELEPHONE_NUMBER_DETECTION = ENABLE_TELEPHONE_NUMBER_DETECTION;
194159

195160
ENABLE_TEMPLATE_ELEMENT = ENABLE_TEMPLATE_ELEMENT;
196161
ENABLE_TEXT_AUTOSIZING = ;
@@ -219,12 +184,7 @@ ENABLE_WEB_REPLAY_macosx_Debug = ENABLE_WEB_REPLAY;
219184
ENABLE_WEB_REPLAY_macosx_Release = ENABLE_WEB_REPLAY;
220185
ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
221186

222-
ENABLE_WEB_TIMING[sdk=iphone*] = ENABLE_WEB_TIMING;
223-
ENABLE_WEB_TIMING[sdk=macosx*] = $(ENABLE_WEB_TIMING_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
224-
ENABLE_WEB_TIMING_macosx_1090 = ;
225-
ENABLE_WEB_TIMING_macosx_101000 = ENABLE_WEB_TIMING;
226-
ENABLE_WEB_TIMING_macosx_101100 = ENABLE_WEB_TIMING;
227-
ENABLE_WEB_TIMING_macosx_101200 = ENABLE_WEB_TIMING;
187+
ENABLE_WEB_TIMING = ENABLE_WEB_TIMING;
228188

229189
ENABLE_XSLT = ENABLE_XSLT;
230190

‎Source/JavaScriptCore/Configurations/Version.xcconfig‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ SHORT_VERSION_STRING = $(SHORT_VERSION_STRING_$(CONFIGURATION))
3535
// The system version prefix is based on the current system version.
3636
SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
3737
SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
38-
SYSTEM_VERSION_PREFIX_macosx_1090 = 9;
3938
SYSTEM_VERSION_PREFIX_macosx_101000 = 10;
4039
SYSTEM_VERSION_PREFIX_macosx_101100 = 11;
4140
SYSTEM_VERSION_PREFIX_macosx_101200 = 12;

‎Source/ThirdParty/ANGLE/ChangeLog‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
2015-12-19 Dan Bernstein <mitz@apple.com>
2+
3+
[Mac] WebKit contains dead source code for OS X Mavericks and earlier
4+
https://bugs.webkit.org/show_bug.cgi?id=152462
5+
6+
Reviewed by Alexey Proskuryakov.
7+
8+
* Configurations/DebugRelease.xcconfig: Removed definitions of MACOSX_DEPLOYMENT_TARGET for
9+
OS X 10.8 and 10.9.
10+
111
2015-12-03 Anders Carlsson <andersca@apple.com>
212

313
Remove Objective-C GC support

‎Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ ARCHS = $(ARCHS_STANDARD_32_64_BIT);
55
ONLY_ACTIVE_ARCH = YES;
66

77
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
8-
MACOSX_DEPLOYMENT_TARGET_macosx_1080 = 10.8;
9-
MACOSX_DEPLOYMENT_TARGET_macosx_1090 = 10.9;
108
MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
119
MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
1210
MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;

‎Source/WTF/ChangeLog‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,23 @@
1+
2015-12-19 Dan Bernstein <mitz@apple.com>
2+
3+
[Mac] WebKit contains dead source code for OS X Mavericks and earlier
4+
https://bugs.webkit.org/show_bug.cgi?id=152462
5+
6+
Reviewed by Alexey Proskuryakov.
7+
8+
* Configurations/DebugRelease.xcconfig: Removed definition of MACOSX_DEPLOYMENT_TARGET for
9+
OS X 10.9.
10+
11+
- Simplified expressions involving __MAC_OS_X_VERSION_MIN_REQUIRED and removed code that was
12+
never getting compiled:
13+
14+
* wtf/FeatureDefines.h:
15+
* wtf/MainThread.h:
16+
* wtf/OSObjectPtr.h:
17+
* wtf/Platform.h:
18+
* wtf/mac/DeprecatedSymbolsUsedBySafari.mm:
19+
* wtf/spi/darwin/XPCSPI.h:
20+
121
2015-12-17 Sukolsak Sakshuwong <sukolsak@gmail.com>
222

323
[INTL] Implement Collator Compare Functions

‎Source/WTF/Configurations/DebugRelease.xcconfig‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ ARCHS = $(ARCHS_STANDARD_32_64_BIT);
2727
ONLY_ACTIVE_ARCH = YES;
2828

2929
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
30-
MACOSX_DEPLOYMENT_TARGET_macosx_1090 = 10.9;
3130
MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
3231
MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
3332
MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;

‎Source/WTF/wtf/FeatureDefines.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,15 +200,13 @@ the public iOS SDK. We will also need to update the FeatureDefines.xcconfig file
200200
#define ENABLE_FULLSCREEN_API 1
201201
#endif
202202

203-
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
204203
#if !defined(ENABLE_REMOTE_INSPECTOR)
205204
#define ENABLE_REMOTE_INSPECTOR 1
206205
#endif
207206

208207
#if !defined(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS)
209208
#define ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS 1
210209
#endif
211-
#endif
212210

213211
#if !defined(ENABLE_SMOOTH_SCROLLING)
214212
#define ENABLE_SMOOTH_SCROLLING 1

0 commit comments

Comments
 (0)