Remove even more Mountain Lion support
authorweinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 31 Jan 2015 22:55:39 +0000 (22:55 +0000)
committerweinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 31 Jan 2015 22:55:39 +0000 (22:55 +0000)
https://bugs.webkit.org/show_bug.cgi?id=141124

Reviewed by Alexey Proskuryakov.

Source/bmalloc:

* Configurations/Base.xcconfig:
* Configurations/DebugRelease.xcconfig:

Source/JavaScriptCore:

* API/tests/DateTests.mm:
* Configurations/Base.xcconfig:
* Configurations/DebugRelease.xcconfig:
* Configurations/FeatureDefines.xcconfig:
* Configurations/Version.xcconfig:
* jit/ExecutableAllocatorFixedVMPool.cpp:

Source/WebCore:

* Configurations/Base.xcconfig:
* Configurations/DebugRelease.xcconfig:
* Configurations/FeatureDefines.xcconfig:
* Configurations/Version.xcconfig:
* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
(-[WebAccessibilityObjectWrapper accessibilityActionNames]):
(-[WebAccessibilityObjectWrapper subrole]):
* platform/graphics/ca/mac/PlatformCALayerMac.mm:
(PlatformCALayer::drawLayerContents):
* platform/mac/ThemeMac.mm:
(-[WebCoreThemeView _focusRingVisibleRect]):

Source/WebKit/mac:

* Configurations/Base.xcconfig:
* Configurations/DebugRelease.xcconfig:
* Configurations/FeatureDefines.xcconfig:
* Configurations/Version.xcconfig:
* Configurations/WebKitLegacy.xcconfig:

Source/WebKit2:

* Configurations/Base.xcconfig:
* Configurations/DebugRelease.xcconfig:
* Configurations/FeatureDefines.xcconfig:
* Configurations/Version.xcconfig:
* Configurations/WebContentService.Development.xcconfig:
* Configurations/WebContentService.xcconfig:
* Configurations/WebKit.xcconfig:
* NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in:

Source/WTF:

* Configurations/Base.xcconfig:
* Configurations/DebugRelease.xcconfig:
* wtf/Assertions.cpp:
* wtf/FeatureDefines.h:
* wtf/Platform.h:

Tools:

* DumpRenderTree/mac/AccessibilityUIElementMac.mm:
(AccessibilityUIElement::attributedStringRangeIsMisspelled):
* DumpRenderTree/mac/Configurations/Base.xcconfig:
* DumpRenderTree/mac/Configurations/DebugRelease.xcconfig:
* DumpRenderTree/mac/DumpRenderTree.mm:
(activateTestingFonts):
(prepareConsistentTestingEnvironment):
* DumpRenderTree/mac/EventSendingController.mm:
(-[EventSendingController mouseScrollByX:andY:withWheel:andMomentumPhases:]):
(-[EventSendingController contextClick]):
* DumpRenderTree/mac/TextInputController.m:
* LayoutTestRelay/Configurations/Base.xcconfig:
* LayoutTestRelay/Configurations/DebugRelease.xcconfig:
* MiniBrowser/Configurations/Base.xcconfig:
* MiniBrowser/Configurations/DebugRelease.xcconfig:
* MiniBrowser/mac/WK2BrowserWindowController.m:
(-[WK2BrowserWindowController webView:runJavaScriptAlertPanelWithMessage:initiatedByFrame:completionHandler:]):
(-[WK2BrowserWindowController webView:runJavaScriptConfirmPanelWithMessage:initiatedByFrame:completionHandler:]):
(-[WK2BrowserWindowController webView:runJavaScriptTextInputPanelWithPrompt:defaultText:initiatedByFrame:completionHandler:]):
* TestWebKitAPI/Configurations/Base.xcconfig:
* TestWebKitAPI/Configurations/DebugRelease.xcconfig:
* TestWebKitAPI/Tests/WebKit2Cocoa/Download.mm:
(-[DownloadDelegate _downloadDidFinish:]):
* TestWebKitAPI/Tests/mac/StringTruncator.mm:
(TestWebKitAPI::TEST):
* TestWebKitAPI/mac/InjectedBundleControllerMac.mm:
(TestWebKitAPI::InjectedBundleController::platformInitialize):
* WebKitLauncher/Configurations/Base.xcconfig:
* WebKitTestRunner/Configurations/Base.xcconfig:
* WebKitTestRunner/Configurations/DebugRelease.xcconfig:
* WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm:
(WTR::AccessibilityUIElement::attributedStringRangeIsMisspelled):
* WebKitTestRunner/InjectedBundle/mac/ActivateFonts.mm:
(WTR::activateFonts):
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::initialize):
(WTR::TestController::webProcessName):
* WebKitTestRunner/mac/EventSenderProxy.mm:
* asan/asan.xcconfig:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@179450 268f45cc-cd09-0410-ab3c-d52691b4dbfc

65 files changed:
Source/JavaScriptCore/API/tests/DateTests.mm
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/Configurations/Base.xcconfig
Source/JavaScriptCore/Configurations/DebugRelease.xcconfig
Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
Source/JavaScriptCore/Configurations/Version.xcconfig
Source/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp
Source/WTF/ChangeLog
Source/WTF/Configurations/Base.xcconfig
Source/WTF/Configurations/DebugRelease.xcconfig
Source/WTF/wtf/Assertions.cpp
Source/WTF/wtf/FeatureDefines.h
Source/WTF/wtf/Platform.h
Source/WebCore/ChangeLog
Source/WebCore/Configurations/Base.xcconfig
Source/WebCore/Configurations/DebugRelease.xcconfig
Source/WebCore/Configurations/FeatureDefines.xcconfig
Source/WebCore/Configurations/Version.xcconfig
Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm
Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm
Source/WebCore/platform/mac/ThemeMac.mm
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/Configurations/Base.xcconfig
Source/WebKit/mac/Configurations/DebugRelease.xcconfig
Source/WebKit/mac/Configurations/FeatureDefines.xcconfig
Source/WebKit/mac/Configurations/Version.xcconfig
Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig
Source/WebKit2/ChangeLog
Source/WebKit2/Configurations/Base.xcconfig
Source/WebKit2/Configurations/DebugRelease.xcconfig
Source/WebKit2/Configurations/FeatureDefines.xcconfig
Source/WebKit2/Configurations/Version.xcconfig
Source/WebKit2/Configurations/WebContentService.Development.xcconfig
Source/WebKit2/Configurations/WebContentService.xcconfig
Source/WebKit2/Configurations/WebKit.xcconfig
Source/WebKit2/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in
Source/bmalloc/ChangeLog
Source/bmalloc/Configurations/Base.xcconfig
Source/bmalloc/Configurations/DebugRelease.xcconfig
Tools/ChangeLog
Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm
Tools/DumpRenderTree/mac/Configurations/Base.xcconfig
Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig
Tools/DumpRenderTree/mac/DumpRenderTree.mm
Tools/DumpRenderTree/mac/EventSendingController.mm
Tools/DumpRenderTree/mac/TextInputController.h
Tools/DumpRenderTree/mac/TextInputController.m
Tools/LayoutTestRelay/Configurations/Base.xcconfig
Tools/LayoutTestRelay/Configurations/DebugRelease.xcconfig
Tools/MiniBrowser/Configurations/Base.xcconfig
Tools/MiniBrowser/Configurations/DebugRelease.xcconfig
Tools/MiniBrowser/mac/WK2BrowserWindowController.m
Tools/TestWebKitAPI/Configurations/Base.xcconfig
Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig
Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Download.mm
Tools/TestWebKitAPI/Tests/mac/StringTruncator.mm
Tools/TestWebKitAPI/mac/InjectedBundleControllerMac.mm
Tools/WebKitLauncher/Configurations/Base.xcconfig
Tools/WebKitTestRunner/Configurations/Base.xcconfig
Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig
Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm
Tools/WebKitTestRunner/InjectedBundle/mac/ActivateFonts.mm
Tools/WebKitTestRunner/TestController.cpp
Tools/WebKitTestRunner/mac/EventSenderProxy.mm
Tools/asan/asan.xcconfig

index b4bc9ec..e2837a6 100644 (file)
@@ -37,11 +37,7 @@ extern "C" void checkResult(NSString *description, bool passed);
 + (void) roundTripThroughObjCDateTest;
 @end
 
-#if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 70000) || (TARGET_OS_MAC && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
 static unsigned unitFlags = NSCalendarUnitSecond | NSCalendarUnitMinute | NSCalendarUnitHour | NSCalendarUnitDay | NSCalendarUnitMonth | NSCalendarUnitYear;
-#else
-static unsigned unitFlags = NSSecondCalendarUnit | NSMinuteCalendarUnit | NSHourCalendarUnit | NSDayCalendarUnit | NSMonthCalendarUnit | NSYearCalendarUnit;
-#endif
 
 @implementation DateTests
 + (void) NSDateToJSDateTest
index 192a97b..dd6d20a 100644 (file)
@@ -1,3 +1,17 @@
+2015-01-31  Sam Weinig  <sam@webkit.org>
+
+        Remove even more Mountain Lion support
+        https://bugs.webkit.org/show_bug.cgi?id=141124
+
+        Reviewed by Alexey Proskuryakov.
+
+        * API/tests/DateTests.mm:
+        * Configurations/Base.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+        * Configurations/FeatureDefines.xcconfig:
+        * Configurations/Version.xcconfig:
+        * jit/ExecutableAllocatorFixedVMPool.cpp:
+
 2015-01-31  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r179426.
index c75fbf2..cf254fb 100644 (file)
@@ -136,13 +136,6 @@ SDKROOT = macosx.internal;
 
 INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL);
 
-TOOLCHAINS[sdk=macosx*] = $(TOOLCHAINS_macosx);
-TOOLCHAINS_macosx = $(TOOLCHAINS_macosx_$(MAC_OS_X_VERSION_MAJOR));
-TOOLCHAINS_macosx_1080 = default;
-TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
-TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
-TOOLCHAINS_macosx_101100 = $(TOOLCHAINS_macosx_101000);
-
 OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
 OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
 OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
index aa82256..b720c2b 100644 (file)
@@ -28,7 +28,6 @@ ARCHS = $(ARCHS_STANDARD_32_64_BIT);
 ONLY_ACTIVE_ARCH = YES;
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_macosx_1080 = 10.8;
 MACOSX_DEPLOYMENT_TARGET_macosx_1090 = 10.9;
 MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
 MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
index ad14aef..a0ae489 100644 (file)
@@ -1,4 +1,4 @@
-// Copyright (C) 2009, 2010, 2014 Apple Inc. All rights reserved.
+// Copyright (C) 2009, 2010, 2014, 2015 Apple Inc. All rights reserved.
 // Copyright (C) 2009 Google Inc. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -36,7 +36,6 @@ ENABLE_ACCELERATED_2D_CANVAS = ;
 ENABLE_ACCELERATED_OVERFLOW_SCROLLING[sdk=iphone*] = ENABLE_ACCELERATED_OVERFLOW_SCROLLING;
 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_1080 = ;
 ENABLE_AVF_CAPTIONS_macosx_1090 = ;
 ENABLE_AVF_CAPTIONS_macosx_101000 = ENABLE_AVF_CAPTIONS;
 ENABLE_AVF_CAPTIONS_macosx_101100 = ENABLE_AVF_CAPTIONS;
@@ -66,19 +65,10 @@ ENABLE_DATA_TRANSFER_ITEMS = ;
 ENABLE_DETAILS_ELEMENT = ENABLE_DETAILS_ELEMENT;
 ENABLE_DEVICE_ORIENTATION[sdk=iphone*] = ENABLE_DEVICE_ORIENTATION;
 ENABLE_DOM4_EVENTS_CONSTRUCTOR = ENABLE_DOM4_EVENTS_CONSTRUCTOR;
-ENABLE_ENCRYPTED_MEDIA[sdk=macosx*] = $(ENABLE_ENCRYPTED_MEDIA_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_ENCRYPTED_MEDIA_macosx_1080 = ;
-ENABLE_ENCRYPTED_MEDIA_macosx_1090 = ENABLE_ENCRYPTED_MEDIA;
-ENABLE_ENCRYPTED_MEDIA_macosx_101000 = ENABLE_ENCRYPTED_MEDIA;
-ENABLE_ENCRYPTED_MEDIA_macosx_101100 = ENABLE_ENCRYPTED_MEDIA;
-ENABLE_ENCRYPTED_MEDIA_V2[sdk=macosx*] = $(ENABLE_ENCRYPTED_MEDIA_V2_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_ENCRYPTED_MEDIA_V2_macosx_1080 = ;
-ENABLE_ENCRYPTED_MEDIA_V2_macosx_1090 = ENABLE_ENCRYPTED_MEDIA_V2;
-ENABLE_ENCRYPTED_MEDIA_V2_macosx_101000 = ENABLE_ENCRYPTED_MEDIA_V2;
-ENABLE_ENCRYPTED_MEDIA_V2_macosx_101100 = ENABLE_ENCRYPTED_MEDIA_V2;
+ENABLE_ENCRYPTED_MEDIA[sdk=macosx*] = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA_V2[sdk=macosx*] = ENABLE_ENCRYPTED_MEDIA_V2;
 ENABLE_FILTERS_LEVEL_2[sdk=iphone*] = ENABLE_FILTERS_LEVEL_2;
 ENABLE_FILTERS_LEVEL_2[sdk=macosx*] = $(ENABLE_FILTERS_LEVEL_2_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_FILTERS_LEVEL_2_macosx_1080 = ;
 ENABLE_FILTERS_LEVEL_2_macosx_1090 = ;
 ENABLE_FILTERS_LEVEL_2_macosx_101000 = ENABLE_FILTERS_LEVEL_2;
 ENABLE_FILTERS_LEVEL_2_macosx_101100 = ENABLE_FILTERS_LEVEL_2;
@@ -90,7 +80,6 @@ ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
 ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING[sdk=macosx*] = ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING;
 ENABLE_ICONDATABASE[sdk=macosx*] = ENABLE_ICONDATABASE;
 ENABLE_SERVICE_CONTROLS[sdk=macosx*] = $(ENABLE_SERVICE_CONTROLS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_SERVICE_CONTROLS_macosx_1080 = ;
 ENABLE_SERVICE_CONTROLS_macosx_1090 = ;
 ENABLE_SERVICE_CONTROLS_macosx_101000 = ENABLE_SERVICE_CONTROLS;
 ENABLE_SERVICE_CONTROLS_macosx_101100 = ENABLE_SERVICE_CONTROLS;
@@ -108,7 +97,6 @@ ENABLE_INPUT_TYPE_WEEK[sdk=iphone*] = ENABLE_INPUT_TYPE_WEEK;
 
 ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS[sdk=iphone*] = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
 ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS[sdk=macosx*] = $(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR))
-ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_1080 = ;
 ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_1090 = ;
 ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_101000 = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
 ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_101100 = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
@@ -133,7 +121,6 @@ ENABLE_MATHML = ENABLE_MATHML;
 ENABLE_MEDIA_CONTROLS_SCRIPT = ENABLE_MEDIA_CONTROLS_SCRIPT;
 
 ENABLE_MEDIA_SOURCE[sdk=macosx*] = $(ENABLE_MEDIA_SOURCE_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_MEDIA_SOURCE_macosx_1080 = ;
 ENABLE_MEDIA_SOURCE_macosx_1090 = ;
 ENABLE_MEDIA_SOURCE_macosx_101000 = ENABLE_MEDIA_SOURCE;
 ENABLE_MEDIA_SOURCE_macosx_101100 = ENABLE_MEDIA_SOURCE;
@@ -157,7 +144,6 @@ ENABLE_REQUEST_ANIMATION_FRAME = ENABLE_REQUEST_ANIMATION_FRAME;
 ENABLE_REQUEST_AUTOCOMPLETE = ;
 ENABLE_REMOTE_INSPECTOR[sdk=iphone*] = ENABLE_REMOTE_INSPECTOR;
 ENABLE_REMOTE_INSPECTOR[sdk=macosx*] = $(ENABLE_REMOTE_INSPECTOR_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_REMOTE_INSPECTOR_macosx_1080 = ;
 ENABLE_REMOTE_INSPECTOR_macosx_1090 = ;
 ENABLE_REMOTE_INSPECTOR_macosx_101000 = ENABLE_REMOTE_INSPECTOR;
 ENABLE_REMOTE_INSPECTOR_macosx_101100 = ENABLE_REMOTE_INSPECTOR;
@@ -165,19 +151,13 @@ ENABLE_RESOLUTION_MEDIA_QUERY = ;
 ENABLE_RUBBER_BANDING[sdk=macosx*] = ENABLE_RUBBER_BANDING;
 ENABLE_CSS_SCROLL_SNAP = ENABLE_CSS_SCROLL_SNAP;
 ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
-ENABLE_SUBTLE_CRYPTO[sdk=iphone*] = ENABLE_SUBTLE_CRYPTO;
-ENABLE_SUBTLE_CRYPTO[sdk=macosx*] = $(ENABLE_SUBTLE_CRYPTO_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_SUBTLE_CRYPTO_macosx_1080 = ;
-ENABLE_SUBTLE_CRYPTO_macosx_1090 = ENABLE_SUBTLE_CRYPTO;
-ENABLE_SUBTLE_CRYPTO_macosx_101000 = ENABLE_SUBTLE_CRYPTO;
-ENABLE_SUBTLE_CRYPTO_macosx_101100 = ENABLE_SUBTLE_CRYPTO;
+ENABLE_SUBTLE_CRYPTO = ENABLE_SUBTLE_CRYPTO;
 ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
 ENABLE_SVG_OTF_CONVERTER[sdk=iphone*] = ;
 ENABLE_SVG_OTF_CONVERTER[sdk=macosx*] = ENABLE_SVG_OTF_CONVERTER;
 
 ENABLE_TELEPHONE_NUMBER_DETECTION[sdk=iphone*] = ENABLE_TELEPHONE_NUMBER_DETECTION;
 ENABLE_TELEPHONE_NUMBER_DETECTION[sdk=macosx*] = $(ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_1080 = ;
 ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_1090 = ;
 ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_101000 = ENABLE_TELEPHONE_NUMBER_DETECTION;
 ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_101100 = ENABLE_TELEPHONE_NUMBER_DETECTION;
@@ -206,7 +186,6 @@ ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
 
 ENABLE_WEB_TIMING[sdk=iphone*] = ENABLE_WEB_TIMING;
 ENABLE_WEB_TIMING[sdk=macosx*] = $(ENABLE_WEB_TIMING_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_WEB_TIMING_macosx_1080 = ;
 ENABLE_WEB_TIMING_macosx_1090 = ;
 ENABLE_WEB_TIMING_macosx_101000 = ENABLE_WEB_TIMING;
 ENABLE_WEB_TIMING_macosx_101100 = ENABLE_WEB_TIMING;
index 9a5f8eb..75f13a5 100644 (file)
@@ -35,7 +35,6 @@ SHORT_VERSION_STRING = $(SHORT_VERSION_STRING_$(CONFIGURATION))
 // The system version prefix is based on the current system version.
 SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
 SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-SYSTEM_VERSION_PREFIX_macosx_1080 = 8;
 SYSTEM_VERSION_PREFIX_macosx_1090 = 9;
 SYSTEM_VERSION_PREFIX_macosx_101000 = 10;
 SYSTEM_VERSION_PREFIX_macosx_101100 = 11;
index 9afb055..dc635bf 100644 (file)
 #include <stdio.h>
 #endif
 
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 1090
-// MADV_FREE_REUSABLE does not work for JIT memory on older OSes so use MADV_FREE in that case.
-#define WTF_USE_MADV_FREE_FOR_JIT_MEMORY 1
-#endif
-
 using namespace WTF;
 
 namespace JSC {
index 285e3a6..ae84930 100644 (file)
@@ -1,3 +1,16 @@
+2015-01-31  Sam Weinig  <sam@webkit.org>
+
+        Remove even more Mountain Lion support
+        https://bugs.webkit.org/show_bug.cgi?id=141124
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+        * wtf/Assertions.cpp:
+        * wtf/FeatureDefines.h:
+        * wtf/Platform.h:
+
 2015-01-31  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r179426.
index f584862..e9adc5e 100644 (file)
@@ -114,13 +114,6 @@ INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL);
 
 SDKROOT = macosx.internal;
 
-TOOLCHAINS[sdk=macosx*] = $(TOOLCHAINS_macosx);
-TOOLCHAINS_macosx = $(TOOLCHAINS_macosx_$(MAC_OS_X_VERSION_MAJOR));
-TOOLCHAINS_macosx_1080 = default;
-TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
-TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
-TOOLCHAINS_macosx_101100 = $(TOOLCHAINS_macosx_101000);
-
 OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
 OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
 OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
index f529535..88fe5de 100644 (file)
@@ -27,7 +27,6 @@ ARCHS = $(ARCHS_STANDARD_32_64_BIT);
 ONLY_ACTIVE_ARCH = YES;
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_macosx_1080 = 10.8;
 MACOSX_DEPLOYMENT_TARGET_macosx_1090 = 10.9;
 MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
 MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
index 01e15ba..0dd1a2f 100644 (file)
@@ -49,7 +49,7 @@
 
 #if USE(CF)
 #include <CoreFoundation/CFString.h>
-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
+#if PLATFORM(COCOA)
 #define WTF_USE_APPLE_SYSTEM_LOG 1
 #include <asl.h>
 #endif
index 0b16630..fe5fe43 100644 (file)
@@ -183,14 +183,12 @@ the public iOS SDK. We will also need to update the FeatureDefines.xcconfig file
 #define ENABLE_DASHBOARD_SUPPORT 1
 #endif
 
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
 #if !defined(ENABLE_ENCRYPTED_MEDIA)
 #define ENABLE_ENCRYPTED_MEDIA 1
 #endif
 #if !defined(ENABLE_ENCRYPTED_MEDIA_V2)
 #define ENABLE_ENCRYPTED_MEDIA_V2 1
 #endif
-#endif
 
 #if !defined(ENABLE_FULLSCREEN_API)
 #define ENABLE_FULLSCREEN_API 1
index be85c9e..d56d1eb 100644 (file)
 #define WTF_USE_AVFOUNDATION 1
 #endif
 
-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 60000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080)
+#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 60000) || PLATFORM(MAC)
 #define WTF_USE_COREMEDIA 1
 #define HAVE_AVFOUNDATION_VIDEO_OUTPUT 1
 #endif
 #define HAVE_MEDIA_ACCESSIBILITY_FRAMEWORK 1
 #endif
 
-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 60000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
+#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 60000) || PLATFORM(MAC)
 #define HAVE_AVFOUNDATION_LOADER_DELEGATE 1
 #endif
 
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
+#if PLATFORM(MAC)
 #define WTF_USE_VIDEOTOOLBOX 1
 #endif
 
 #define _HAS_EXCEPTIONS 1
 #endif
 
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+#if PLATFORM(MAC)
 #define HAVE_NS_ACTIVITY 1
 #endif
 
 #define TARGET_OS_IPHONE 0
 #endif
 
-#if PLATFORM(IOS) || (PLATFORM(COCOA) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
+#if PLATFORM(COCOA)
 #define WTF_USE_MEDIATOOLBOX 1
 #endif
 
index b56678c..6456197 100644 (file)
@@ -1,3 +1,22 @@
+2015-01-31  Sam Weinig  <sam@webkit.org>
+
+        Remove even more Mountain Lion support
+        https://bugs.webkit.org/show_bug.cgi?id=141124
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+        * Configurations/FeatureDefines.xcconfig:
+        * Configurations/Version.xcconfig:
+        * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+        (-[WebAccessibilityObjectWrapper accessibilityActionNames]):
+        (-[WebAccessibilityObjectWrapper subrole]):
+        * platform/graphics/ca/mac/PlatformCALayerMac.mm:
+        (PlatformCALayer::drawLayerContents):
+        * platform/mac/ThemeMac.mm:
+        (-[WebCoreThemeView _focusRingVisibleRect]):
+
 2015-01-30  Sam Weinig  <sam@webkit.org>
 
         Merge SimpleFontDataIOS.mm and SimpleFontDataMac.mm into FontCocoa.mm
index 06bf86d..a622bab 100644 (file)
@@ -111,13 +111,6 @@ CLANG_DEBUG_INFORMATION_LEVEL[sdk=macosx10.9*] = line-tables-only;
 
 SDKROOT = macosx.internal;
 
-TOOLCHAINS[sdk=macosx*] = $(TOOLCHAINS_macosx);
-TOOLCHAINS_macosx = $(TOOLCHAINS_macosx_$(MAC_OS_X_VERSION_MAJOR));
-TOOLCHAINS_macosx_1080 = default;
-TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
-TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
-TOOLCHAINS_macosx_101100 = $(TOOLCHAINS_macosx_101000);
-
 OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
 OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
 OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
index 431ff38..6e620eb 100644 (file)
@@ -28,7 +28,6 @@ ARCHS = $(ARCHS_STANDARD_32_64_BIT);
 ONLY_ACTIVE_ARCH = YES;
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_macosx_1080 = 10.8;
 MACOSX_DEPLOYMENT_TARGET_macosx_1090 = 10.9;
 MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
 MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
index ad14aef..a0ae489 100644 (file)
@@ -1,4 +1,4 @@
-// Copyright (C) 2009, 2010, 2014 Apple Inc. All rights reserved.
+// Copyright (C) 2009, 2010, 2014, 2015 Apple Inc. All rights reserved.
 // Copyright (C) 2009 Google Inc. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -36,7 +36,6 @@ ENABLE_ACCELERATED_2D_CANVAS = ;
 ENABLE_ACCELERATED_OVERFLOW_SCROLLING[sdk=iphone*] = ENABLE_ACCELERATED_OVERFLOW_SCROLLING;
 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_1080 = ;
 ENABLE_AVF_CAPTIONS_macosx_1090 = ;
 ENABLE_AVF_CAPTIONS_macosx_101000 = ENABLE_AVF_CAPTIONS;
 ENABLE_AVF_CAPTIONS_macosx_101100 = ENABLE_AVF_CAPTIONS;
@@ -66,19 +65,10 @@ ENABLE_DATA_TRANSFER_ITEMS = ;
 ENABLE_DETAILS_ELEMENT = ENABLE_DETAILS_ELEMENT;
 ENABLE_DEVICE_ORIENTATION[sdk=iphone*] = ENABLE_DEVICE_ORIENTATION;
 ENABLE_DOM4_EVENTS_CONSTRUCTOR = ENABLE_DOM4_EVENTS_CONSTRUCTOR;
-ENABLE_ENCRYPTED_MEDIA[sdk=macosx*] = $(ENABLE_ENCRYPTED_MEDIA_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_ENCRYPTED_MEDIA_macosx_1080 = ;
-ENABLE_ENCRYPTED_MEDIA_macosx_1090 = ENABLE_ENCRYPTED_MEDIA;
-ENABLE_ENCRYPTED_MEDIA_macosx_101000 = ENABLE_ENCRYPTED_MEDIA;
-ENABLE_ENCRYPTED_MEDIA_macosx_101100 = ENABLE_ENCRYPTED_MEDIA;
-ENABLE_ENCRYPTED_MEDIA_V2[sdk=macosx*] = $(ENABLE_ENCRYPTED_MEDIA_V2_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_ENCRYPTED_MEDIA_V2_macosx_1080 = ;
-ENABLE_ENCRYPTED_MEDIA_V2_macosx_1090 = ENABLE_ENCRYPTED_MEDIA_V2;
-ENABLE_ENCRYPTED_MEDIA_V2_macosx_101000 = ENABLE_ENCRYPTED_MEDIA_V2;
-ENABLE_ENCRYPTED_MEDIA_V2_macosx_101100 = ENABLE_ENCRYPTED_MEDIA_V2;
+ENABLE_ENCRYPTED_MEDIA[sdk=macosx*] = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA_V2[sdk=macosx*] = ENABLE_ENCRYPTED_MEDIA_V2;
 ENABLE_FILTERS_LEVEL_2[sdk=iphone*] = ENABLE_FILTERS_LEVEL_2;
 ENABLE_FILTERS_LEVEL_2[sdk=macosx*] = $(ENABLE_FILTERS_LEVEL_2_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_FILTERS_LEVEL_2_macosx_1080 = ;
 ENABLE_FILTERS_LEVEL_2_macosx_1090 = ;
 ENABLE_FILTERS_LEVEL_2_macosx_101000 = ENABLE_FILTERS_LEVEL_2;
 ENABLE_FILTERS_LEVEL_2_macosx_101100 = ENABLE_FILTERS_LEVEL_2;
@@ -90,7 +80,6 @@ ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
 ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING[sdk=macosx*] = ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING;
 ENABLE_ICONDATABASE[sdk=macosx*] = ENABLE_ICONDATABASE;
 ENABLE_SERVICE_CONTROLS[sdk=macosx*] = $(ENABLE_SERVICE_CONTROLS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_SERVICE_CONTROLS_macosx_1080 = ;
 ENABLE_SERVICE_CONTROLS_macosx_1090 = ;
 ENABLE_SERVICE_CONTROLS_macosx_101000 = ENABLE_SERVICE_CONTROLS;
 ENABLE_SERVICE_CONTROLS_macosx_101100 = ENABLE_SERVICE_CONTROLS;
@@ -108,7 +97,6 @@ ENABLE_INPUT_TYPE_WEEK[sdk=iphone*] = ENABLE_INPUT_TYPE_WEEK;
 
 ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS[sdk=iphone*] = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
 ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS[sdk=macosx*] = $(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR))
-ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_1080 = ;
 ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_1090 = ;
 ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_101000 = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
 ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_101100 = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
@@ -133,7 +121,6 @@ ENABLE_MATHML = ENABLE_MATHML;
 ENABLE_MEDIA_CONTROLS_SCRIPT = ENABLE_MEDIA_CONTROLS_SCRIPT;
 
 ENABLE_MEDIA_SOURCE[sdk=macosx*] = $(ENABLE_MEDIA_SOURCE_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_MEDIA_SOURCE_macosx_1080 = ;
 ENABLE_MEDIA_SOURCE_macosx_1090 = ;
 ENABLE_MEDIA_SOURCE_macosx_101000 = ENABLE_MEDIA_SOURCE;
 ENABLE_MEDIA_SOURCE_macosx_101100 = ENABLE_MEDIA_SOURCE;
@@ -157,7 +144,6 @@ ENABLE_REQUEST_ANIMATION_FRAME = ENABLE_REQUEST_ANIMATION_FRAME;
 ENABLE_REQUEST_AUTOCOMPLETE = ;
 ENABLE_REMOTE_INSPECTOR[sdk=iphone*] = ENABLE_REMOTE_INSPECTOR;
 ENABLE_REMOTE_INSPECTOR[sdk=macosx*] = $(ENABLE_REMOTE_INSPECTOR_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_REMOTE_INSPECTOR_macosx_1080 = ;
 ENABLE_REMOTE_INSPECTOR_macosx_1090 = ;
 ENABLE_REMOTE_INSPECTOR_macosx_101000 = ENABLE_REMOTE_INSPECTOR;
 ENABLE_REMOTE_INSPECTOR_macosx_101100 = ENABLE_REMOTE_INSPECTOR;
@@ -165,19 +151,13 @@ ENABLE_RESOLUTION_MEDIA_QUERY = ;
 ENABLE_RUBBER_BANDING[sdk=macosx*] = ENABLE_RUBBER_BANDING;
 ENABLE_CSS_SCROLL_SNAP = ENABLE_CSS_SCROLL_SNAP;
 ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
-ENABLE_SUBTLE_CRYPTO[sdk=iphone*] = ENABLE_SUBTLE_CRYPTO;
-ENABLE_SUBTLE_CRYPTO[sdk=macosx*] = $(ENABLE_SUBTLE_CRYPTO_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_SUBTLE_CRYPTO_macosx_1080 = ;
-ENABLE_SUBTLE_CRYPTO_macosx_1090 = ENABLE_SUBTLE_CRYPTO;
-ENABLE_SUBTLE_CRYPTO_macosx_101000 = ENABLE_SUBTLE_CRYPTO;
-ENABLE_SUBTLE_CRYPTO_macosx_101100 = ENABLE_SUBTLE_CRYPTO;
+ENABLE_SUBTLE_CRYPTO = ENABLE_SUBTLE_CRYPTO;
 ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
 ENABLE_SVG_OTF_CONVERTER[sdk=iphone*] = ;
 ENABLE_SVG_OTF_CONVERTER[sdk=macosx*] = ENABLE_SVG_OTF_CONVERTER;
 
 ENABLE_TELEPHONE_NUMBER_DETECTION[sdk=iphone*] = ENABLE_TELEPHONE_NUMBER_DETECTION;
 ENABLE_TELEPHONE_NUMBER_DETECTION[sdk=macosx*] = $(ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_1080 = ;
 ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_1090 = ;
 ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_101000 = ENABLE_TELEPHONE_NUMBER_DETECTION;
 ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_101100 = ENABLE_TELEPHONE_NUMBER_DETECTION;
@@ -206,7 +186,6 @@ ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
 
 ENABLE_WEB_TIMING[sdk=iphone*] = ENABLE_WEB_TIMING;
 ENABLE_WEB_TIMING[sdk=macosx*] = $(ENABLE_WEB_TIMING_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_WEB_TIMING_macosx_1080 = ;
 ENABLE_WEB_TIMING_macosx_1090 = ;
 ENABLE_WEB_TIMING_macosx_101000 = ENABLE_WEB_TIMING;
 ENABLE_WEB_TIMING_macosx_101100 = ENABLE_WEB_TIMING;
index 2d28a9a..b867e9d 100644 (file)
@@ -35,7 +35,6 @@ SHORT_VERSION_STRING = $(SHORT_VERSION_STRING_$(CONFIGURATION))
 // The system version prefix is based on the current system version.
 SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
 SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-SYSTEM_VERSION_PREFIX_macosx_1080 = 8;
 SYSTEM_VERSION_PREFIX_macosx_1090 = 9;
 SYSTEM_VERSION_PREFIX_macosx_101000 = 10;
 SYSTEM_VERSION_PREFIX_macosx_101100 = 11;
index bccfcb1..84bdc2f 100644 (file)
@@ -1147,19 +1147,11 @@ static id textMarkerRangeFromVisiblePositions(AXObjectCache *cache, VisiblePosit
     
     // All elements should get ShowMenu and ScrollToVisible.
     // But certain earlier VoiceOver versions do not support scroll to visible, and it confuses them to see it in the list.
-#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1090
-    static NSArray *defaultElementActions = [[NSArray alloc] initWithObjects:NSAccessibilityShowMenuAction, nil];
-#else
     static NSArray *defaultElementActions = [[NSArray alloc] initWithObjects:NSAccessibilityShowMenuAction, NSAccessibilityScrollToVisibleAction, nil];
-#endif
 
     // Action elements allow Press.
     // The order is important to VoiceOver, which expects the 'default' action to be the first action. In this case the default action should be press.
-#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1090
-    static NSArray *actionElementActions = [[NSArray alloc] initWithObjects:NSAccessibilityPressAction, NSAccessibilityShowMenuAction, nil];
-#else
     static NSArray *actionElementActions = [[NSArray alloc] initWithObjects:NSAccessibilityPressAction, NSAccessibilityShowMenuAction, NSAccessibilityScrollToVisibleAction, nil];
-#endif
 
     // Menu elements allow Press and Cancel.
     static NSArray *menuElementActions = [[actionElementActions arrayByAddingObject:NSAccessibilityCancelAction] retain];
@@ -2020,11 +2012,7 @@ static NSString* roleValueToNSString(AccessibilityRole value)
         if (listObject.isUnorderedList() || listObject.isOrderedList())
             return NSAccessibilityContentListSubrole;
         if (listObject.isDescriptionList()) {
-#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1090
-            return NSAccessibilityDefinitionListSubrole;
-#else
             return NSAccessibilityDescriptionListSubrole;
-#endif
         }
     }
     
index 03e8cad..b515c05 100644 (file)
@@ -1012,19 +1012,11 @@ void PlatformCALayer::drawLayerContents(CGContextRef context, WebCore::PlatformC
         graphicsContext.setShouldSmoothFonts(false);
     }
     
-#if !PLATFORM(IOS)
+#if PLATFORM(MAC)
     // It's important to get the clip from the context, because it may be significantly
     // smaller than the layer bounds (e.g. tiled layers)
-    FloatRect clipBounds = CGContextGetClipBoundingBox(context);
-    
-    FloatRect focusRingClipRect = clipBounds;
-#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1090
-    // Set the focus ring clip rect which needs to be in base coordinates.
-    AffineTransform transform = CGContextGetCTM(context);
-    focusRingClipRect = transform.mapRect(clipBounds);
+    ThemeMac::setFocusRingClipRect(CGContextGetClipBoundingBox(context));
 #endif
-    ThemeMac::setFocusRingClipRect(focusRingClipRect);
-#endif // !PLATFORM(IOS)
     
     for (const auto& rect : dirtyRects) {
         GraphicsContextStateSaver stateSaver(graphicsContext);
index 67899f0..255d370 100644 (file)
@@ -96,13 +96,7 @@ static BOOL themeWindowHasKeyAppearance;
 {
     if (NSIsEmptyRect(focusRingClipRect))
         return [self visibleRect];
-
-    NSRect rect = focusRingClipRect;
-#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1090
-    rect.origin.y = [self bounds].size.height - NSMaxY(rect);
-#endif
-
-    return rect;
+    return focusRingClipRect;
 }
 
 - (NSView *)_focusRingClipAncestor
index e2b771a..c2b683c 100644 (file)
@@ -1,3 +1,16 @@
+2015-01-31  Sam Weinig  <sam@webkit.org>
+
+        Remove even more Mountain Lion support
+        https://bugs.webkit.org/show_bug.cgi?id=141124
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+        * Configurations/FeatureDefines.xcconfig:
+        * Configurations/Version.xcconfig:
+        * Configurations/WebKitLegacy.xcconfig:
+
 2015-01-30  Eric Carlson  <eric.carlson@apple.com>
 
         Remove MediaPlayerProxy.h
index 4e430bf..9c6f87c 100644 (file)
@@ -102,13 +102,6 @@ SDKROOT = macosx.internal;
 
 SUPPORTED_PLATFORMS = iphonesimulator iphoneos macosx;
 
-TOOLCHAINS[sdk=macosx*] = $(TOOLCHAINS_macosx);
-TOOLCHAINS_macosx = $(TOOLCHAINS_macosx_$(MAC_OS_X_VERSION_MAJOR));
-TOOLCHAINS_macosx_1080 = default;
-TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
-TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
-TOOLCHAINS_macosx_101100 = $(TOOLCHAINS_macosx_101000);
-
 OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
 OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
 OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
index e1f06a9..205ce0c 100644 (file)
@@ -28,7 +28,6 @@ ARCHS = $(ARCHS_STANDARD_32_64_BIT);
 ONLY_ACTIVE_ARCH = YES;
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_macosx_1080 = 10.8;
 MACOSX_DEPLOYMENT_TARGET_macosx_1090 = 10.9;
 MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
 MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
@@ -39,7 +38,6 @@ DEBUG_INFORMATION_FORMAT = dwarf;
 WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphoneos*] = WebKitSystemInterfaceIOSDevice$(IPHONEOS_DEPLOYMENT_TARGET);
 WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphonesimulator*] = WebKitSystemInterfaceIOSSimulator$(IPHONEOS_DEPLOYMENT_TARGET);
 WEBKIT_SYSTEM_INTERFACE_LIBRARY = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1080 = WebKitSystemInterfaceMountainLion;
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1090 = WebKitSystemInterfaceMavericks;
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000 = WebKitSystemInterfaceYosemite;
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101100 = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000);
index ad14aef..a0ae489 100644 (file)
@@ -1,4 +1,4 @@
-// Copyright (C) 2009, 2010, 2014 Apple Inc. All rights reserved.
+// Copyright (C) 2009, 2010, 2014, 2015 Apple Inc. All rights reserved.
 // Copyright (C) 2009 Google Inc. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -36,7 +36,6 @@ ENABLE_ACCELERATED_2D_CANVAS = ;
 ENABLE_ACCELERATED_OVERFLOW_SCROLLING[sdk=iphone*] = ENABLE_ACCELERATED_OVERFLOW_SCROLLING;
 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_1080 = ;
 ENABLE_AVF_CAPTIONS_macosx_1090 = ;
 ENABLE_AVF_CAPTIONS_macosx_101000 = ENABLE_AVF_CAPTIONS;
 ENABLE_AVF_CAPTIONS_macosx_101100 = ENABLE_AVF_CAPTIONS;
@@ -66,19 +65,10 @@ ENABLE_DATA_TRANSFER_ITEMS = ;
 ENABLE_DETAILS_ELEMENT = ENABLE_DETAILS_ELEMENT;
 ENABLE_DEVICE_ORIENTATION[sdk=iphone*] = ENABLE_DEVICE_ORIENTATION;
 ENABLE_DOM4_EVENTS_CONSTRUCTOR = ENABLE_DOM4_EVENTS_CONSTRUCTOR;
-ENABLE_ENCRYPTED_MEDIA[sdk=macosx*] = $(ENABLE_ENCRYPTED_MEDIA_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_ENCRYPTED_MEDIA_macosx_1080 = ;
-ENABLE_ENCRYPTED_MEDIA_macosx_1090 = ENABLE_ENCRYPTED_MEDIA;
-ENABLE_ENCRYPTED_MEDIA_macosx_101000 = ENABLE_ENCRYPTED_MEDIA;
-ENABLE_ENCRYPTED_MEDIA_macosx_101100 = ENABLE_ENCRYPTED_MEDIA;
-ENABLE_ENCRYPTED_MEDIA_V2[sdk=macosx*] = $(ENABLE_ENCRYPTED_MEDIA_V2_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_ENCRYPTED_MEDIA_V2_macosx_1080 = ;
-ENABLE_ENCRYPTED_MEDIA_V2_macosx_1090 = ENABLE_ENCRYPTED_MEDIA_V2;
-ENABLE_ENCRYPTED_MEDIA_V2_macosx_101000 = ENABLE_ENCRYPTED_MEDIA_V2;
-ENABLE_ENCRYPTED_MEDIA_V2_macosx_101100 = ENABLE_ENCRYPTED_MEDIA_V2;
+ENABLE_ENCRYPTED_MEDIA[sdk=macosx*] = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA_V2[sdk=macosx*] = ENABLE_ENCRYPTED_MEDIA_V2;
 ENABLE_FILTERS_LEVEL_2[sdk=iphone*] = ENABLE_FILTERS_LEVEL_2;
 ENABLE_FILTERS_LEVEL_2[sdk=macosx*] = $(ENABLE_FILTERS_LEVEL_2_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_FILTERS_LEVEL_2_macosx_1080 = ;
 ENABLE_FILTERS_LEVEL_2_macosx_1090 = ;
 ENABLE_FILTERS_LEVEL_2_macosx_101000 = ENABLE_FILTERS_LEVEL_2;
 ENABLE_FILTERS_LEVEL_2_macosx_101100 = ENABLE_FILTERS_LEVEL_2;
@@ -90,7 +80,6 @@ ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
 ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING[sdk=macosx*] = ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING;
 ENABLE_ICONDATABASE[sdk=macosx*] = ENABLE_ICONDATABASE;
 ENABLE_SERVICE_CONTROLS[sdk=macosx*] = $(ENABLE_SERVICE_CONTROLS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_SERVICE_CONTROLS_macosx_1080 = ;
 ENABLE_SERVICE_CONTROLS_macosx_1090 = ;
 ENABLE_SERVICE_CONTROLS_macosx_101000 = ENABLE_SERVICE_CONTROLS;
 ENABLE_SERVICE_CONTROLS_macosx_101100 = ENABLE_SERVICE_CONTROLS;
@@ -108,7 +97,6 @@ ENABLE_INPUT_TYPE_WEEK[sdk=iphone*] = ENABLE_INPUT_TYPE_WEEK;
 
 ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS[sdk=iphone*] = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
 ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS[sdk=macosx*] = $(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR))
-ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_1080 = ;
 ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_1090 = ;
 ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_101000 = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
 ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_101100 = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
@@ -133,7 +121,6 @@ ENABLE_MATHML = ENABLE_MATHML;
 ENABLE_MEDIA_CONTROLS_SCRIPT = ENABLE_MEDIA_CONTROLS_SCRIPT;
 
 ENABLE_MEDIA_SOURCE[sdk=macosx*] = $(ENABLE_MEDIA_SOURCE_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_MEDIA_SOURCE_macosx_1080 = ;
 ENABLE_MEDIA_SOURCE_macosx_1090 = ;
 ENABLE_MEDIA_SOURCE_macosx_101000 = ENABLE_MEDIA_SOURCE;
 ENABLE_MEDIA_SOURCE_macosx_101100 = ENABLE_MEDIA_SOURCE;
@@ -157,7 +144,6 @@ ENABLE_REQUEST_ANIMATION_FRAME = ENABLE_REQUEST_ANIMATION_FRAME;
 ENABLE_REQUEST_AUTOCOMPLETE = ;
 ENABLE_REMOTE_INSPECTOR[sdk=iphone*] = ENABLE_REMOTE_INSPECTOR;
 ENABLE_REMOTE_INSPECTOR[sdk=macosx*] = $(ENABLE_REMOTE_INSPECTOR_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_REMOTE_INSPECTOR_macosx_1080 = ;
 ENABLE_REMOTE_INSPECTOR_macosx_1090 = ;
 ENABLE_REMOTE_INSPECTOR_macosx_101000 = ENABLE_REMOTE_INSPECTOR;
 ENABLE_REMOTE_INSPECTOR_macosx_101100 = ENABLE_REMOTE_INSPECTOR;
@@ -165,19 +151,13 @@ ENABLE_RESOLUTION_MEDIA_QUERY = ;
 ENABLE_RUBBER_BANDING[sdk=macosx*] = ENABLE_RUBBER_BANDING;
 ENABLE_CSS_SCROLL_SNAP = ENABLE_CSS_SCROLL_SNAP;
 ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
-ENABLE_SUBTLE_CRYPTO[sdk=iphone*] = ENABLE_SUBTLE_CRYPTO;
-ENABLE_SUBTLE_CRYPTO[sdk=macosx*] = $(ENABLE_SUBTLE_CRYPTO_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_SUBTLE_CRYPTO_macosx_1080 = ;
-ENABLE_SUBTLE_CRYPTO_macosx_1090 = ENABLE_SUBTLE_CRYPTO;
-ENABLE_SUBTLE_CRYPTO_macosx_101000 = ENABLE_SUBTLE_CRYPTO;
-ENABLE_SUBTLE_CRYPTO_macosx_101100 = ENABLE_SUBTLE_CRYPTO;
+ENABLE_SUBTLE_CRYPTO = ENABLE_SUBTLE_CRYPTO;
 ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
 ENABLE_SVG_OTF_CONVERTER[sdk=iphone*] = ;
 ENABLE_SVG_OTF_CONVERTER[sdk=macosx*] = ENABLE_SVG_OTF_CONVERTER;
 
 ENABLE_TELEPHONE_NUMBER_DETECTION[sdk=iphone*] = ENABLE_TELEPHONE_NUMBER_DETECTION;
 ENABLE_TELEPHONE_NUMBER_DETECTION[sdk=macosx*] = $(ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_1080 = ;
 ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_1090 = ;
 ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_101000 = ENABLE_TELEPHONE_NUMBER_DETECTION;
 ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_101100 = ENABLE_TELEPHONE_NUMBER_DETECTION;
@@ -206,7 +186,6 @@ ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
 
 ENABLE_WEB_TIMING[sdk=iphone*] = ENABLE_WEB_TIMING;
 ENABLE_WEB_TIMING[sdk=macosx*] = $(ENABLE_WEB_TIMING_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_WEB_TIMING_macosx_1080 = ;
 ENABLE_WEB_TIMING_macosx_1090 = ;
 ENABLE_WEB_TIMING_macosx_101000 = ENABLE_WEB_TIMING;
 ENABLE_WEB_TIMING_macosx_101100 = ENABLE_WEB_TIMING;
index 2d28a9a..b867e9d 100644 (file)
@@ -35,7 +35,6 @@ SHORT_VERSION_STRING = $(SHORT_VERSION_STRING_$(CONFIGURATION))
 // The system version prefix is based on the current system version.
 SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
 SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-SYSTEM_VERSION_PREFIX_macosx_1080 = 8;
 SYSTEM_VERSION_PREFIX_macosx_1090 = 9;
 SYSTEM_VERSION_PREFIX_macosx_101000 = 10;
 SYSTEM_VERSION_PREFIX_macosx_101100 = 11;
index 6d2dbfa..887b38b 100644 (file)
@@ -50,7 +50,6 @@ OTHER_CFLAGS[sdk=macosx*] = $(OTHER_CFLAGS) -iframework $(SDKROOT)$(SYSTEM_LIBRA
 OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
 
 WEBKIT_LEGACY_SYSTEM_FRAMEWORK_MISSING = $(WEBKIT_LEGACY_SYSTEM_FRAMEWORK_MISSING_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WEBKIT_LEGACY_SYSTEM_FRAMEWORK_MISSING_1080 = YES;
 WEBKIT_LEGACY_SYSTEM_FRAMEWORK_MISSING_1090 = YES;
 
 GCC_PREFIX_HEADER = mac/WebKitPrefix.h;
index 5506312..33dc84d 100644 (file)
@@ -1,3 +1,19 @@
+2015-01-31  Sam Weinig  <sam@webkit.org>
+
+        Remove even more Mountain Lion support
+        https://bugs.webkit.org/show_bug.cgi?id=141124
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+        * Configurations/FeatureDefines.xcconfig:
+        * Configurations/Version.xcconfig:
+        * Configurations/WebContentService.Development.xcconfig:
+        * Configurations/WebContentService.xcconfig:
+        * Configurations/WebKit.xcconfig:
+        * NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in:
+
 2015-01-31  Antti Koivisto  <antti@apple.com>
 
         Enable WebKit disk cache on OS X
index e426912..fc6938f 100644 (file)
@@ -104,13 +104,6 @@ SDKROOT = macosx.internal;
 
 CODE_SIGN_IDENTITY = -;
 
-TOOLCHAINS[sdk=macosx*] = $(TOOLCHAINS_macosx);
-TOOLCHAINS_macosx = $(TOOLCHAINS_macosx_$(MAC_OS_X_VERSION_MAJOR));
-TOOLCHAINS_macosx_1080 = default;
-TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
-TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
-TOOLCHAINS_macosx_101100 = $(TOOLCHAINS_macosx_101000);
-
 SUPPORTED_PLATFORMS = macosx iphoneos iphonesimulator;
 
 FRAMEWORK_CONTENT_DIRECTORY[sdk=macosx*] = Versions/A;
index fd8611f..d995c91 100644 (file)
@@ -28,7 +28,6 @@ ARCHS = $(ARCHS_STANDARD_32_64_BIT);
 ONLY_ACTIVE_ARCH = YES;
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_macosx_1080 = 10.8;
 MACOSX_DEPLOYMENT_TARGET_macosx_1090 = 10.9;
 MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
 MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
@@ -39,7 +38,6 @@ DEBUG_INFORMATION_FORMAT = dwarf;
 WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphoneos*] = WebKitSystemInterfaceIOSDevice$(IPHONEOS_DEPLOYMENT_TARGET);
 WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphonesimulator*] = WebKitSystemInterfaceIOSSimulator$(IPHONEOS_DEPLOYMENT_TARGET);
 WEBKIT_SYSTEM_INTERFACE_LIBRARY = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1080 = WebKitSystemInterfaceMountainLion;
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1090 = WebKitSystemInterfaceMavericks;
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000 = WebKitSystemInterfaceYosemite;
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101100 = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000);
index ad14aef..a0ae489 100644 (file)
@@ -1,4 +1,4 @@
-// Copyright (C) 2009, 2010, 2014 Apple Inc. All rights reserved.
+// Copyright (C) 2009, 2010, 2014, 2015 Apple Inc. All rights reserved.
 // Copyright (C) 2009 Google Inc. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -36,7 +36,6 @@ ENABLE_ACCELERATED_2D_CANVAS = ;
 ENABLE_ACCELERATED_OVERFLOW_SCROLLING[sdk=iphone*] = ENABLE_ACCELERATED_OVERFLOW_SCROLLING;
 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_1080 = ;
 ENABLE_AVF_CAPTIONS_macosx_1090 = ;
 ENABLE_AVF_CAPTIONS_macosx_101000 = ENABLE_AVF_CAPTIONS;
 ENABLE_AVF_CAPTIONS_macosx_101100 = ENABLE_AVF_CAPTIONS;
@@ -66,19 +65,10 @@ ENABLE_DATA_TRANSFER_ITEMS = ;
 ENABLE_DETAILS_ELEMENT = ENABLE_DETAILS_ELEMENT;
 ENABLE_DEVICE_ORIENTATION[sdk=iphone*] = ENABLE_DEVICE_ORIENTATION;
 ENABLE_DOM4_EVENTS_CONSTRUCTOR = ENABLE_DOM4_EVENTS_CONSTRUCTOR;
-ENABLE_ENCRYPTED_MEDIA[sdk=macosx*] = $(ENABLE_ENCRYPTED_MEDIA_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_ENCRYPTED_MEDIA_macosx_1080 = ;
-ENABLE_ENCRYPTED_MEDIA_macosx_1090 = ENABLE_ENCRYPTED_MEDIA;
-ENABLE_ENCRYPTED_MEDIA_macosx_101000 = ENABLE_ENCRYPTED_MEDIA;
-ENABLE_ENCRYPTED_MEDIA_macosx_101100 = ENABLE_ENCRYPTED_MEDIA;
-ENABLE_ENCRYPTED_MEDIA_V2[sdk=macosx*] = $(ENABLE_ENCRYPTED_MEDIA_V2_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_ENCRYPTED_MEDIA_V2_macosx_1080 = ;
-ENABLE_ENCRYPTED_MEDIA_V2_macosx_1090 = ENABLE_ENCRYPTED_MEDIA_V2;
-ENABLE_ENCRYPTED_MEDIA_V2_macosx_101000 = ENABLE_ENCRYPTED_MEDIA_V2;
-ENABLE_ENCRYPTED_MEDIA_V2_macosx_101100 = ENABLE_ENCRYPTED_MEDIA_V2;
+ENABLE_ENCRYPTED_MEDIA[sdk=macosx*] = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA_V2[sdk=macosx*] = ENABLE_ENCRYPTED_MEDIA_V2;
 ENABLE_FILTERS_LEVEL_2[sdk=iphone*] = ENABLE_FILTERS_LEVEL_2;
 ENABLE_FILTERS_LEVEL_2[sdk=macosx*] = $(ENABLE_FILTERS_LEVEL_2_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_FILTERS_LEVEL_2_macosx_1080 = ;
 ENABLE_FILTERS_LEVEL_2_macosx_1090 = ;
 ENABLE_FILTERS_LEVEL_2_macosx_101000 = ENABLE_FILTERS_LEVEL_2;
 ENABLE_FILTERS_LEVEL_2_macosx_101100 = ENABLE_FILTERS_LEVEL_2;
@@ -90,7 +80,6 @@ ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
 ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING[sdk=macosx*] = ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING;
 ENABLE_ICONDATABASE[sdk=macosx*] = ENABLE_ICONDATABASE;
 ENABLE_SERVICE_CONTROLS[sdk=macosx*] = $(ENABLE_SERVICE_CONTROLS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_SERVICE_CONTROLS_macosx_1080 = ;
 ENABLE_SERVICE_CONTROLS_macosx_1090 = ;
 ENABLE_SERVICE_CONTROLS_macosx_101000 = ENABLE_SERVICE_CONTROLS;
 ENABLE_SERVICE_CONTROLS_macosx_101100 = ENABLE_SERVICE_CONTROLS;
@@ -108,7 +97,6 @@ ENABLE_INPUT_TYPE_WEEK[sdk=iphone*] = ENABLE_INPUT_TYPE_WEEK;
 
 ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS[sdk=iphone*] = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
 ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS[sdk=macosx*] = $(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR))
-ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_1080 = ;
 ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_1090 = ;
 ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_101000 = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
 ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_101100 = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
@@ -133,7 +121,6 @@ ENABLE_MATHML = ENABLE_MATHML;
 ENABLE_MEDIA_CONTROLS_SCRIPT = ENABLE_MEDIA_CONTROLS_SCRIPT;
 
 ENABLE_MEDIA_SOURCE[sdk=macosx*] = $(ENABLE_MEDIA_SOURCE_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_MEDIA_SOURCE_macosx_1080 = ;
 ENABLE_MEDIA_SOURCE_macosx_1090 = ;
 ENABLE_MEDIA_SOURCE_macosx_101000 = ENABLE_MEDIA_SOURCE;
 ENABLE_MEDIA_SOURCE_macosx_101100 = ENABLE_MEDIA_SOURCE;
@@ -157,7 +144,6 @@ ENABLE_REQUEST_ANIMATION_FRAME = ENABLE_REQUEST_ANIMATION_FRAME;
 ENABLE_REQUEST_AUTOCOMPLETE = ;
 ENABLE_REMOTE_INSPECTOR[sdk=iphone*] = ENABLE_REMOTE_INSPECTOR;
 ENABLE_REMOTE_INSPECTOR[sdk=macosx*] = $(ENABLE_REMOTE_INSPECTOR_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_REMOTE_INSPECTOR_macosx_1080 = ;
 ENABLE_REMOTE_INSPECTOR_macosx_1090 = ;
 ENABLE_REMOTE_INSPECTOR_macosx_101000 = ENABLE_REMOTE_INSPECTOR;
 ENABLE_REMOTE_INSPECTOR_macosx_101100 = ENABLE_REMOTE_INSPECTOR;
@@ -165,19 +151,13 @@ ENABLE_RESOLUTION_MEDIA_QUERY = ;
 ENABLE_RUBBER_BANDING[sdk=macosx*] = ENABLE_RUBBER_BANDING;
 ENABLE_CSS_SCROLL_SNAP = ENABLE_CSS_SCROLL_SNAP;
 ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
-ENABLE_SUBTLE_CRYPTO[sdk=iphone*] = ENABLE_SUBTLE_CRYPTO;
-ENABLE_SUBTLE_CRYPTO[sdk=macosx*] = $(ENABLE_SUBTLE_CRYPTO_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_SUBTLE_CRYPTO_macosx_1080 = ;
-ENABLE_SUBTLE_CRYPTO_macosx_1090 = ENABLE_SUBTLE_CRYPTO;
-ENABLE_SUBTLE_CRYPTO_macosx_101000 = ENABLE_SUBTLE_CRYPTO;
-ENABLE_SUBTLE_CRYPTO_macosx_101100 = ENABLE_SUBTLE_CRYPTO;
+ENABLE_SUBTLE_CRYPTO = ENABLE_SUBTLE_CRYPTO;
 ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
 ENABLE_SVG_OTF_CONVERTER[sdk=iphone*] = ;
 ENABLE_SVG_OTF_CONVERTER[sdk=macosx*] = ENABLE_SVG_OTF_CONVERTER;
 
 ENABLE_TELEPHONE_NUMBER_DETECTION[sdk=iphone*] = ENABLE_TELEPHONE_NUMBER_DETECTION;
 ENABLE_TELEPHONE_NUMBER_DETECTION[sdk=macosx*] = $(ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_1080 = ;
 ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_1090 = ;
 ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_101000 = ENABLE_TELEPHONE_NUMBER_DETECTION;
 ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_101100 = ENABLE_TELEPHONE_NUMBER_DETECTION;
@@ -206,7 +186,6 @@ ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
 
 ENABLE_WEB_TIMING[sdk=iphone*] = ENABLE_WEB_TIMING;
 ENABLE_WEB_TIMING[sdk=macosx*] = $(ENABLE_WEB_TIMING_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_WEB_TIMING_macosx_1080 = ;
 ENABLE_WEB_TIMING_macosx_1090 = ;
 ENABLE_WEB_TIMING_macosx_101000 = ENABLE_WEB_TIMING;
 ENABLE_WEB_TIMING_macosx_101100 = ENABLE_WEB_TIMING;
index 596c843..574e402 100644 (file)
@@ -35,7 +35,6 @@ SHORT_VERSION_STRING = $(SHORT_VERSION_STRING_$(CONFIGURATION))
 // The system version prefix is based on the current system version.
 SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
 SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-SYSTEM_VERSION_PREFIX_macosx_1080 = 8;
 SYSTEM_VERSION_PREFIX_macosx_1090 = 9;
 SYSTEM_VERSION_PREFIX_macosx_101000 = 10;
 SYSTEM_VERSION_PREFIX_macosx_101100 = 11;
index d6bfe0d..065f0b9 100644 (file)
@@ -31,7 +31,6 @@ INFOPLIST_FILE[sdk=macosx*] = WebProcess/EntryPoint/mac/XPCService/WebContentSer
 
 BUNDLE_LOCALIZATION_KEY[sdk=iphone*] = CFBundleFollowParentLocalization;
 BUNDLE_LOCALIZATION_KEY = $(BUNDLE_LOCALIZATION_KEY_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-BUNDLE_LOCALIZATION_KEY_macosx_1080 = CFBundleAllowMixedLocalizations;
 BUNDLE_LOCALIZATION_KEY_macosx_1090 = CFBundleAllowMixedLocalizations;
 BUNDLE_LOCALIZATION_KEY_macosx_101000 = CFBundleFollowParentLocalization;
 BUNDLE_LOCALIZATION_KEY_macosx_101100 = CFBundleFollowParentLocalization;
index 55a3929..ce2784e 100644 (file)
@@ -31,7 +31,6 @@ INFOPLIST_FILE[sdk=macosx*] = WebProcess/EntryPoint/mac/XPCService/WebContentSer
 
 BUNDLE_LOCALIZATION_KEY[sdk=iphone*] = CFBundleFollowParentLocalization;
 BUNDLE_LOCALIZATION_KEY = $(BUNDLE_LOCALIZATION_KEY_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-BUNDLE_LOCALIZATION_KEY_macosx_1080 = CFBundleAllowMixedLocalizations;
 BUNDLE_LOCALIZATION_KEY_macosx_1090 = CFBundleAllowMixedLocalizations;
 BUNDLE_LOCALIZATION_KEY_macosx_101000 = CFBundleFollowParentLocalization;
 BUNDLE_LOCALIZATION_KEY_macosx_101100 = CFBundleFollowParentLocalization;
index 3edcbf4..5c7f750 100644 (file)
@@ -50,7 +50,6 @@ INSTALLHDRS_SCRIPT_PHASE = YES;
 
 WK_API_AVAILABILITY_ENABLED[sdk=iphone*] = YES;
 WK_API_AVAILABILITY_ENABLED = $(WK_API_AVAILABILITY_ENABLED_$(PLATFORM_NAME)_$(MAC_OS_X_VERSION_MAJOR));
-WK_API_AVAILABILITY_ENABLED_macosx_1080 = NO;
 WK_API_AVAILABILITY_ENABLED_macosx_1090 = NO;
 WK_API_AVAILABILITY_ENABLED_macosx_101000 = YES;
 WK_API_AVAILABILITY_ENABLED_macosx_101100 = YES;
index 8521030..b3b1b75 100644 (file)
 #endif
 
 (deny file-read* file-write* (with no-log)
-#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1080
-    (home-literal "/Library/Caches/Cache.db") ;; <rdar://problem/9422957>
-#endif
     ;; FIXME: Should be removed after <rdar://problem/10463881> is fixed.
     (home-literal "/Library/Preferences/com.apple.LaunchServices.QuarantineEventsV2")
     (home-literal "/Library/Preferences/com.apple.LaunchServices.QuarantineEventsV2-journal"))
index 0caff9c..7bd7c05 100644 (file)
@@ -1,3 +1,13 @@
+2015-01-31  Sam Weinig  <sam@webkit.org>
+
+        Remove even more Mountain Lion support
+        https://bugs.webkit.org/show_bug.cgi?id=141124
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+
 2015-01-30  Geoffrey Garen  <ggaren@apple.com>
 
         GC marking threads should clear malloc caches
index 7c06c6b..311ced1 100644 (file)
@@ -109,13 +109,6 @@ INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL);
 
 SDKROOT = macosx.internal;
 
-TOOLCHAINS[sdk=macosx*] = $(TOOLCHAINS_macosx);
-TOOLCHAINS_macosx = $(TOOLCHAINS_macosx_$(MAC_OS_X_VERSION_MAJOR));
-TOOLCHAINS_macosx_1080 = default;
-TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
-TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
-TOOLCHAINS_macosx_101100 = $(TOOLCHAINS_macosx_101000);
-
 OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
 OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
 OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
index f529535..88fe5de 100644 (file)
@@ -27,7 +27,6 @@ ARCHS = $(ARCHS_STANDARD_32_64_BIT);
 ONLY_ACTIVE_ARCH = YES;
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_macosx_1080 = 10.8;
 MACOSX_DEPLOYMENT_TARGET_macosx_1090 = 10.9;
 MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
 MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
index b744281..22ccf47 100644 (file)
@@ -1,3 +1,50 @@
+2015-01-31  Sam Weinig  <sam@webkit.org>
+
+        Remove even more Mountain Lion support
+        https://bugs.webkit.org/show_bug.cgi?id=141124
+
+        Reviewed by Alexey Proskuryakov.
+
+        * DumpRenderTree/mac/AccessibilityUIElementMac.mm:
+        (AccessibilityUIElement::attributedStringRangeIsMisspelled):
+        * DumpRenderTree/mac/Configurations/Base.xcconfig:
+        * DumpRenderTree/mac/Configurations/DebugRelease.xcconfig:
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        (activateTestingFonts):
+        (prepareConsistentTestingEnvironment):
+        * DumpRenderTree/mac/EventSendingController.mm:
+        (-[EventSendingController mouseScrollByX:andY:withWheel:andMomentumPhases:]):
+        (-[EventSendingController contextClick]):
+        * DumpRenderTree/mac/TextInputController.m:
+        * LayoutTestRelay/Configurations/Base.xcconfig:
+        * LayoutTestRelay/Configurations/DebugRelease.xcconfig:
+        * MiniBrowser/Configurations/Base.xcconfig:
+        * MiniBrowser/Configurations/DebugRelease.xcconfig:
+        * MiniBrowser/mac/WK2BrowserWindowController.m:
+        (-[WK2BrowserWindowController webView:runJavaScriptAlertPanelWithMessage:initiatedByFrame:completionHandler:]):
+        (-[WK2BrowserWindowController webView:runJavaScriptConfirmPanelWithMessage:initiatedByFrame:completionHandler:]):
+        (-[WK2BrowserWindowController webView:runJavaScriptTextInputPanelWithPrompt:defaultText:initiatedByFrame:completionHandler:]):
+        * TestWebKitAPI/Configurations/Base.xcconfig:
+        * TestWebKitAPI/Configurations/DebugRelease.xcconfig:
+        * TestWebKitAPI/Tests/WebKit2Cocoa/Download.mm:
+        (-[DownloadDelegate _downloadDidFinish:]):
+        * TestWebKitAPI/Tests/mac/StringTruncator.mm:
+        (TestWebKitAPI::TEST):
+        * TestWebKitAPI/mac/InjectedBundleControllerMac.mm:
+        (TestWebKitAPI::InjectedBundleController::platformInitialize):
+        * WebKitLauncher/Configurations/Base.xcconfig:
+        * WebKitTestRunner/Configurations/Base.xcconfig:
+        * WebKitTestRunner/Configurations/DebugRelease.xcconfig:
+        * WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm:
+        (WTR::AccessibilityUIElement::attributedStringRangeIsMisspelled):
+        * WebKitTestRunner/InjectedBundle/mac/ActivateFonts.mm:
+        (WTR::activateFonts):
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::TestController::initialize):
+        (WTR::TestController::webProcessName):
+        * WebKitTestRunner/mac/EventSenderProxy.mm:
+        * asan/asan.xcconfig:
+
 2015-01-31  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r179408.
index bdb3b4b..26a76e0 100644 (file)
@@ -1080,7 +1080,7 @@ bool AccessibilityUIElement::attributedStringRangeIsMisspelled(unsigned location
 
     NSDictionary* attrs = [string attributesAtIndex:0 effectiveRange:nil];
     BOOL misspelled = [[attrs objectForKey:NSAccessibilityMisspelledTextAttribute] boolValue];
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+#if PLATFORM(MAC)
     if (misspelled)
         misspelled = [[attrs objectForKey:NSAccessibilityMarkedMisspelledTextAttribute] boolValue];
 #endif
index 154a957..fd8816f 100644 (file)
@@ -63,15 +63,6 @@ SDKROOT = macosx.internal;
 
 WEBKIT_SYSTEM_INTERFACE_LIBRARY = WebKitSystemInterface
 
-TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME));
-TOOLCHAINS_iphoneos = $(TOOLCHAINS);
-TOOLCHAINS_iphonesimulator = $(TOOLCHAINS);
-TOOLCHAINS_macosx = $(TOOLCHAINS_macosx_$(MAC_OS_X_VERSION_MAJOR));
-TOOLCHAINS_macosx_1080 = default;
-TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
-TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
-TOOLCHAINS_macosx_101100 = $(TOOLCHAINS_macosx_101000);
-
 SUPPORTED_PLATFORMS = macosx iphoneos iphonesimulator;
 
 OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
index f15cea6..64b9f53 100644 (file)
@@ -32,7 +32,6 @@ MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME));
 MACOSX_DEPLOYMENT_TARGET_iphoneos = 10.9;
 MACOSX_DEPLOYMENT_TARGET_iphonesimulator = 10.9;
 MACOSX_DEPLOYMENT_TARGET_macosx = $(MACOSX_DEPLOYMENT_TARGET_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_macosx_1080 = 10.8;
 MACOSX_DEPLOYMENT_TARGET_macosx_1090 = 10.9;
 MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
 MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
@@ -41,7 +40,6 @@ WEBKIT_SYSTEM_INTERFACE_LIBRARY = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_$(PLATFORM_N
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphoneos = WebKitSystemInterfaceIOSDevice$(IPHONEOS_DEPLOYMENT_TARGET);
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphonesimulator = WebKitSystemInterfaceIOSSimulator$(IPHONEOS_DEPLOYMENT_TARGET);
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1080 = WebKitSystemInterfaceMountainLion;
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1090 = WebKitSystemInterfaceMavericks;
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000 = WebKitSystemInterfaceYosemite;
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101100 = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000);
index 261620e..bd7b490 100644 (file)
@@ -486,9 +486,7 @@ static void activateTestingFonts()
         "WebKitWeightWatcher700.ttf",
         "WebKitWeightWatcher800.ttf",
         "WebKitWeightWatcher900.ttf",
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
         "SampleFont.sfont",
-#endif
         0
     };
 
@@ -1107,7 +1105,7 @@ static void prepareConsistentTestingEnvironment()
     
     makeLargeMallocFailSilently();
 
-#if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+#if PLATFORM(MAC)
     NSActivityOptions options = (NSActivityUserInitiatedAllowingIdleSystemSleep | NSActivityLatencyCritical) & ~(NSActivitySuddenTerminationDisabled | NSActivityAutomaticTerminationDisabled);
     static id assertion = [[[NSProcessInfo processInfo] beginActivityWithOptions:options reason:@"DumpRenderTree should not be subject to process suppression"] retain];
     ASSERT_UNUSED(assertion, assertion);
index 3746c62..06d18bb 100644 (file)
@@ -701,13 +701,9 @@ static int buildModifierFlags(const WebScriptObject* modifiers)
     [self mouseScrollByX:x andY:y continuously:NO];
 }
 
-#if !PLATFORM(IOS) && MAC_OS_X_VERSION_MAX_ALLOWED < 1090
-const uint32_t kCGScrollWheelEventMomentumPhase = 123;
-#endif
-
 - (void)mouseScrollByX:(int)x andY:(int)y withWheel:(NSString*)phaseName andMomentumPhases:(NSString*)momentumName
 {
-#if !PLATFORM(IOS)
+#if PLATFORM(MAC)
     uint32_t phase = 0;
     if ([phaseName isEqualToString: @"none"])
         phase = 0;
@@ -756,7 +752,7 @@ const uint32_t kCGScrollWheelEventMomentumPhase = 123;
 
 - (NSArray *)contextClick
 {
-#if !PLATFORM(IOS)
+#if PLATFORM(MAC)
     [[[mainFrame frameView] documentView] layout];
     [self updateClickCountForButton:RightMouseButton];
 
index e93242e..d4613d3 100644 (file)
@@ -28,7 +28,7 @@
 
 #import <Foundation/Foundation.h>
 
-#if !PLATFORM(IOS)
+#if PLATFORM(MAC)
 // FIXME: <rdar://problem/5106287> DumpRenderTree: fix TextInputController to work with iOS and re-enable tests
 
 @class WebView;
index 1bad5f2..157aca2 100644 (file)
 #import "config.h"
 #import "TextInputController.h"
 
-#if !PLATFORM(IOS)
+#if PLATFORM(MAC)
 // FIXME: <rdar://problem/5106287> DumpRenderTree: fix TextInputController to work with iOS and re-enable tests
 
 #import "DumpRenderTreeMac.h"
 #import <AppKit/NSInputManager.h>
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
-#define SUPPORT_DICTATION_ALTERNATIVES
 #import <AppKit/NSTextAlternatives.h>
-#endif
+
 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
 #define SUPPORT_INSERTION_UNDO_GROUPING
 #if __has_include(<AppKit/NSTextInputContext_Private.h>)
@@ -466,7 +464,7 @@ NSString *NSTextInsertionUndoableAttributeName;
 
 - (NSMutableAttributedString*)stringWithUndoGroupingInsertion:(NSString*)aString
 {
-#if defined(SUPPORT_INSERTION_UNDO_GROUPING) && defined(SUPPORT_DICTATION_ALTERNATIVES)
+#if defined(SUPPORT_INSERTION_UNDO_GROUPING)
     NSMutableAttributedString* attributedString = [self dictatedStringWithPrimaryString:aString alternative:@"test" alternativeOffset:0 alternativeLength:1];
     [attributedString addAttribute:NSTextInsertionUndoableAttributeName value:@YES range:NSMakeRange(0, [attributedString length])];
     return attributedString;
@@ -477,7 +475,6 @@ NSString *NSTextInsertionUndoableAttributeName;
 
 - (NSMutableAttributedString*)dictatedStringWithPrimaryString:(NSString*)aString alternative:(NSString*)alternative alternativeOffset:(int)offset alternativeLength:(int)length
 {
-#if defined(SUPPORT_DICTATION_ALTERNATIVES)
     NSMutableAttributedString* dictatedString = [self attributedStringWithString:aString];
     NSRange rangeWithAlternative = NSMakeRange((NSUInteger)offset, (NSUInteger)length);
     NSString* subStringWithAlternative = [aString substringWithRange:rangeWithAlternative];
@@ -491,9 +488,6 @@ NSString *NSTextInsertionUndoableAttributeName;
     [dictatedString addAttribute:NSTextAlternativesAttributeName value:alternativeObject range:rangeWithAlternative];
 
     return dictatedString;
-#else
-    return nil;
-#endif
 }
 
 - (void)setInputMethodHandler:(WebScriptObject *)handler
index 5663c23..a44899c 100644 (file)
@@ -51,15 +51,6 @@ TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
 
 SDKROOT = macosx.internal;
 
-TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME));
-TOOLCHAINS_iphoneos = $(TOOLCHAINS);
-TOOLCHAINS_iphonesimulator = $(TOOLCHAINS);
-TOOLCHAINS_macosx = $(TOOLCHAINS_macosx_$(MAC_OS_X_VERSION_MAJOR));
-TOOLCHAINS_macosx_1080 = default;
-TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
-TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
-TOOLCHAINS_macosx_101100 = $(TOOLCHAINS_macosx_101000);
-
 SUPPORTED_PLATFORMS = macosx;
 
 OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
index 7ffc99b..205c76c 100644 (file)
@@ -1 +1 @@
-// Copyright (C) 2014 Apple Inc. All rights reserved.\r//\r// Redistribution and use in source and binary forms, with or without\r// modification, are permitted provided that the following conditions\r// are met:\r// 1. Redistributions of source code must retain the above copyright\r//    notice, this list of conditions and the following disclaimer.\r// 2. Redistributions in binary form must reproduce the above copyright\r//    notice, this list of conditions and the following disclaimer in the\r//    documentation and/or other materials provided with the distribution.\r//\r// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY\r// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\r// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\r// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR\r// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,\r// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,\r// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR\r// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY\r// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\r// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\r// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\r\r#include "Base.xcconfig"\r\rARCHS = $(ARCHS_STANDARD_64_BIT);\r\rMACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))\rMACOSX_DEPLOYMENT_TARGET_1080 = 10.8;\rMACOSX_DEPLOYMENT_TARGET_1090 = 10.9;\rMACOSX_DEPLOYMENT_TARGET_101000 = 10.10;\rMACOSX_DEPLOYMENT_TARGET_101100 = 10.11;\r\rFRAMEWORK_SEARCH_PATHS = $(DEVELOPER_DIR)/Library/PrivateFrameworks;\rLD_RUNPATH_SEARCH_PATHS = $(DEVELOPER_DIR)/Library/PrivateFrameworks;\rOTHER_LDFLAGS = -framework CoreSimulator -framework AppKit;\r\rSDKROOT = $(SDKROOT_macosx_$(USE_INTERNAL_SDK));\rSDKROOT_macosx_ = macosx;\rSDKROOT_macosx_YES = macosx.internal;\r
+// Copyright (C) 2014 Apple Inc. All rights reserved.\r//\r// Redistribution and use in source and binary forms, with or without\r// modification, are permitted provided that the following conditions\r// are met:\r// 1. Redistributions of source code must retain the above copyright\r//    notice, this list of conditions and the following disclaimer.\r// 2. Redistributions in binary form must reproduce the above copyright\r//    notice, this list of conditions and the following disclaimer in the\r//    documentation and/or other materials provided with the distribution.\r//\r// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY\r// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\r// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\r// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR\r// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,\r// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,\r// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR\r// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY\r// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\r// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\r// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\r\r#include "Base.xcconfig"\r\rARCHS = $(ARCHS_STANDARD_64_BIT);\r\rMACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))\rMACOSX_DEPLOYMENT_TARGET_1090 = 10.9;\rMACOSX_DEPLOYMENT_TARGET_101000 = 10.10;\rMACOSX_DEPLOYMENT_TARGET_101100 = 10.11;\r\rFRAMEWORK_SEARCH_PATHS = $(DEVELOPER_DIR)/Library/PrivateFrameworks;\rLD_RUNPATH_SEARCH_PATHS = $(DEVELOPER_DIR)/Library/PrivateFrameworks;\rOTHER_LDFLAGS = -framework CoreSimulator -framework AppKit;\r\rSDKROOT = $(SDKROOT_macosx_$(USE_INTERNAL_SDK));\rSDKROOT_macosx_ = macosx;\rSDKROOT_macosx_YES = macosx.internal;\r
\ No newline at end of file
index 85fe7d1..2fd7f30 100644 (file)
@@ -52,15 +52,6 @@ TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
 
 SDKROOT = macosx.internal;
 
-TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME));
-TOOLCHAINS_iphoneos = $(TOOLCHAINS);
-TOOLCHAINS_iphonesimulator = $(TOOLCHAINS);
-TOOLCHAINS_macosx = $(TOOLCHAINS_macosx_$(MAC_OS_X_VERSION_MAJOR));
-TOOLCHAINS_macosx_1080 = default;
-TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
-TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
-TOOLCHAINS_macosx_101100 = $(TOOLCHAINS_macosx_101000);
-
 OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
 OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
 OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
index 1ef94e3..c941838 100644 (file)
@@ -29,7 +29,6 @@ ARCHS = $(ARCHS_STANDARD_32_64_BIT);
 ONLY_ACTIVE_ARCH = YES;
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
-MACOSX_DEPLOYMENT_TARGET_1080 = 10.8;
 MACOSX_DEPLOYMENT_TARGET_1090 = 10.9;
 MACOSX_DEPLOYMENT_TARGET_101000 = 10.10;
 MACOSX_DEPLOYMENT_TARGET_101100 = 10.11;
index 7d6da62..c14c43d 100644 (file)
@@ -337,12 +337,10 @@ static void* keyValueObservingContext = &keyValueObservingContext;
     [alert setInformativeText:message];
     [alert addButtonWithTitle:@"OK"];
 
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
     [alert beginSheetModalForWindow:self.window completionHandler:^void (NSModalResponse response) {
         completionHandler();
         [alert release];
     }];
-#endif
 }
 
 - (void)webView:(WKWebView *)webView runJavaScriptConfirmPanelWithMessage:(NSString *)message initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(BOOL result))completionHandler
@@ -355,12 +353,10 @@ static void* keyValueObservingContext = &keyValueObservingContext;
     [alert addButtonWithTitle:@"OK"];
     [alert addButtonWithTitle:@"Cancel"];
 
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
     [alert beginSheetModalForWindow:self.window completionHandler:^void (NSModalResponse response) {
         completionHandler(response == NSAlertFirstButtonReturn);
         [alert release];
     }];
-#endif
 }
 
 - (void)webView:(WKWebView *)webView runJavaScriptTextInputPanelWithPrompt:(NSString *)prompt defaultText:(NSString *)defaultText initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(NSString *result))completionHandler
@@ -377,13 +373,11 @@ static void* keyValueObservingContext = &keyValueObservingContext;
     [input setStringValue:defaultText];
     [alert setAccessoryView:input];
     
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
     [alert beginSheetModalForWindow:self.window completionHandler:^void (NSModalResponse response) {
         [input validateEditing];
         completionHandler(response == NSAlertFirstButtonReturn ? [input stringValue] : nil);
         [alert release];
     }];
-#endif
 }
 
 - (void)updateTextFieldFromURL:(NSURL *)URL
index 6549147..57ed4d1 100644 (file)
@@ -67,15 +67,6 @@ EXCLUDED_SOURCE_FILE_NAMES_macosx = *IOS.h *IOS.cpp *IOS.mm;
 EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *Mac.h *Mac.cpp *Mac.mm */mac/*;
 EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
 
-TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME));
-TOOLCHAINS_iphoneos = $(TOOLCHAINS);
-TOOLCHAINS_iphonesimulator = $(TOOLCHAINS);
-TOOLCHAINS_macosx = $(TOOLCHAINS_macosx_$(MAC_OS_X_VERSION_MAJOR));
-TOOLCHAINS_macosx_1080 = default;
-TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
-TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
-TOOLCHAINS_macosx_101100 = $(TOOLCHAINS_macosx_101000);
-
 OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
 OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
 OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
index ce1cff6..43fec48 100644 (file)
@@ -29,7 +29,6 @@ ARCHS = $(ARCHS_STANDARD_32_64_BIT);
 ONLY_ACTIVE_ARCH = YES;
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
-MACOSX_DEPLOYMENT_TARGET_1080 = 10.8;
 MACOSX_DEPLOYMENT_TARGET_1090 = 10.9;
 MACOSX_DEPLOYMENT_TARGET_101000 = 10.10;
 MACOSX_DEPLOYMENT_TARGET_101100 = 10.11;
index 21c5ab2..9227220 100644 (file)
@@ -92,10 +92,6 @@ static NSURL *sourceURL = [[NSBundle mainBundle] URLForResource:@"simple" withEx
 
 - (void)_downloadDidFinish:(_WKDownload *)download
 {
-#if __MAC_OS_X_VERSION_MIN_REQUIRED == 1080
-    // Work around <rdar://problem/7611450> NSURLDownload calls didReceiveDataOfLength: delegate method too many times
-    _receivedContentLength /= 2;
-#endif
     EXPECT_EQ(_download, download);
     EXPECT_TRUE(_expectedContentLength == NSURLResponseUnknownLength || static_cast<uint64_t>(_expectedContentLength) == _receivedContentLength);
     EXPECT_TRUE([[NSFileManager defaultManager] contentsEqualAtPath:_destinationPath andPath:[sourceURL path]]);
index 5f41ccd..252eb05 100644 (file)
@@ -33,11 +33,7 @@ namespace TestWebKitAPI {
 TEST(WebKit1, StringTruncator)
 {
     @autoreleasepool {
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
         EXPECT_STREQ([[WebStringTruncator centerTruncateString:@"abcdefghijklmnopqrstuvwxyz" toWidth:100 withFont:[NSFont fontWithName:@"Helvetica" size:12]] UTF8String], "abcdef…tuvwxyz");
-#else
-        EXPECT_STREQ([[WebStringTruncator centerTruncateString:@"abcdefghijklmnopqrstuvwxyz" toWidth:100 withFont:[NSFont fontWithName:@"Helvetica" size:12]] UTF8String], "abcdefg…tuvwxyz");
-#endif
         EXPECT_STREQ([[WebStringTruncator centerTruncateString:@"abcdefghijklmnopqrstuvwxyz" toWidth:100] UTF8String], "abcde…uvwxyz");
         EXPECT_STREQ([[WebStringTruncator rightTruncateString:@"abcdefghijklmnopqrstuvwxyz" toWidth:100 withFont:[NSFont fontWithName:@"Helvetica" size:12]] UTF8String], "abcdefghijklmno…");
         EXPECT_STREQ([[WebStringTruncator centerTruncateString:@"ābcdefghijklmnopqrstuvwxyz" toWidth:100 withFont:[NSFont fontWithName:@"Helvetica" size:12]] UTF8String], "ābcdefg…tuvwxyz");
index 5d6712a..7b2bd7f 100644 (file)
@@ -40,11 +40,7 @@ void InjectedBundleController::platformInitialize()
     NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
                           [NSNumber numberWithInteger:4],   @"AppleAntiAliasingThreshold",
                           [NSNumber numberWithInteger:0],   @"AppleFontSmoothing",
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
                           [NSNumber numberWithBool:NO],     @"NSScrollAnimationEnabled",
-#else
-                          [NSNumber numberWithBool:NO],     @"AppleScrollAnimationEnabled",
-#endif
                           [NSNumber numberWithBool:NO],     @"NSOverlayScrollersEnabled",
                           @"Always",                        @"AppleShowScrollBars",
                           nil];
index c115cf1..5df1db6 100644 (file)
@@ -36,15 +36,6 @@ WARNING_CFLAGS = -Wall;
 
 ENABLE_SPARKLE = 0;
 
-TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME));
-TOOLCHAINS_iphoneos = $(TOOLCHAINS);
-TOOLCHAINS_iphonesimulator = $(TOOLCHAINS);
-TOOLCHAINS_macosx = $(TOOLCHAINS_macosx_$(MAC_OS_X_VERSION_MAJOR));
-TOOLCHAINS_macosx_1080 = default;
-TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
-TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
-TOOLCHAINS_macosx_101100 = $(TOOLCHAINS_macosx_101000);
-
 OTHER_CFLAGS = $(inherited) $(ASAN_OTHER_CFLAGS);
 OTHER_CPLUSPLUSFLAGS = $(inherited) $(ASAN_OTHER_CPLUSPLUSFLAGS);
 OTHER_LDFLAGS = $(inherited) $(ASAN_OTHER_LDFLAGS);
\ No newline at end of file
index 0466517..2a5c435 100644 (file)
@@ -60,15 +60,6 @@ FRAMEWORK_SEARCH_PATHS = $(inherited) $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
 
 WEBKIT_SYSTEM_INTERFACE_LIBRARY = WebKitSystemInterface
 
-TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME));
-TOOLCHAINS_iphoneos = $(TOOLCHAINS);
-TOOLCHAINS_iphonesimulator = $(TOOLCHAINS);
-TOOLCHAINS_macosx = $(TOOLCHAINS_macosx_$(MAC_OS_X_VERSION_MAJOR));
-TOOLCHAINS_macosx_1080 = default;
-TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
-TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
-TOOLCHAINS_macosx_101100 = $(TOOLCHAINS_macosx_101000);
-
 OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
 OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
 OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
index 1391ae5..1ec2f03 100644 (file)
@@ -29,7 +29,6 @@ ARCHS = $(ARCHS_STANDARD_32_64_BIT);
 ONLY_ACTIVE_ARCH = YES;
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
-MACOSX_DEPLOYMENT_TARGET_1080 = 10.8;
 MACOSX_DEPLOYMENT_TARGET_1090 = 10.9;
 MACOSX_DEPLOYMENT_TARGET_101000 = 10.10;
 MACOSX_DEPLOYMENT_TARGET_101100 = 10.11;
@@ -40,7 +39,6 @@ WEBKIT_SYSTEM_INTERFACE_LIBRARY = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_$(PLATFORM_N
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphoneos = WebKitSystemInterfaceIOSDevice$(IPHONEOS_DEPLOYMENT_TARGET);
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphonesimulator = WebKitSystemInterfaceIOSSimulator$(IPHONEOS_DEPLOYMENT_TARGET);
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1080 = WebKitSystemInterfaceMountainLion;
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1090 = WebKitSystemInterfaceMavericks;
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000 = WebKitSystemInterfaceYosemite;
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101100 = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000);
index 95d5433..21cd677 100644 (file)
@@ -1141,7 +1141,7 @@ bool AccessibilityUIElement::attributedStringRangeIsMisspelled(unsigned location
 
     NSDictionary* attrs = [string attributesAtIndex:0 effectiveRange:nil];
     BOOL misspelled = [[attrs objectForKey:NSAccessibilityMisspelledTextAttribute] boolValue];
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+#if PLATFORM(MAC)
     if (misspelled)
         misspelled = [[attrs objectForKey:NSAccessibilityMarkedMisspelledTextAttribute] boolValue];
 #endif
index a968d70..9a93398 100644 (file)
@@ -250,9 +250,7 @@ void activateFonts()
         "WebKitWeightWatcher700.ttf",
         "WebKitWeightWatcher800.ttf",
         "WebKitWeightWatcher900.ttf",
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
         "SampleFont.sfont",
-#endif
         0
     };
 
index 337aa76..3fed5ba 100644 (file)
@@ -391,7 +391,7 @@ void TestController::initialize(int argc, const char* argv[])
     m_context = adoptWK(WKContextCreateWithConfiguration(configuration.get()));
     m_geolocationProvider = std::make_unique<GeolocationProviderMock>(m_context.get());
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED == 1080) || PLATFORM(EFL)
+#if PLATFORM(EFL)
     WKContextSetUsesNetworkProcess(m_context.get(), false);
     WKContextSetProcessModel(m_context.get(), kWKProcessModelSharedSecondaryProcess);
 #endif
@@ -758,8 +758,8 @@ const char* TestController::webProcessName()
 {
     // FIXME: Find a way to not hardcode the process name.
 #if PLATFORM(IOS)
-    return  "com.apple.WebKit.WebContent";
-#elif PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED > 1080
+    return "com.apple.WebKit.WebContent";
+#elif PLATFORM(MAC)
     return "com.apple.WebKit.WebContent.Development";
 #else
     return "WebProcess";
index 2394b27..e8095af 100644 (file)
@@ -474,10 +474,6 @@ void EventSenderProxy::continuousMouseScrollBy(int x, int y, bool paged)
     return;
 }
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED < 1090
-const uint32_t kCGScrollWheelEventMomentumPhase = 123;
-#endif
-
 void EventSenderProxy::mouseScrollByWithWheelAndMomentumPhases(int x, int y, int phase, int momentum)
 {
     RetainPtr<CGEventRef> cgScrollEvent = adoptCF(CGEventCreateScrollWheelEvent(0, kCGScrollEventUnitLine, 2, y, x));
index 856ad99..455411e 100644 (file)
@@ -1,6 +1,5 @@
 TOOLCHAINS[sdk=macosx*] = $(TOOLCHAINS_macosx);
 TOOLCHAINS_macosx = $(TOOLCHAINS_macosx_$(MAC_OS_X_VERSION_MAJOR));
-TOOLCHAINS_macosx_1080 = default;
 TOOLCHAINS_macosx_1090 = default;
 TOOLCHAINS_macosx_101000 = default;
 TOOLCHAINS_macosx_101100 = $(TOOLCHAINS);