[macOS] Remove code only needed when building for OS X Yosemite
authormitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 1 Jul 2017 21:12:04 +0000 (21:12 +0000)
committermitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 1 Jul 2017 21:12:04 +0000 (21:12 +0000)
https://bugs.webkit.org/show_bug.cgi?id=174067

Reviewed by Tim Horton.

Source/bmalloc:

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

Source/JavaScriptCore:

* API/WebKitAvailability.h:
* Configurations/Base.xcconfig:
* Configurations/DebugRelease.xcconfig:
* Configurations/FeatureDefines.xcconfig:
* Configurations/Version.xcconfig:

Source/ThirdParty/ANGLE:

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

Source/ThirdParty/libwebrtc:

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

Source/WebCore:

* Configurations/Base.xcconfig:
* Configurations/DebugRelease.xcconfig:
* Configurations/FeatureDefines.xcconfig:
* Configurations/Version.xcconfig:
* accessibility/AXObjectCache.cpp:
(WebCore::AXObjectCache::setEnhancedUserInterfaceAccessibility):
* html/HTMLCanvasElement.cpp:
* page/WheelEventDeltaFilter.cpp:
(WebCore::WheelEventDeltaFilter::create):
* page/mac/WheelEventDeltaFilterMac.h:
* page/mac/WheelEventDeltaFilterMac.mm:
* page/scrolling/ScrollingMomentumCalculator.cpp:
* page/scrolling/mac/ScrollingMomentumCalculatorMac.h:
* page/scrolling/mac/ScrollingMomentumCalculatorMac.mm:
* platform/cocoa/NetworkExtensionContentFilter.mm:
(replacementDataFromDecisionInfo):
(WebCore::NetworkExtensionContentFilter::initialize):
(WebCore::NetworkExtensionContentFilter::willSendRequest):
(WebCore::NetworkExtensionContentFilter::responseReceived):
(WebCore::NetworkExtensionContentFilter::addData):
(WebCore::NetworkExtensionContentFilter::finishedAddingData):
(WebCore::NetworkExtensionContentFilter::unblockHandler):
* platform/graphics/ComplexTextController.h:
* platform/graphics/ca/cocoa/PlatformCAAnimationCocoa.mm:
(PlatformCAAnimationCocoa::setTimingFunction):
* platform/graphics/cocoa/FontCacheCoreText.cpp:
(WebCore::FontCache::platformAlternateFamilyName):
* platform/graphics/cocoa/FontCocoa.mm:
(WebCore::Font::platformInit):
* platform/graphics/cocoa/IOSurface.mm:
(WebCore::IOSurface::sinkIntoImage):
* platform/graphics/cocoa/WebGPULayer.mm:
(-[WebGPULayer initWithGPUDevice:]):
* platform/graphics/mac/ComplexTextControllerCoreText.mm:
(WebCore::ComplexTextController::ComplexTextRun::ComplexTextRun):
* platform/graphics/mac/WebGLLayer.mm:
(-[WebGLLayer initWithGraphicsContext3D:]):
* platform/mac/BlacklistUpdater.mm:
* platform/mac/PlatformScreenMac.mm:
(WebCore::screenSupportsExtendedColor):
* platform/mac/ValidationBubbleMac.mm:
(WebCore::ValidationBubble::ValidationBubble):
* platform/mac/WebGLBlacklist.mm:
(WebCore::WebGLBlacklist::create):
* platform/network/cocoa/WebCoreNSURLSession.h:
* platform/network/cocoa/WebCoreNSURLSession.mm:
* platform/network/mac/CertificateInfoMac.mm:
(WebCore::CertificateInfo::containsNonRootSHA1SignedCertificate):
* platform/network/mac/CookieJarMac.mm:
(WebCore::setCookiesFromDOM):
* platform/spi/cf/CFNetworkSPI.h:
* platform/spi/cg/CoreGraphicsSPI.h:
* platform/spi/cocoa/NEFilterSourceSPI.h:
* platform/spi/cocoa/NSURLConnectionSPI.h:
* platform/spi/cocoa/QuartzCoreSPI.h:
* platform/spi/mac/NSScrollingInputFilterSPI.h:
* platform/spi/mac/NSScrollingMomentumCalculatorSPI.h:
* platform/spi/mac/TUCallSPI.h:
* rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::levelIndicatorFor):
* svg/SVGToOTFFontConversion.cpp:
(WebCore::SVGToOTFFontConverter::appendKERNTable):
(WebCore::SVGToOTFFontConverter::SVGToOTFFontConverter):

Source/WebCore/PAL:

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

Source/WebInspectorUI:

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

Source/WebKit/mac:

* Configurations/Base.xcconfig:
* Configurations/DebugRelease.xcconfig:
* Configurations/FeatureDefines.xcconfig:
* Configurations/Version.xcconfig:
* Plugins/WebBasePluginPackage.mm:
(-[WebBasePluginPackage getPluginInfoFromPLists]):
* WebCoreSupport/PopupMenuMac.mm:
(PopupMenuMac::show):
* WebCoreSupport/WebInspectorClient.mm:
(WebInspectorFrontendClient::startWindowDrag):
(-[WebInspectorWindowController window]):
* WebView/WebView.mm:
(-[WebView _animationControllerForDictionaryLookupPopupInfo:]):

Source/WebKit2:

* Configurations/Base.xcconfig:
* Configurations/BaseTarget.xcconfig:
* Configurations/BaseXPCService.xcconfig:
* Configurations/DebugRelease.xcconfig:
* Configurations/FeatureDefines.xcconfig:
* Configurations/NetworkService.xcconfig:
* Configurations/PluginService.32.xcconfig:
* Configurations/PluginService.64.xcconfig:
* Configurations/Version.xcconfig:
* Configurations/WebContentService.xcconfig:
* Configurations/WebKit.xcconfig:
* DatabaseProcess/mac/com.apple.WebKit.Databases.sb.in:
* NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist: Removed.
* NetworkProcess/NetworkProcessCreationParameters.cpp:
(WebKit::NetworkProcessCreationParameters::encode):
(WebKit::NetworkProcessCreationParameters::decode):
* NetworkProcess/NetworkProcessCreationParameters.h:
* NetworkProcess/cocoa/NetworkProcessCocoa.mm:
(WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
* NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in:
* Platform/IPC/Connection.h:
* Platform/IPC/mac/ConnectionMac.mm:
(IPC::Connection::platformInvalidate):
(IPC::Connection::platformInitialize):
(IPC::Connection::open):
(IPC::Connection::exceptionSourceEventHandler): Deleted.
(IPC::Connection::setShouldCloseConnectionOnMachExceptions): Deleted.
* Platform/mac/LayerHostingContext.h:
* Platform/mac/LayerHostingContext.mm:
(WebKit::LayerHostingContext::createFencePort):
* PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist: Removed.
* PluginProcess/mac/PluginControllerProxyMac.mm:
(WebKit::PluginControllerProxy::updateLayerHostingContext):
* PluginProcess/mac/PluginProcessShim.mm:
* PluginProcess/mac/com.apple.WebKit.plugin-common.sb.in:
* Shared/ChildProcess.h:
* Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm:
(WebKit::getPluginInfoFromPropertyLists):
(WebKit::NetscapePluginModule::getPluginInfo):
(WebKit::contentsOfPropertyListAtURL): Deleted.
(WebKit::getMIMETypesFromPluginBundle): Deleted.
* Shared/Plugins/PluginProcessCreationParameters.cpp:
(WebKit::PluginProcessCreationParameters::encode):
(WebKit::PluginProcessCreationParameters::decode):
* Shared/Plugins/PluginProcessCreationParameters.h:
* Shared/WebProcessCreationParameters.cpp:
(WebKit::WebProcessCreationParameters::encode):
(WebKit::WebProcessCreationParameters::decode):
* Shared/WebProcessCreationParameters.h:
* Shared/mac/ChildProcessMac.mm:
(WebKit::ChildProcess::setSharedHTTPCookieStorage):
* UIProcess/API/C/WKPage.cpp:
(WKPageSetPageUIClient):
(fixUpBotchedPageUIClient): Deleted.
* UIProcess/ChildProcessProxy.cpp:
(WebKit::ChildProcessProxy::didFinishLaunching):
* UIProcess/Cocoa/WebProcessPoolCocoa.mm:
(WebKit::WebProcessPool::platformInitializeWebProcess):
(WebKit::WebProcessPool::platformInitializeNetworkProcess):
(WebKit::WebProcessPool::resetHSTSHostsAddedAfterDate):
* UIProcess/Cocoa/WebViewImpl.h:
* UIProcess/Cocoa/WebViewImpl.mm:
(WebKit::WebViewImpl::updateLayer):
(WebKit::WebViewImpl::startWindowDrag):
* UIProcess/DrawingAreaProxy.h:
(WebKit::DrawingAreaProxy::waitForPossibleGeometryUpdate): Deleted.
* UIProcess/Plugins/PluginProcessProxy.cpp:
(WebKit::PluginProcessProxy::didFinishLaunching):
* UIProcess/Plugins/PluginProcessProxy.h:
* UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
(WebKit::PluginProcessProxy::platformInitializePluginProcess):
(WebKit::PluginProcessProxy::createPropertyListFile): Deleted.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::setTopContentInset):
* UIProcess/mac/PageClientImpl.mm:
(WebKit::PageClientImpl::rootViewToWindow):
(WebKit::PageClientImpl::startWindowDrag):
* UIProcess/mac/RemoteWebInspectorProxyMac.mm:
(WebKit::RemoteWebInspectorProxy::platformStartWindowDrag):
* UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h:
* UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm:
(WebKit::TiledCoreAnimationDrawingAreaProxy::createFence):
(WebKit::TiledCoreAnimationDrawingAreaProxy::waitForPossibleGeometryUpdate): Deleted.
* UIProcess/mac/WebInspectorProxyMac.mm:
(WebKit::WebInspectorProxy::createFrontendWindow):
(WebKit::WebInspectorProxy::platformStartWindowDrag):
* UIProcess/mac/WebPopupMenuProxyMac.mm:
(WebKit::WebPopupMenuProxyMac::showPopupMenu):
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist: Removed.
* WebProcess/WebPage/WebPage.cpp:
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in:
* WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm:
(WebKit::addAnimationToLayer):
* WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
(WebKit::RemoteLayerTreeDrawingArea::flushLayers):
* WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
(WebKit::TiledCoreAnimationDrawingArea::flushLayers):
(WebKit::TiledCoreAnimationDrawingArea::updateGeometry):
* WebProcess/cocoa/WebProcessCocoa.mm:
(WebKit::WebProcess::platformInitializeWebProcess):
* WebProcess/com.apple.WebProcess.sb.in:

Source/WTF:

* Configurations/Base.xcconfig:
* Configurations/DebugRelease.xcconfig:
* wtf/Platform.h:
* wtf/mac/AppKitCompatibilityDeclarations.h:
* wtf/spi/cocoa/SecuritySPI.h:
* wtf/text/TextBreakIterator.cpp:

Tools:

* DumpRenderTree/mac/Configurations/Base.xcconfig:
* DumpRenderTree/mac/Configurations/DebugRelease.xcconfig:
* DumpRenderTree/mac/DumpRenderTree.mm:
(setDefaultsToConsistentValuesForTesting):
* DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm:
(-[DumpRenderTreeDraggingInfo resetSpringLoading]):
* MiniBrowser/Configurations/Base.xcconfig:
* MiniBrowser/Configurations/DebugRelease.xcconfig:
* TestWebKitAPI/Configurations/Base.xcconfig:
* TestWebKitAPI/Configurations/DebugRelease.xcconfig:
* TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
* TestWebKitAPI/Tests/WebCore/ComplexTextController.cpp:
(TestWebKitAPI::TEST_F):
* TestWebKitAPI/Tests/WebCore/cocoa/WebCoreNSURLSession.mm:
* TestWebKitAPI/Tests/mac/DragAndDropPasteboardTests.mm:
* TestWebKitAPI/Tests/mac/FullscreenZoomInitialFrame.mm:
(TestWebKitAPI::TEST_F):
* TestWebKitAPI/Tests/mac/StringTruncator.mm:
(TestWebKitAPI::TEST):
* WebKitTestRunner/Configurations/Base.xcconfig:
* WebKitTestRunner/Configurations/DebugRelease.xcconfig:
* WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm:
(WTR::InjectedBundle::platformInitialize):
* WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.mm:
(-[WebKitTestRunnerDraggingInfo resetSpringLoading]):

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

158 files changed:
Source/JavaScriptCore/API/WebKitAvailability.h
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/Configurations/Base.xcconfig
Source/JavaScriptCore/Configurations/DebugRelease.xcconfig
Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
Source/JavaScriptCore/Configurations/Version.xcconfig
Source/ThirdParty/ANGLE/ChangeLog
Source/ThirdParty/ANGLE/Configurations/Base.xcconfig
Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig
Source/ThirdParty/libwebrtc/ChangeLog
Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig
Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig
Source/WTF/ChangeLog
Source/WTF/Configurations/Base.xcconfig
Source/WTF/Configurations/DebugRelease.xcconfig
Source/WTF/wtf/Platform.h
Source/WTF/wtf/mac/AppKitCompatibilityDeclarations.h
Source/WTF/wtf/spi/cocoa/SecuritySPI.h
Source/WTF/wtf/text/TextBreakIterator.cpp
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/PAL/ChangeLog
Source/WebCore/PAL/Configurations/Base.xcconfig
Source/WebCore/PAL/Configurations/DebugRelease.xcconfig
Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig
Source/WebCore/PAL/Configurations/Version.xcconfig
Source/WebCore/accessibility/AXObjectCache.cpp
Source/WebCore/html/HTMLCanvasElement.cpp
Source/WebCore/page/WheelEventDeltaFilter.cpp
Source/WebCore/page/mac/WheelEventDeltaFilterMac.h
Source/WebCore/page/mac/WheelEventDeltaFilterMac.mm
Source/WebCore/page/scrolling/ScrollingMomentumCalculator.cpp
Source/WebCore/page/scrolling/mac/ScrollingMomentumCalculatorMac.h
Source/WebCore/page/scrolling/mac/ScrollingMomentumCalculatorMac.mm
Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.mm
Source/WebCore/platform/graphics/ComplexTextController.h
Source/WebCore/platform/graphics/ca/cocoa/PlatformCAAnimationCocoa.mm
Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp
Source/WebCore/platform/graphics/cocoa/FontCocoa.mm
Source/WebCore/platform/graphics/cocoa/IOSurface.mm
Source/WebCore/platform/graphics/cocoa/WebGPULayer.mm
Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm
Source/WebCore/platform/graphics/mac/WebGLLayer.mm
Source/WebCore/platform/mac/BlacklistUpdater.mm
Source/WebCore/platform/mac/PlatformScreenMac.mm
Source/WebCore/platform/mac/ValidationBubbleMac.mm
Source/WebCore/platform/mac/WebGLBlacklist.mm
Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.h
Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm
Source/WebCore/platform/network/mac/CertificateInfoMac.mm
Source/WebCore/platform/network/mac/CookieJarMac.mm
Source/WebCore/platform/spi/cf/CFNetworkSPI.h
Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h
Source/WebCore/platform/spi/cocoa/NEFilterSourceSPI.h
Source/WebCore/platform/spi/cocoa/NSURLConnectionSPI.h
Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h
Source/WebCore/platform/spi/mac/NSScrollingInputFilterSPI.h
Source/WebCore/platform/spi/mac/NSScrollingMomentumCalculatorSPI.h
Source/WebCore/platform/spi/mac/TUCallSPI.h
Source/WebCore/rendering/RenderThemeMac.mm
Source/WebCore/svg/SVGToOTFFontConversion.cpp
Source/WebInspectorUI/ChangeLog
Source/WebInspectorUI/Configurations/Base.xcconfig
Source/WebInspectorUI/Configurations/DebugRelease.xcconfig
Source/WebInspectorUI/Configurations/Version.xcconfig
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/Plugins/WebBasePluginPackage.mm
Source/WebKit/mac/WebCoreSupport/PopupMenuMac.mm
Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm
Source/WebKit/mac/WebView/WebView.mm
Source/WebKit2/ChangeLog
Source/WebKit2/Configurations/Base.xcconfig
Source/WebKit2/Configurations/BaseTarget.xcconfig
Source/WebKit2/Configurations/BaseXPCService.xcconfig
Source/WebKit2/Configurations/DebugRelease.xcconfig
Source/WebKit2/Configurations/FeatureDefines.xcconfig
Source/WebKit2/Configurations/NetworkService.xcconfig
Source/WebKit2/Configurations/PluginService.32.xcconfig
Source/WebKit2/Configurations/PluginService.64.xcconfig
Source/WebKit2/Configurations/Version.xcconfig
Source/WebKit2/Configurations/WebContentService.xcconfig
Source/WebKit2/Configurations/WebKit.xcconfig
Source/WebKit2/DatabaseProcess/mac/com.apple.WebKit.Databases.sb.in
Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist [deleted file]
Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.cpp
Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.h
Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm
Source/WebKit2/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in
Source/WebKit2/Platform/IPC/Connection.h
Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm
Source/WebKit2/Platform/mac/LayerHostingContext.h
Source/WebKit2/Platform/mac/LayerHostingContext.mm
Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist [deleted file]
Source/WebKit2/PluginProcess/mac/PluginControllerProxyMac.mm
Source/WebKit2/PluginProcess/mac/PluginProcessShim.mm
Source/WebKit2/PluginProcess/mac/com.apple.WebKit.plugin-common.sb.in
Source/WebKit2/Shared/ChildProcess.h
Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm
Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp
Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.h
Source/WebKit2/Shared/WebProcessCreationParameters.cpp
Source/WebKit2/Shared/WebProcessCreationParameters.h
Source/WebKit2/Shared/mac/ChildProcessMac.mm
Source/WebKit2/UIProcess/API/C/WKPage.cpp
Source/WebKit2/UIProcess/ChildProcessProxy.cpp
Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm
Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h
Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm
Source/WebKit2/UIProcess/DrawingAreaProxy.h
Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp
Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h
Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm
Source/WebKit2/UIProcess/WebPageProxy.cpp
Source/WebKit2/UIProcess/mac/PageClientImpl.mm
Source/WebKit2/UIProcess/mac/RemoteWebInspectorProxyMac.mm
Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h
Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm
Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm
Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm
Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist [deleted file]
Source/WebKit2/WebProcess/WebPage/WebPage.cpp
Source/WebKit2/WebProcess/WebPage/WebPage.h
Source/WebKit2/WebProcess/WebPage/WebPage.messages.in
Source/WebKit2/WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm
Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm
Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm
Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm
Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in
Source/bmalloc/ChangeLog
Source/bmalloc/Configurations/Base.xcconfig
Source/bmalloc/Configurations/DebugRelease.xcconfig
Tools/ChangeLog
Tools/DumpRenderTree/mac/Configurations/Base.xcconfig
Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig
Tools/DumpRenderTree/mac/DumpRenderTree.mm
Tools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm
Tools/MiniBrowser/Configurations/Base.xcconfig
Tools/MiniBrowser/Configurations/DebugRelease.xcconfig
Tools/TestWebKitAPI/Configurations/Base.xcconfig
Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig
Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig
Tools/TestWebKitAPI/Tests/WebCore/ComplexTextController.cpp
Tools/TestWebKitAPI/Tests/WebCore/cocoa/WebCoreNSURLSession.mm
Tools/TestWebKitAPI/Tests/mac/DragAndDropPasteboardTests.mm
Tools/TestWebKitAPI/Tests/mac/FullscreenZoomInitialFrame.mm
Tools/TestWebKitAPI/Tests/mac/StringTruncator.mm
Tools/WebKitTestRunner/Configurations/Base.xcconfig
Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig
Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm
Tools/WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.mm

index ab53183..8227520 100644 (file)
@@ -66,7 +66,7 @@
 #define AVAILABLE_MAC_OS_X_VERSION_10_10_AND_LATER
 #endif
 
-#endif /* __MAC_OS_X_VERSION_MIN_REQUIRED <= 101100 */
+#endif /* !TARGET_OS_IPHONE && __MAC_OS_X_VERSION_MIN_REQUIRED < 101100 */
 
 #if defined(BUILDING_GTK__)
 #undef CF_AVAILABLE
index fe6bb89..7b91952 100644 (file)
@@ -1,3 +1,16 @@
+2017-07-01  Dan Bernstein  <mitz@apple.com>
+
+        [macOS] Remove code only needed when building for OS X Yosemite
+        https://bugs.webkit.org/show_bug.cgi?id=174067
+
+        Reviewed by Tim Horton.
+
+        * API/WebKitAvailability.h:
+        * Configurations/Base.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+        * Configurations/FeatureDefines.xcconfig:
+        * Configurations/Version.xcconfig:
+
 2017-07-01  Yusuke Suzuki  <utatane.tea@gmail.com>
 
         Unreviewed, build fix for GCC
index 978b733..0bc0102 100644 (file)
@@ -89,7 +89,6 @@ WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wfo
 HEADER_SEARCH_PATHS = . "${BUILT_PRODUCTS_DIR}/usr/local/include" $(HEADER_SEARCH_PATHS);
 
 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
-TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
 TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
 TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
 TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
index 8ceb87c..28eb061 100644 (file)
@@ -30,7 +30,6 @@ ONLY_ACTIVE_ARCH = YES;
 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
 MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
 MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
 MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
index 77ff8ac..9e56e68 100644 (file)
 // Set any ENABLE_FEATURE_NAME macro to an empty string to disable that feature.
 
 TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101000 = YES;
 TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101100 = YES;
 
 TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101000 = YES;
 TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101100 = YES;
 TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101200 = YES;
 
index 81bed2a..4d1cad8 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_101000 = 10;
 SYSTEM_VERSION_PREFIX_macosx_101100 = 11;
 SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
 SYSTEM_VERSION_PREFIX_macosx_101300 = 13;
index a8a4271..8e9e8ae 100644 (file)
@@ -1,3 +1,13 @@
+2017-07-01  Dan Bernstein  <mitz@apple.com>
+
+        [macOS] Remove code only needed when building for OS X Yosemite
+        https://bugs.webkit.org/show_bug.cgi?id=174067
+
+        Reviewed by Tim Horton.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+
 2017-06-10  Dan Bernstein  <mitz@apple.com>
 
         Reverted r218056 because it made the IDE reindex constantly.
index b6f1391..2215983 100644 (file)
@@ -49,7 +49,6 @@ WARNING_CFLAGS = -Wglobal-constructors -Wno-newline-eof -Wno-inconsistent-missin
 SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
 
 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
-TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
 TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
 TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
 TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
index 634afb3..6c015c9 100644 (file)
@@ -7,7 +7,6 @@ ONLY_ACTIVE_ARCH = YES;
 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
 MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
 MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
 MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
index 58cd571..b9d7b6c 100644 (file)
@@ -1,3 +1,13 @@
+2017-07-01  Dan Bernstein  <mitz@apple.com>
+
+        [macOS] Remove code only needed when building for OS X Yosemite
+        https://bugs.webkit.org/show_bug.cgi?id=174067
+
+        Reviewed by Tim Horton.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+
 2017-06-27  Youenn Fablet  <youenn@apple.com>
 
         Update boringssl to c8ff30cbe716c72279a6f6a9d7d7d0d4091220fa
index f2c6a2a..0b6ccca 100644 (file)
@@ -50,7 +50,6 @@ SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx;
 VALID_ARCHS = $(ARCHS_STANDARD_64_BIT);
 
 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
-TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
 TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
 TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
 TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
index 882f12b..114b6f6 100644 (file)
@@ -7,7 +7,6 @@ ONLY_ACTIVE_ARCH = YES;
 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
 MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
 MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
 MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
index 785f765..a8eed54 100644 (file)
@@ -1,3 +1,17 @@
+2017-07-01  Dan Bernstein  <mitz@apple.com>
+
+        [macOS] Remove code only needed when building for OS X Yosemite
+        https://bugs.webkit.org/show_bug.cgi?id=174067
+
+        Reviewed by Tim Horton.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+        * wtf/Platform.h:
+        * wtf/mac/AppKitCompatibilityDeclarations.h:
+        * wtf/spi/cocoa/SecuritySPI.h:
+        * wtf/text/TextBreakIterator.cpp:
+
 2017-07-01  Joseph Pecoraro  <pecoraro@apple.com>
 
         Add a warning if WEBGL2 is enabled without WEBGL
index 4a7fbab..d109963 100644 (file)
@@ -88,7 +88,6 @@ WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wfo
 HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(DSTROOT)/usr/local/include icu $(HEADER_SEARCH_PATHS);
 
 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
-TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
 TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
 TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
 TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
index cdf3f71..58192a0 100644 (file)
@@ -29,7 +29,6 @@ ONLY_ACTIVE_ARCH = YES;
 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
 MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
 MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
 MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
index a49d409..3b05071 100644 (file)
 #define USE_PLUGIN_HOST_PROCESS 1
 #endif
 
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
-#define HAVE_NSSCROLLING_FILTERS 1
-#else
-#define HAVE_NSSCROLLING_FILTERS 0
-#endif
-
 /* OS X defines a series of platform macros for debugging. */
 /* Some of them are really annoying because they use common names (e.g. check()). */
 /* Disable those macros so that we are not limited in how we name methods and functions. */
 #define USE_INSERTION_UNDO_GROUPING 1
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || PLATFORM(IOS)
+#if PLATFORM(COCOA)
 #define HAVE_TIMINGDATAOPTIONS 1
 #endif
 
 #define USE_MEDIATOOLBOX 1
 #endif
 
-/* While 10.10 has support for fences, it is missing some API important for our integration of them. */
-#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
-#define HAVE_COREANIMATION_FENCES 1
-#endif
-
 /* FIXME: Enable USE_OS_LOG when building with the public iOS 10 SDK once we fix <rdar://problem/27758343>. */
 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000 && USE(APPLE_INTERNAL_SDK))
 #define USE_OS_LOG 1
index 94d3dee..bbeb391 100644 (file)
@@ -107,18 +107,6 @@ static const NSEventType NSEventTypeRightMouseUp = NSRightMouseUp;
 static const NSEventType NSEventTypeScrollWheel = NSScrollWheel;
 static const NSEventType NSEventTypeSystemDefined = NSSystemDefined;
 
-#if __MAC_OS_X_VERSION_MAX_ALLOWED < 101100
-static const NSTextAlignment NSTextAlignmentRight = NSRightTextAlignment;
-static const NSTextAlignment NSTextAlignmentCenter = NSCenterTextAlignment;
-static const NSTextAlignment NSTextAlignmentLeft = NSLeftTextAlignment;
-static const NSTextAlignment NSTextAlignmentNatural = NSNaturalTextAlignment;
-static const NSTextAlignment NSTextAlignmentJustified = NSJustifiedTextAlignment;
-
-typedef NSInteger NSWritingDirectionFormatType;
-static const NSWritingDirectionFormatType = NSTextWritingDirectionOverride;
-static const NSWritingDirectionEmbedding = NSTextWritingDirectionEmbedding;
-#endif
-
 typedef NSUInteger NSWindowStyleMask;
 static const NSWindowStyleMask NSWindowStyleMaskBorderless = NSBorderlessWindowMask;
 static const NSWindowStyleMask NSWindowStyleMaskClosable = NSClosableWindowMask;
index ca5bf12..375b9e2 100644 (file)
@@ -37,7 +37,6 @@
 
 #else
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || PLATFORM(IOS)
 typedef uint32_t SecSignatureHashAlgorithm;
 enum {
     kSecSignatureHashAlgorithmUnknown = 0,
@@ -56,7 +55,6 @@ WTF_EXTERN_C_BEGIN
 SecSignatureHashAlgorithm SecCertificateGetSignatureHashAlgorithm(SecCertificateRef);
 
 WTF_EXTERN_C_END
-#endif
 
 #endif
 
index 5c0f79c..e9ce9c3 100644 (file)
@@ -31,9 +31,6 @@
 #include <unicode/ubrk.h>
 #include <wtf/text/StringBuilder.h>
 
-// FIXME: This needs a better name
-#define ADDITIONAL_EMOJI_SUPPORT (PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100))
-
 namespace WTF {
 
 #if !PLATFORM(MAC) && !PLATFORM(IOS)
index 35e2d78..b31fb05 100644 (file)
@@ -1,3 +1,74 @@
+2017-07-01  Dan Bernstein  <mitz@apple.com>
+
+        [macOS] Remove code only needed when building for OS X Yosemite
+        https://bugs.webkit.org/show_bug.cgi?id=174067
+
+        Reviewed by Tim Horton.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+        * Configurations/FeatureDefines.xcconfig:
+        * Configurations/Version.xcconfig:
+        * accessibility/AXObjectCache.cpp:
+        (WebCore::AXObjectCache::setEnhancedUserInterfaceAccessibility):
+        * html/HTMLCanvasElement.cpp:
+        * page/WheelEventDeltaFilter.cpp:
+        (WebCore::WheelEventDeltaFilter::create):
+        * page/mac/WheelEventDeltaFilterMac.h:
+        * page/mac/WheelEventDeltaFilterMac.mm:
+        * page/scrolling/ScrollingMomentumCalculator.cpp:
+        * page/scrolling/mac/ScrollingMomentumCalculatorMac.h:
+        * page/scrolling/mac/ScrollingMomentumCalculatorMac.mm:
+        * platform/cocoa/NetworkExtensionContentFilter.mm:
+        (replacementDataFromDecisionInfo):
+        (WebCore::NetworkExtensionContentFilter::initialize):
+        (WebCore::NetworkExtensionContentFilter::willSendRequest):
+        (WebCore::NetworkExtensionContentFilter::responseReceived):
+        (WebCore::NetworkExtensionContentFilter::addData):
+        (WebCore::NetworkExtensionContentFilter::finishedAddingData):
+        (WebCore::NetworkExtensionContentFilter::unblockHandler):
+        * platform/graphics/ComplexTextController.h:
+        * platform/graphics/ca/cocoa/PlatformCAAnimationCocoa.mm:
+        (PlatformCAAnimationCocoa::setTimingFunction):
+        * platform/graphics/cocoa/FontCacheCoreText.cpp:
+        (WebCore::FontCache::platformAlternateFamilyName):
+        * platform/graphics/cocoa/FontCocoa.mm:
+        (WebCore::Font::platformInit):
+        * platform/graphics/cocoa/IOSurface.mm:
+        (WebCore::IOSurface::sinkIntoImage):
+        * platform/graphics/cocoa/WebGPULayer.mm:
+        (-[WebGPULayer initWithGPUDevice:]):
+        * platform/graphics/mac/ComplexTextControllerCoreText.mm:
+        (WebCore::ComplexTextController::ComplexTextRun::ComplexTextRun):
+        * platform/graphics/mac/WebGLLayer.mm:
+        (-[WebGLLayer initWithGraphicsContext3D:]):
+        * platform/mac/BlacklistUpdater.mm:
+        * platform/mac/PlatformScreenMac.mm:
+        (WebCore::screenSupportsExtendedColor):
+        * platform/mac/ValidationBubbleMac.mm:
+        (WebCore::ValidationBubble::ValidationBubble):
+        * platform/mac/WebGLBlacklist.mm:
+        (WebCore::WebGLBlacklist::create):
+        * platform/network/cocoa/WebCoreNSURLSession.h:
+        * platform/network/cocoa/WebCoreNSURLSession.mm:
+        * platform/network/mac/CertificateInfoMac.mm:
+        (WebCore::CertificateInfo::containsNonRootSHA1SignedCertificate):
+        * platform/network/mac/CookieJarMac.mm:
+        (WebCore::setCookiesFromDOM):
+        * platform/spi/cf/CFNetworkSPI.h:
+        * platform/spi/cg/CoreGraphicsSPI.h:
+        * platform/spi/cocoa/NEFilterSourceSPI.h:
+        * platform/spi/cocoa/NSURLConnectionSPI.h:
+        * platform/spi/cocoa/QuartzCoreSPI.h:
+        * platform/spi/mac/NSScrollingInputFilterSPI.h:
+        * platform/spi/mac/NSScrollingMomentumCalculatorSPI.h:
+        * platform/spi/mac/TUCallSPI.h:
+        * rendering/RenderThemeMac.mm:
+        (WebCore::RenderThemeMac::levelIndicatorFor):
+        * svg/SVGToOTFFontConversion.cpp:
+        (WebCore::SVGToOTFFontConverter::appendKERNTable):
+        (WebCore::SVGToOTFFontConverter::SVGToOTFFontConverter):
+
 2017-06-30  Said Abou-Hallawa  <sabouhallawa@apple.com>
 
         If an image appears more than once on a page, decoding for painting one instance repaints them all
index 8c03435..a934dcd 100644 (file)
@@ -78,7 +78,6 @@ GCC_WARN_UNUSED_VARIABLE = YES;
 WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough -Wno-unknown-warning-option;
 
 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
-TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
 TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
 TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
 TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
index aed3175..a0df8b8 100644 (file)
@@ -30,7 +30,6 @@ ONLY_ACTIVE_ARCH = YES;
 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
 MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
 MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
 MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
index 77ff8ac..9e56e68 100644 (file)
 // Set any ENABLE_FEATURE_NAME macro to an empty string to disable that feature.
 
 TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101000 = YES;
 TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101100 = YES;
 
 TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101000 = YES;
 TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101100 = YES;
 TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101200 = YES;
 
index a57a719..f086ddc 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_101000 = 10;
 SYSTEM_VERSION_PREFIX_macosx_101100 = 11;
 SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
 SYSTEM_VERSION_PREFIX_macosx_101300 = 13;
index c406dea..1d6a25c 100644 (file)
@@ -1,3 +1,15 @@
+2017-07-01  Dan Bernstein  <mitz@apple.com>
+
+        [macOS] Remove code only needed when building for OS X Yosemite
+        https://bugs.webkit.org/show_bug.cgi?id=174067
+
+        Reviewed by Tim Horton.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+        * Configurations/FeatureDefines.xcconfig:
+        * Configurations/Version.xcconfig:
+
 2017-06-29  Jer Noble  <jer.noble@apple.com>
 
         Make Legacy EME API controlled by RuntimeEnabled setting.
index 5fa7568..5703fd4 100644 (file)
@@ -78,7 +78,6 @@ GCC_WARN_UNUSED_VARIABLE = YES;
 WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough -Wno-unknown-warning-option;
 
 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
-TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
 TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
 TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
 TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
index 106bd09..b054b7d 100644 (file)
@@ -30,7 +30,6 @@ ONLY_ACTIVE_ARCH = YES;
 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
 MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
 MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
 MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
index 77ff8ac..9e56e68 100644 (file)
 // Set any ENABLE_FEATURE_NAME macro to an empty string to disable that feature.
 
 TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101000 = YES;
 TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101100 = YES;
 
 TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101000 = YES;
 TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101100 = YES;
 TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101200 = YES;
 
index 6336c0e..8dc92d3 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_101000 = 10;
 SYSTEM_VERSION_PREFIX_macosx_101100 = 11;
 SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
 SYSTEM_VERSION_PREFIX_macosx_101300 = 13;
index 2b75b45..4e2a2a4 100644 (file)
@@ -178,11 +178,9 @@ void AXObjectCache::setEnhancedUserInterfaceAccessibility(bool flag)
 {
     gAccessibilityEnhancedUserInterfaceEnabled = flag;
 #if PLATFORM(MAC)
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
     if (flag)
         enableAccessibility();
 #endif
-#endif
 }
 
 AXObjectCache::AXObjectCache(Document& document)
index d33527f..c75f307 100644 (file)
@@ -88,8 +88,6 @@ const int defaultHeight = 150;
 // in exchange for a smaller maximum canvas size. The maximum canvas size is in device pixels.
 #if PLATFORM(IOS)
 const unsigned maxCanvasArea = 4096 * 4096;
-#elif PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101100
-const unsigned maxCanvasArea = 8192 * 8192;
 #else
 const unsigned maxCanvasArea = 16384 * 16384;
 #endif
index e037fe9..2a60643 100644 (file)
 #include "config.h"
 #include "WheelEventDeltaFilter.h"
 
-#if HAVE(NSSCROLLING_FILTERS)
-#include "WheelEventDeltaFilterMac.h"
-#endif
-
 #include "FloatSize.h"
 #include "Logging.h"
 #include "TextStream.h"
 
+#if PLATFORM(MAC)
+#include "WheelEventDeltaFilterMac.h"
+#endif
+
 namespace WebCore {
     
 WheelEventDeltaFilter::WheelEventDeltaFilter()
@@ -46,7 +46,7 @@ WheelEventDeltaFilter::~WheelEventDeltaFilter()
 
 std::unique_ptr<WheelEventDeltaFilter> WheelEventDeltaFilter::create()
 {
-#if HAVE(NSSCROLLING_FILTERS)
+#if PLATFORM(MAC)
     return std::make_unique<WheelEventDeltaFilterMac>();
 #else
     return std::make_unique<BasicWheelEventDeltaFilter>();
index 44d6a4b..0193569 100644 (file)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+#if PLATFORM(MAC)
 
 #include "WheelEventDeltaFilter.h"
 #include <wtf/RetainPtr.h>
@@ -49,4 +49,4 @@ private:
 
 } // namespace WebCore
 
-#endif // PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+#endif // PLATFORM(MAC)
index eb7a11c..60e60ec 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "config.h"
 
-#if HAVE(NSSCROLLING_FILTERS)
+#if PLATFORM(MAC)
 
 #include "WheelEventDeltaFilterMac.h"
 #include "FloatPoint.h"
@@ -69,4 +69,4 @@ void WheelEventDeltaFilterMac::endFilteringDeltas()
 
 }
 
-#endif /* HAVE(NSSCROLLING_FILTERS) */
+#endif /* PLATFORM(MAC) */
index 1fa5674..7640d55 100644 (file)
@@ -67,7 +67,7 @@ FloatSize ScrollingMomentumCalculator::predictedDestinationOffset()
     return { initialOffsetX, initialOffsetY };
 }
 
-#if !HAVE(NSSCROLLING_FILTERS)
+#if !PLATFORM(MAC)
 
 std::unique_ptr<ScrollingMomentumCalculator> ScrollingMomentumCalculator::create(const FloatSize& viewportSize, const FloatSize& contentSize, const FloatPoint& initialOffset, const FloatSize& initialDelta, const FloatSize& initialVelocity)
 {
index c90503c..89f336b 100644 (file)
@@ -28,8 +28,6 @@
 #include "ScrollingMomentumCalculator.h"
 #include <wtf/RetainPtr.h>
 
-#if HAVE(NSSCROLLING_FILTERS)
-
 @class _NSScrollingMomentumCalculator;
 
 namespace WebCore {
@@ -52,5 +50,3 @@ private:
 };
 
 } // namespace WebCore
-
-#endif // HAVE(NSSCROLLING_FILTERS)
index 1f851dd..66b2e9f 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "ScrollingMomentumCalculatorMac.h"
 
-#if HAVE(NSSCROLLING_FILTERS)
+#if PLATFORM(MAC)
 
 #include "NSScrollingMomentumCalculatorSPI.h"
 
@@ -105,4 +105,4 @@ _NSScrollingMomentumCalculator *ScrollingMomentumCalculatorMac::ensurePlatformMo
 
 } // namespace WebCore
 
-#endif // HAVE(NSSCROLLING_FILTERS)
+#endif // PLATFORM(MAC)
index 7a5bb9c..9a75fd2 100644 (file)
@@ -47,13 +47,11 @@ SOFT_LINK_CLASS_OPTIONAL(NetworkExtension, NEFilterSource);
 - (void)setSourceAppPid:(pid_t)sourceAppPid;
 @end
 
-#if HAVE(MODERN_NE_FILTER_SOURCE)
 static inline NSData *replacementDataFromDecisionInfo(NSDictionary *decisionInfo)
 {
     ASSERT_WITH_SECURITY_IMPLICATION(!decisionInfo || [decisionInfo isKindOfClass:[NSDictionary class]]);
     return decisionInfo[NEFilterSourceOptionsPageData];
 }
-#endif
 
 namespace WebCore {
 
@@ -76,7 +74,6 @@ void NetworkExtensionContentFilter::initialize(const URL* url)
     ASSERT(!m_neFilterSource);
     m_queue = adoptOSObject(dispatch_queue_create("WebKit NetworkExtension Filtering", DISPATCH_QUEUE_SERIAL));
     m_semaphore = adoptOSObject(dispatch_semaphore_create(0));
-#if HAVE(MODERN_NE_FILTER_SOURCE)
     ASSERT_UNUSED(url, !url);
     m_neFilterSource = adoptNS([allocNEFilterSourceInstance() initWithDecisionQueue:m_queue.get()]);
 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
@@ -85,15 +82,10 @@ void NetworkExtensionContentFilter::initialize(const URL* url)
     if ([m_neFilterSource respondsToSelector:@selector(setSourceAppPid:)])
         [m_neFilterSource setSourceAppPid:presentingApplicationPID()];
 #endif
-#else
-    ASSERT_ARG(url, url);
-    m_neFilterSource = adoptNS([allocNEFilterSourceInstance() initWithURL:*url direction:NEFilterSourceDirectionInbound socketIdentifier:0]);
-#endif
 }
 
 void NetworkExtensionContentFilter::willSendRequest(ResourceRequest& request, const ResourceResponse& redirectResponse)
 {
-#if HAVE(MODERN_NE_FILTER_SOURCE)
     ASSERT(!request.isNull());
     if (!request.url().protocolIsInHTTPFamily() || !enabled()) {
         m_state = State::Allowed;
@@ -130,10 +122,6 @@ void NetworkExtensionContentFilter::willSendRequest(ResourceRequest& request, co
     }
 
     request.setURL(modifiedRequestURL);
-#else
-    UNUSED_PARAM(request);
-    UNUSED_PARAM(redirectResponse);
-#endif
 }
 
 void NetworkExtensionContentFilter::responseReceived(const ResourceResponse& response)
@@ -143,14 +131,6 @@ void NetworkExtensionContentFilter::responseReceived(const ResourceResponse& res
         return;
     }
 
-#if !HAVE(MODERN_NE_FILTER_SOURCE)
-    if (!enabled()) {
-        m_state = State::Allowed;
-        return;
-    }
-
-    initialize(&response.url());
-#else
     [m_neFilterSource receivedResponse:response.nsURLResponse() decisionHandler:[this](NEFilterSourceStatus status, NSDictionary *decisionInfo) {
         handleDecision(status, replacementDataFromDecisionInfo(decisionInfo));
     }];
@@ -159,23 +139,15 @@ void NetworkExtensionContentFilter::responseReceived(const ResourceResponse& res
     // blocked/not blocked answer from the filter immediately after calling
     // addData(). We should find a way to make this asynchronous.
     dispatch_semaphore_wait(m_semaphore.get(), DISPATCH_TIME_FOREVER);
-#endif
 }
 
 void NetworkExtensionContentFilter::addData(const char* data, int length)
 {
     RetainPtr<NSData> copiedData { [NSData dataWithBytes:(void*)data length:length] };
 
-#if HAVE(MODERN_NE_FILTER_SOURCE)
     [m_neFilterSource receivedData:copiedData.get() decisionHandler:[this](NEFilterSourceStatus status, NSDictionary *decisionInfo) {
         handleDecision(status, replacementDataFromDecisionInfo(decisionInfo));
     }];
-#else
-    [m_neFilterSource addData:copiedData.get() withCompletionQueue:m_queue.get() completionHandler:[this](NEFilterSourceStatus status, NSData *replacementData) {
-        ASSERT(!replacementData);
-        handleDecision(status, replacementData);
-    }];
-#endif
 
     // FIXME: We have to block here since DocumentLoader expects to have a
     // blocked/not blocked answer from the filter immediately after calling
@@ -185,16 +157,9 @@ void NetworkExtensionContentFilter::addData(const char* data, int length)
 
 void NetworkExtensionContentFilter::finishedAddingData()
 {
-#if HAVE(MODERN_NE_FILTER_SOURCE)
     [m_neFilterSource finishedLoadingWithDecisionHandler:[this](NEFilterSourceStatus status, NSDictionary *decisionInfo) {
         handleDecision(status, replacementDataFromDecisionInfo(decisionInfo));
     }];
-#else
-    [m_neFilterSource dataCompleteWithCompletionQueue:m_queue.get() completionHandler:[this](NEFilterSourceStatus status, NSData *replacementData) {
-        ASSERT(!replacementData);
-        handleDecision(status, replacementData);
-    }];
-#endif
 
     // FIXME: We have to block here since DocumentLoader expects to have a
     // blocked/not blocked answer from the filter immediately after calling
@@ -211,7 +176,6 @@ Ref<SharedBuffer> NetworkExtensionContentFilter::replacementData() const
 #if ENABLE(CONTENT_FILTERING)
 ContentFilterUnblockHandler NetworkExtensionContentFilter::unblockHandler() const
 {
-#if HAVE(MODERN_NE_FILTER_SOURCE)
     using DecisionHandlerFunction = ContentFilterUnblockHandler::DecisionHandlerFunction;
 
     RetainPtr<NEFilterSource> neFilterSource { m_neFilterSource };
@@ -223,9 +187,6 @@ ContentFilterUnblockHandler NetworkExtensionContentFilter::unblockHandler() cons
             }];
         }
     };
-#else
-    return { };
-#endif
 }
 #endif
 
index 169d891..b2c151f 100644 (file)
@@ -32,8 +32,6 @@
 #include <wtf/Vector.h>
 #include <wtf/text/WTFString.h>
 
-#define USE_LAYOUT_SPECIFIC_ADVANCES ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000))
-
 typedef unsigned short CGGlyph;
 
 typedef const struct __CTRun * CTRunRef;
index 661cd41..345ed96 100644 (file)
@@ -329,11 +329,7 @@ void PlatformCAAnimationCocoa::setTimingFunction(const TimingFunction* value, bo
             springAnimation.mass = function.mass();
             springAnimation.stiffness = function.stiffness();
             springAnimation.damping = function.damping();
-#if PLATFORM(IOS) || PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
             springAnimation.initialVelocity = function.initialVelocity();
-#else
-            springAnimation.velocity = function.initialVelocity();
-#endif
         }
         break;
     }
index 2231fe2..19dc223 100644 (file)
@@ -1357,13 +1357,8 @@ const AtomicString& FontCache::platformAlternateFamilyName(const AtomicString& f
 
     static NeverDestroyed<AtomicString> songtiSC("Songti SC", AtomicString::ConstructFromLiteral);
     static NeverDestroyed<AtomicString> songtiTC("Songti TC", AtomicString::ConstructFromLiteral);
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101100
-    static NeverDestroyed<AtomicString> heitiSCReplacement("Heiti SC", AtomicString::ConstructFromLiteral);
-    static NeverDestroyed<AtomicString> heitiTCReplacement("Heiti TC", AtomicString::ConstructFromLiteral);
-#else
     static NeverDestroyed<AtomicString> heitiSCReplacement("PingFang SC", AtomicString::ConstructFromLiteral);
     static NeverDestroyed<AtomicString> heitiTCReplacement("PingFang TC", AtomicString::ConstructFromLiteral);
-#endif
 
     switch (familyName.length()) {
     case 2:
@@ -1392,12 +1387,6 @@ const AtomicString& FontCache::platformAlternateFamilyName(const AtomicString& f
         if (equalIgnoringASCIICase(familyName, "\\5b8b\\4f53"))
             return songtiSC;
         break;
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101100
-    case 15:
-        if (equalLettersIgnoringASCIICase(familyName, "microsoft yahei"))
-            return heitiSCReplacement;
-        break;
-#endif
     case 18:
         if (equalLettersIgnoringASCIICase(familyName, "microsoft jhenghei"))
             return heitiTCReplacement;
index ac948b7..73e524b 100644 (file)
@@ -123,13 +123,6 @@ void Font::platformInit()
     m_syntheticBoldOffset = m_platformData.syntheticBold() ? 1.0f : 0.f;
 #endif
 
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101100
-    // Work around <rdar://problem/19433490>
-    CGGlyph dummyGlyphs[] = {0, 0};
-    CGSize dummySize[] = { CGSizeMake(0, 0), CGSizeMake(0, 0) };
-    CTFontTransformGlyphs(m_platformData.ctFont(), dummyGlyphs, dummySize, 2, kCTFontTransformApplyPositioning | kCTFontTransformApplyShaping);
-#endif
-
     unsigned unitsPerEm = CTFontGetUnitsPerEm(m_platformData.font());
     float pointSize = m_platformData.size();
     CGFloat capHeight = pointSize ? CTFontGetCapHeight(m_platformData.font()) : 0;
index 49d046e..376927c 100644 (file)
@@ -253,7 +253,7 @@ RetainPtr<CGImageRef> WebCore::IOSurface::createImage()
 
 RetainPtr<CGImageRef> WebCore::IOSurface::sinkIntoImage(std::unique_ptr<IOSurface> surface)
 {
-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
+#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000) || PLATFORM(MAC)
     return adoptCF(CGIOSurfaceContextCreateImageReference(surface->ensurePlatformContext()));
 #else
     return surface->createImage();
index 38c8e86..5c3557f 100644 (file)
@@ -50,10 +50,7 @@ using namespace WebCore;
 
 #if PLATFORM(MAC)
     self.contentsScale = _devicePixelRatio;
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
-    if ([self respondsToSelector:@selector(setColorspace:)])
-        [self setColorspace:sRGBColorSpaceRef()];
-#endif
+    self.colorspace = sRGBColorSpaceRef();
 #endif
     return self;
 }
index 7228550..ea813a9 100644 (file)
@@ -132,7 +132,6 @@ ComplexTextController::ComplexTextRun::ComplexTextRun(CTRunRef ctRun, const Font
     for (unsigned i = 0; i < m_glyphCount; ++i)
         m_glyphs.uncheckedAppend(glyphsPtr[i]);
 
-#if USE_LAYOUT_SPECIFIC_ADVANCES
     if (CTRunGetStatus(ctRun) & kCTRunStatusHasOrigins) {
         Vector<CGSize> baseAdvances(m_glyphCount);
         Vector<CGPoint> glyphOrigins(m_glyphCount);
@@ -143,9 +142,7 @@ ComplexTextController::ComplexTextRun::ComplexTextRun(CTRunRef ctRun, const Font
             m_baseAdvances.uncheckedAppend(baseAdvances[i]);
             m_glyphOrigins.uncheckedAppend(glyphOrigins[i]);
         }
-    } else
-#endif
-    {
+    } else {
         const CGSize* baseAdvances = CTRunGetAdvancesPtr(ctRun);
         Vector<CGSize> baseAdvancesVector;
         if (!baseAdvances) {
index 47e6d4d..6650884 100644 (file)
@@ -55,10 +55,8 @@ using namespace WebCore;
     _devicePixelRatio = context->getContextAttributes().devicePixelRatio;
 #if PLATFORM(MAC)
     self.contentsScale = _devicePixelRatio;
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
     self.colorspace = sRGBColorSpaceRef();
 #endif
-#endif
     return self;
 }
 
index de738c1..940f829 100644 (file)
@@ -43,11 +43,7 @@ const time_t blacklistCheckTimeInterval = 60 * 10;
 // The time when we last re-parsed the blacklist file.
 static time_t blacklistUpdateTime;
 
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
 NSString * const blacklistPath = @"/System/Library/CoreServices/XProtect.bundle/Contents/Resources/XProtect.meta.plist";
-#else
-NSString * const blacklistPath = @"/System/Library/CoreServices/CoreTypes.bundle/Contents/Resources/XProtect.meta.plist";
-#endif
 
 namespace WebCore {
 
index c9f11aa..5779471 100644 (file)
@@ -136,10 +136,6 @@ NSScreen *screen(PlatformDisplayID displayID)
 
 bool screenSupportsExtendedColor(Widget* widget)
 {
-#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101100
-    UNUSED_PARAM(widget);
-    return false;
-#else
     if (!widget)
         return false;
 
@@ -151,7 +147,6 @@ bool screenSupportsExtendedColor(Widget* widget)
     auto profile = adoptCF(ColorSyncProfileCreate(iccData.get(), nullptr));
     return profile && ColorSyncProfileIsWideGamut(profile.get());
 #endif
-#endif
 }
 
 FloatRect toUserSpace(const NSRect& rect, NSWindow *destination)
index 71c724f..4f630fc 100644 (file)
@@ -66,9 +66,7 @@ ValidationBubble::ValidationBubble(NSView* view, const String& message, const Se
     [label setStringValue:message];
     m_fontSize = std::max(settings.minimumFontSize, 13.0);
     [label setFont:[NSFont systemFontOfSize:m_fontSize]];
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
     [label setMaximumNumberOfLines:4];
-#endif
     [[label cell] setTruncatesLastVisibleLine:YES];
     [popoverView addSubview:label.get()];
     NSSize labelSize = [label sizeThatFits:NSMakeSize(maxLabelWidth, CGFLOAT_MAX)];
index f868f81..6724bcf 100644 (file)
@@ -200,9 +200,7 @@ std::unique_ptr<WebGLBlacklist> WebGLBlacklist::create(NSDictionary *propertyLis
     GLint rendererId = 0;
     CGLGetParameter(ctx, kCGLCPCurrentRendererID, &rendererId);
     GLint supportsSeparateAddressSpace = 0;
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
     CGLGetParameter(ctx, kCGLCPSupportSeparateAddressSpace, &supportsSeparateAddressSpace);
-#endif
     CGLDestroyContext(ctx);
     CGLReleasePixelFormat(pix);
 
index 7cf1e66..9873bc3 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef WebCoreNSURLSession_h
 #define WebCoreNSURLSession_h
 
-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
-
 #import <Foundation/NSURLSession.h>
 #import <wtf/HashSet.h>
 #import <wtf/Lock.h>
@@ -142,6 +140,4 @@ WEBCORE_EXPORT @interface WebCoreNSURLSession : NSObject {
 
 NS_ASSUME_NONNULL_END
 
-#endif // PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
-
 #endif
index 65b9328..41cb090 100644 (file)
@@ -26,8 +26,6 @@
 #import "config.h"
 #import "WebCoreNSURLSession.h"
 
-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
-
 #import "CachedResourceRequest.h"
 #import "PlatformMediaResourceLoader.h"
 #import "SubresourceLoader.h"
@@ -659,5 +657,3 @@ void WebCoreNSURLSessionDataTaskClient::loadFinished(PlatformMediaResource& reso
     [self _resource:resource loadFinishedWithError:nil];
 }
 @end
-
-#endif // PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
index f652737..e6bad6e 100644 (file)
@@ -81,7 +81,6 @@ bool CertificateInfo::containsNonRootSHA1SignedCertificate() const
     }
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || PLATFORM(IOS)
     if (m_certificateChain) {
         // Allow only the root certificate (the last in the chain) to be SHA1.
         for (CFIndex i = 0, size = CFArrayGetCount(m_certificateChain.get()) - 1; i < size; ++i) {
@@ -91,9 +90,6 @@ bool CertificateInfo::containsNonRootSHA1SignedCertificate() const
         }
         return false;
     }
-#else
-    notImplemented();
-#endif
 
     return false;
 }
index f12b8f1..5fdd1c1 100644 (file)
@@ -187,7 +187,7 @@ void setCookiesFromDOM(const NetworkStorageSession& session, const URL& firstPar
     NSURL *cookieURL = url;
     NSDictionary *headerFields = [NSDictionary dictionaryWithObject:cookieString forKey:@"Set-Cookie"];
 
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+#if PLATFORM(MAC)
     NSArray *unfilteredCookies = [NSHTTPCookie _parsedCookiesWithResponseHeaderFields:headerFields forURL:cookieURL];
 #else
     NSArray *unfilteredCookies = [NSHTTPCookie cookiesWithResponseHeaderFields:headerFields forURL:cookieURL];
index 73dfe3d..a0cbe04 100644 (file)
@@ -117,7 +117,6 @@ typedef void (^CFCachedURLResponseCallBackBlock)(CFCachedURLResponseRef);
 - (CFHTTPCookieRef)_CFHTTPCookie;
 @end
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)
 @interface NSURLSessionConfiguration ()
 @property (assign) _TimingDataOptions _timingDataOptions;
 @property (copy) NSData *_sourceApplicationAuditTokenData;
@@ -128,7 +127,6 @@ typedef void (^CFCachedURLResponseCallBackBlock)(CFCachedURLResponseRef);
 @property (nullable, copy) NSString *_CTDataConnectionServiceType;
 #endif
 @end
-#endif
 
 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
 @interface NSURLSessionTaskTransactionMetrics ()
@@ -245,27 +243,23 @@ enum : NSUInteger {
 
 WTF_EXTERN_C_BEGIN
 
-#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
 CFDataRef _CFNetworkCopyATSContext(void);
 Boolean _CFNetworkSetATSContext(CFDataRef);
-#endif
 
 #if PLATFORM(COCOA)
 void _CFNetworkResetHSTSHostsSinceDate(CFURLStorageSessionRef, CFDateRef);
 #endif
 
-#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
 CFDataRef CFHTTPCookieStorageCreateIdentifyingData(CFAllocatorRef inAllocator, CFHTTPCookieStorageRef inStorage);
 CFHTTPCookieStorageRef CFHTTPCookieStorageCreateFromIdentifyingData(CFAllocatorRef inAllocator, CFDataRef inData);
 CFArrayRef _CFHTTPParsedCookiesWithResponseHeaderFields(CFAllocatorRef inAllocator, CFDictionaryRef headerFields, CFURLRef inURL);
-#endif
 
 WTF_EXTERN_C_END
 
 #if defined(__OBJC__)
 
 @interface NSHTTPCookie ()
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+#if PLATFORM(MAC)
 + (NSArray *)_parsedCookiesWithResponseHeaderFields:(NSDictionary *)headerFields forURL:(NSURL *)aURL;
 #endif
 + (NSArray *)_cf2nsCookies:(CFArrayRef)cfCookies;
@@ -281,11 +275,9 @@ WTF_EXTERN_C_END
 #endif
 
 // FIXME: Move +_setSharedHTTPCookieStorage: into the above section under !USE(APPLE_INTERNAL_SDK) when possible (soon).
-#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
 @interface NSHTTPCookieStorage ()
 + (void)_setSharedHTTPCookieStorage:(NSHTTPCookieStorage *)storage;
 @end
-#endif
 
 @interface NSURLResponse ()
 - (void)_setMIMEType:(NSString *)type;
index fc80741..352dd64 100644 (file)
@@ -104,7 +104,7 @@ typedef uint32_t CGFontRenderingStyle;
 enum {
     kCGFontAntialiasingStyleUnfiltered = 0 << 7,
     kCGFontAntialiasingStyleFilterLight = 1 << 7,
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+#if PLATFORM(MAC)
     kCGFontAntialiasingStyleUnfilteredCustomDilation = (8 << 7),
 #endif
 };
index 174ab65..f8bd9f0 100644 (file)
@@ -23,8 +23,6 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#define HAVE_MODERN_NE_FILTER_SOURCE (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || PLATFORM(IOS)
-
 #if USE(APPLE_INTERNAL_SDK)
 
 #import <NetworkExtension/NEFilterSource.h>
@@ -59,8 +57,6 @@ typedef NS_ENUM(NSInteger, NEFilterSourceDirection) {
 @property (readonly) uint64_t socketIdentifier;
 @end
 
-#if HAVE(MODERN_NE_FILTER_SOURCE)
-
 #define NEFilterSourceOptionsPageData @"PageData"
 #define NEFilterSourceOptionsRedirectURL @"RedirectURL"
 
@@ -79,6 +75,4 @@ typedef void (^NEFilterSourceDecisionHandler)(NEFilterSourceStatus, NSDictionary
 #endif
 @end
 
-#endif
-
 #endif // !USE(APPLE_INTERNAL_SDK)
index 2c66c5a..8ec4160 100644 (file)
@@ -39,10 +39,6 @@ typedef NSUInteger TimingDataCollection;
 @interface NSURLConnection ()
 + (CFRunLoopRef)resourceLoaderRunLoop;
 - (void)setDefersCallbacks:(BOOL)defers;
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101100
-+ (void)_setCollectsTimingData:(BOOL)collect;
-+ (void)_collectTimingDataWithOptions:(TimingDataCollection)options;
-#endif
 - (NSDictionary *)_timingData;
 @end
 
index ab6e35c..6565c4f 100644 (file)
@@ -124,7 +124,6 @@ typedef struct CAColorMatrix CAColorMatrix;
 @property (copy) NSString *name;
 @end
 
-#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
 typedef enum {
     kCATransactionPhasePreLayout,
     kCATransactionPhasePreCommit,
@@ -134,26 +133,15 @@ typedef enum {
 @interface CATransaction ()
 + (void)addCommitHandler:(void(^)(void))block forPhase:(CATransactionPhase)phase;
 @end
-#endif
 
 @interface CALayerHost : CALayer
 @property uint32_t contextId;
 @property BOOL inheritsSecurity;
 @end
 
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101100
-@interface CASpringAnimation : CABasicAnimation 
-@property CGFloat mass;
-@property CGFloat stiffness;
-@property CGFloat damping;
-@property CGFloat velocity;
-@property CGFloat initialVelocity;
-@end
-#else
 @interface CASpringAnimation (Private)
 @property CGFloat velocity;
 @end
-#endif
 
 #endif // __OBJC__
 
index 83162a2..a035e17 100644 (file)
@@ -23,7 +23,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+#if PLATFORM(MAC)
 
 #if USE(APPLE_INTERNAL_SDK)
 
@@ -38,4 +38,4 @@
 
 #endif /* USE(APPLE_INTERNAL_SDK) */
 
-#endif /* PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100 */
+#endif /* PLATFORM(MAC) */
index 16487bf..1e3b6e6 100644 (file)
@@ -23,8 +23,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if HAVE(NSSCROLLING_FILTERS)
-
 #if USE(APPLE_INTERNAL_SDK)
 
 #import <AppKit/NSScrollingMomentumCalculator_Private.h>
@@ -45,5 +43,3 @@
 @end
 
 #endif /* USE(APPLE_INTERNAL_SDK) */
-
-#endif /* HAVE(NSSCROLLING_FILTERS) */
index 61799a1..9b0f882 100644 (file)
@@ -23,8 +23,6 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
-
 #import "SoftLinking.h"
 #import <objc/runtime.h>
 
@@ -37,5 +35,3 @@
 
 SOFT_LINK_PRIVATE_FRAMEWORK_OPTIONAL(TelephonyUtilities)
 SOFT_LINK_CLASS(TelephonyUtilities, TUCall)
-
-#endif
index b02871c..16498ad 100644 (file)
@@ -1074,12 +1074,7 @@ NSLevelIndicatorCell* RenderThemeMac::levelIndicatorFor(const RenderMeter& rende
     }
 
     [cell setLevelIndicatorStyle:levelIndicatorStyleFor(style.appearance())];
-    // FIXME: Remove the call to setBaseWritingDirection once __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100 is always true.
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
-    [cell setUserInterfaceLayoutDirection: style.isLeftToRightDirection() ? NSUserInterfaceLayoutDirectionLeftToRight : NSUserInterfaceLayoutDirectionRightToLeft];
-#else
-    [cell setBaseWritingDirection:style.isLeftToRightDirection() ? NSWritingDirectionLeftToRight : NSWritingDirectionRightToLeft];
-#endif
+    [cell setUserInterfaceLayoutDirection:style.isLeftToRightDirection() ? NSUserInterfaceLayoutDirectionLeftToRight : NSUserInterfaceLayoutDirectionRightToLeft];
     [cell setMinValue:element->min()];
     [cell setMaxValue:element->max()];
     [cell setObjectValue:@(value)];
index 32710ea..70fec3e 100644 (file)
@@ -1123,12 +1123,6 @@ void SVGToOTFFontConverter::appendKERNTable()
     ASSERT_UNUSED(sizeOfHorizontalSubtable, subtablesOffset + sizeOfHorizontalSubtable == m_result.size());
     size_t sizeOfVerticalSubtable = appendKERNSubtable<SVGVKernElement>(&SVGVKernElement::buildVerticalKerningPair, 0);
     ASSERT_UNUSED(sizeOfVerticalSubtable, subtablesOffset + sizeOfHorizontalSubtable + sizeOfVerticalSubtable == m_result.size());
-
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
-    // Work around a bug in Apple's font parser by adding some padding bytes. <rdar://problem/18401901>
-    for (int i = 0; i < 6; ++i)
-        m_result.append(0);
-#endif
 }
 
 template <typename V>
@@ -1438,12 +1432,6 @@ SVGToOTFFontConverter::SVGToOTFFontConverter(const SVGFontElement& fontElement)
 
     m_boundingBox = boundingBox.value_or(FloatRect());
 
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
-    // <rdar://problem/20086223> Cocoa has a bug where glyph bounding boxes are not correctly respected for frustum culling. Work around this by
-    // inflating the font's bounding box
-    m_boundingBox.extend(FloatPoint(0, 0));
-#endif
-
     appendLigatureGlyphs();
 
     if (m_glyphs.size() > std::numeric_limits<Glyph>::max()) {
index 25f0c67..0c523b5 100644 (file)
@@ -1,3 +1,14 @@
+2017-07-01  Dan Bernstein  <mitz@apple.com>
+
+        [macOS] Remove code only needed when building for OS X Yosemite
+        https://bugs.webkit.org/show_bug.cgi?id=174067
+
+        Reviewed by Tim Horton.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+        * Configurations/Version.xcconfig:
+
 2017-06-30  Joseph Pecoraro  <pecoraro@apple.com>
 
         Web Inspector: Type token background color in debugger looks poor
index e4e7863..13f79bf 100644 (file)
@@ -56,7 +56,6 @@ ENGINEERING_BUILD_DEFINES_1 = ENGINEERING_BUILD=1;
 SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx tvos tvsimulator watchos watchsimulator;
 
 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
-TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
 TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
 TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
 TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
index 332a01e..9a8543f 100644 (file)
@@ -7,7 +7,6 @@ ONLY_ACTIVE_ARCH = YES;
 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
 MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
 MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
 MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
index b6e5e37..b1c7fcc 100644 (file)
@@ -8,7 +8,6 @@ FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);
 // 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_101000 = 10;
 SYSTEM_VERSION_PREFIX_macosx_101100 = 11;
 SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
 SYSTEM_VERSION_PREFIX_macosx_101300 = 13;
index 48716b0..04a2192 100644 (file)
@@ -1,3 +1,24 @@
+2017-07-01  Dan Bernstein  <mitz@apple.com>
+
+        [macOS] Remove code only needed when building for OS X Yosemite
+        https://bugs.webkit.org/show_bug.cgi?id=174067
+
+        Reviewed by Tim Horton.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+        * Configurations/FeatureDefines.xcconfig:
+        * Configurations/Version.xcconfig:
+        * Plugins/WebBasePluginPackage.mm:
+        (-[WebBasePluginPackage getPluginInfoFromPLists]):
+        * WebCoreSupport/PopupMenuMac.mm:
+        (PopupMenuMac::show):
+        * WebCoreSupport/WebInspectorClient.mm:
+        (WebInspectorFrontendClient::startWindowDrag):
+        (-[WebInspectorWindowController window]):
+        * WebView/WebView.mm:
+        (-[WebView _animationControllerForDictionaryLookupPopupInfo:]):
+
 2017-06-30  Daniel Bates  <dabates@apple.com>
 
         API::FrameInfo should know the web page that contains the frame; add API property webView to WKFrameInfo
index eae7d2f..cd87842 100644 (file)
@@ -79,7 +79,6 @@ PREBINDING = NO;
 WARNING_CFLAGS = -Wall -Wextra -Wchar-subscripts -Wextra-tokens -Wformat-security -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wno-unused-parameter -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough;
 
 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
-TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
 TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
 TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
 TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
index 0786d74..7c9d559 100644 (file)
@@ -30,7 +30,6 @@ ONLY_ACTIVE_ARCH = YES;
 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
 MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
 MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
 MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
@@ -42,7 +41,6 @@ DEBUG_INFORMATION_FORMAT = dwarf;
 WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphoneos*] = WebKitSystemInterfaceIOSDevice$(WK_TARGET_IOS_VERSION_MAJOR);
 WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphonesimulator*] = WebKitSystemInterfaceIOSSimulator$(WK_TARGET_IOS_VERSION_MAJOR);
 WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=macosx*] = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000 = WebKitSystemInterfaceYosemite;
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101100 = WebKitSystemInterfaceElCapitan;
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101200 = WebKitSystemInterfaceOSX10.12;
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101300 = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101200);
index 77ff8ac..9e56e68 100644 (file)
 // Set any ENABLE_FEATURE_NAME macro to an empty string to disable that feature.
 
 TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101000 = YES;
 TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101100 = YES;
 
 TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101000 = YES;
 TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101100 = YES;
 TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101200 = YES;
 
index a57a719..f086ddc 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_101000 = 10;
 SYSTEM_VERSION_PREFIX_macosx_101100 = 11;
 SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
 SYSTEM_VERSION_PREFIX_macosx_101300 = 13;
index f03e93a..fd67437 100644 (file)
@@ -142,32 +142,9 @@ using namespace WebCore;
     if (!cfBundle)
         return NO;
     
-    NSDictionary *MIMETypes = nil;
-
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
-    NSString *pListFilename = [self _objectForInfoDictionaryKey:WebPluginMIMETypesFilenameKey];
-    
-    // Check if the MIME types are claimed in a plist in the user's preferences directory.
-    if (pListFilename) {
-        NSString *pListPath = [NSString stringWithFormat:@"%@/Library/Preferences/%@", NSHomeDirectory(), pListFilename];
-        NSDictionary *pList = [self pListForPath:pListPath createFile:NO];
-        if (pList) {
-            // If the plist isn't localized, have the plug-in recreate it in the preferred language.
-            NSString *localizationName = [pList objectForKey:WebPluginLocalizationNameKey];
-            if (![localizationName isEqualToString:preferredBundleLocalizationName()])
-                pList = [self pListForPath:pListPath createFile:YES];
-            MIMETypes = [pList objectForKey:WebPluginMIMETypesKey];
-        } else
-            // Plist doesn't exist, ask the plug-in to create it.
-            MIMETypes = [[self pListForPath:pListPath createFile:YES] objectForKey:WebPluginMIMETypesKey];
-    }
-#endif
-
-    if (!MIMETypes) {
-        MIMETypes = [self _objectForInfoDictionaryKey:WebPluginMIMETypesKey];
-        if (!MIMETypes)
-            return NO;
-    }
+    NSDictionary *MIMETypes = [self _objectForInfoDictionaryKey:WebPluginMIMETypesKey];
+    if (!MIMETypes)
+        return NO;
 
     NSEnumerator *keyEnumerator = [MIMETypes keyEnumerator];
     NSDictionary *MIMEDictionary;
index 14c5f90..cc5f81d 100644 (file)
@@ -149,9 +149,7 @@ void PopupMenuMac::show(const IntRect& r, FrameView* v, int index)
     [m_popup setUserInterfaceLayoutDirection:textDirection == LTR ? NSUserInterfaceLayoutDirectionLeftToRight : NSUserInterfaceLayoutDirectionRightToLeft];
 
     NSMenu *menu = [m_popup menu];
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
     [menu setUserInterfaceLayoutDirection:textDirection == LTR ? NSUserInterfaceLayoutDirectionLeftToRight : NSUserInterfaceLayoutDirectionRightToLeft];
-#endif
 
     NSPoint location;
     CTFontRef font = m_client->menuStyle().font().primaryFont().getCTFont();
index 54dc27f..8ce063e 100644 (file)
@@ -218,9 +218,7 @@ void WebInspectorFrontendClient::frontendLoaded()
 
 void WebInspectorFrontendClient::startWindowDrag()
 {
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
     [[m_frontendWindowController window] performWindowDragWithEvent:[NSApp currentEvent]];
-#endif
 }
 
 String WebInspectorFrontendClient::localizedStringsURL()
@@ -473,12 +471,10 @@ void WebInspectorFrontendClient::append(const String& suggestedURL, const String
     [window setMinSize:NSMakeSize(minimumWindowWidth, minimumWindowHeight)];
     [window setCollectionBehavior:([window collectionBehavior] | NSWindowCollectionBehaviorFullScreenPrimary)];
 
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
     CGFloat approximatelyHalfScreenSize = (window.screen.frame.size.width / 2) - 4;
     CGFloat minimumFullScreenWidth = std::max<CGFloat>(636, approximatelyHalfScreenSize);
     [window setMinFullScreenContentSize:NSMakeSize(minimumFullScreenWidth, minimumWindowHeight)];
     [window setCollectionBehavior:([window collectionBehavior] | NSWindowCollectionBehaviorFullScreenAllowsTiling)];
-#endif
 
     window.titlebarAppearsTransparent = YES;
 
index ee7df00..4bde6d5 100644 (file)
@@ -9382,7 +9382,6 @@ bool LayerFlushController::flushLayers()
 }
 
 #if PLATFORM(MAC)
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
 - (WebImmediateActionController *)_immediateActionController
 {
     return _private->immediateActionController;
@@ -9401,7 +9400,6 @@ bool LayerFlushController::flushLayers()
         return [self _convertRectFromRootView:rectInRootViewCoordinates];
     });
 }
-#endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
 
 - (NSEvent *)_pressureEvent
 {
index cfee27d..27d843e 100644 (file)
@@ -1,3 +1,114 @@
+2017-07-01  Dan Bernstein  <mitz@apple.com>
+
+        [macOS] Remove code only needed when building for OS X Yosemite
+        https://bugs.webkit.org/show_bug.cgi?id=174067
+
+        Reviewed by Tim Horton.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/BaseTarget.xcconfig:
+        * Configurations/BaseXPCService.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+        * Configurations/FeatureDefines.xcconfig:
+        * Configurations/NetworkService.xcconfig:
+        * Configurations/PluginService.32.xcconfig:
+        * Configurations/PluginService.64.xcconfig:
+        * Configurations/Version.xcconfig:
+        * Configurations/WebContentService.xcconfig:
+        * Configurations/WebKit.xcconfig:
+        * DatabaseProcess/mac/com.apple.WebKit.Databases.sb.in:
+        * NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist: Removed.
+        * NetworkProcess/NetworkProcessCreationParameters.cpp:
+        (WebKit::NetworkProcessCreationParameters::encode):
+        (WebKit::NetworkProcessCreationParameters::decode):
+        * NetworkProcess/NetworkProcessCreationParameters.h:
+        * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+        (WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
+        * NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in:
+        * Platform/IPC/Connection.h:
+        * Platform/IPC/mac/ConnectionMac.mm:
+        (IPC::Connection::platformInvalidate):
+        (IPC::Connection::platformInitialize):
+        (IPC::Connection::open):
+        (IPC::Connection::exceptionSourceEventHandler): Deleted.
+        (IPC::Connection::setShouldCloseConnectionOnMachExceptions): Deleted.
+        * Platform/mac/LayerHostingContext.h:
+        * Platform/mac/LayerHostingContext.mm:
+        (WebKit::LayerHostingContext::createFencePort):
+        * PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist: Removed.
+        * PluginProcess/mac/PluginControllerProxyMac.mm:
+        (WebKit::PluginControllerProxy::updateLayerHostingContext):
+        * PluginProcess/mac/PluginProcessShim.mm:
+        * PluginProcess/mac/com.apple.WebKit.plugin-common.sb.in:
+        * Shared/ChildProcess.h:
+        * Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm:
+        (WebKit::getPluginInfoFromPropertyLists):
+        (WebKit::NetscapePluginModule::getPluginInfo):
+        (WebKit::contentsOfPropertyListAtURL): Deleted.
+        (WebKit::getMIMETypesFromPluginBundle): Deleted.
+        * Shared/Plugins/PluginProcessCreationParameters.cpp:
+        (WebKit::PluginProcessCreationParameters::encode):
+        (WebKit::PluginProcessCreationParameters::decode):
+        * Shared/Plugins/PluginProcessCreationParameters.h:
+        * Shared/WebProcessCreationParameters.cpp:
+        (WebKit::WebProcessCreationParameters::encode):
+        (WebKit::WebProcessCreationParameters::decode):
+        * Shared/WebProcessCreationParameters.h:
+        * Shared/mac/ChildProcessMac.mm:
+        (WebKit::ChildProcess::setSharedHTTPCookieStorage):
+        * UIProcess/API/C/WKPage.cpp:
+        (WKPageSetPageUIClient):
+        (fixUpBotchedPageUIClient): Deleted.
+        * UIProcess/ChildProcessProxy.cpp:
+        (WebKit::ChildProcessProxy::didFinishLaunching):
+        * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+        (WebKit::WebProcessPool::platformInitializeWebProcess):
+        (WebKit::WebProcessPool::platformInitializeNetworkProcess):
+        (WebKit::WebProcessPool::resetHSTSHostsAddedAfterDate):
+        * UIProcess/Cocoa/WebViewImpl.h:
+        * UIProcess/Cocoa/WebViewImpl.mm:
+        (WebKit::WebViewImpl::updateLayer):
+        (WebKit::WebViewImpl::startWindowDrag):
+        * UIProcess/DrawingAreaProxy.h:
+        (WebKit::DrawingAreaProxy::waitForPossibleGeometryUpdate): Deleted.
+        * UIProcess/Plugins/PluginProcessProxy.cpp:
+        (WebKit::PluginProcessProxy::didFinishLaunching):
+        * UIProcess/Plugins/PluginProcessProxy.h:
+        * UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
+        (WebKit::PluginProcessProxy::platformInitializePluginProcess):
+        (WebKit::PluginProcessProxy::createPropertyListFile): Deleted.
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::setTopContentInset):
+        * UIProcess/mac/PageClientImpl.mm:
+        (WebKit::PageClientImpl::rootViewToWindow):
+        (WebKit::PageClientImpl::startWindowDrag):
+        * UIProcess/mac/RemoteWebInspectorProxyMac.mm:
+        (WebKit::RemoteWebInspectorProxy::platformStartWindowDrag):
+        * UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h:
+        * UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm:
+        (WebKit::TiledCoreAnimationDrawingAreaProxy::createFence):
+        (WebKit::TiledCoreAnimationDrawingAreaProxy::waitForPossibleGeometryUpdate): Deleted.
+        * UIProcess/mac/WebInspectorProxyMac.mm:
+        (WebKit::WebInspectorProxy::createFrontendWindow):
+        (WebKit::WebInspectorProxy::platformStartWindowDrag):
+        * UIProcess/mac/WebPopupMenuProxyMac.mm:
+        (WebKit::WebPopupMenuProxyMac::showPopupMenu):
+        * WebKit2.xcodeproj/project.pbxproj:
+        * WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist: Removed.
+        * WebProcess/WebPage/WebPage.cpp:
+        * WebProcess/WebPage/WebPage.h:
+        * WebProcess/WebPage/WebPage.messages.in:
+        * WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm:
+        (WebKit::addAnimationToLayer):
+        * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
+        (WebKit::RemoteLayerTreeDrawingArea::flushLayers):
+        * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+        (WebKit::TiledCoreAnimationDrawingArea::flushLayers):
+        (WebKit::TiledCoreAnimationDrawingArea::updateGeometry):
+        * WebProcess/cocoa/WebProcessCocoa.mm:
+        (WebKit::WebProcess::platformInitializeWebProcess):
+        * WebProcess/com.apple.WebProcess.sb.in:
+
 2017-07-01  Chris Dumez  <cdumez@apple.com>
 
         Replace ResourceLoadStatisticsStore C API with Cocoa SPI
index 12b89a0..b436dc8 100644 (file)
@@ -78,7 +78,6 @@ PREBINDING = NO;
 WARNING_CFLAGS = -Wall -Wextra -Wchar-subscripts -Wextra-tokens -Wformat-security -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wno-unused-parameter -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough;
 
 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
-TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
 TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
 TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
 TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
index a946e8e..e4b63b8 100644 (file)
@@ -92,11 +92,6 @@ WK_MANUAL_SANDBOXING_ENABLED[sdk=macosx*] = YES;
 WK_MANUAL_SANDBOXING_DEFINES = $(WK_MANUAL_SANDBOXING_DEFINES_$(WK_MANUAL_SANDBOXING_ENABLED));
 WK_MANUAL_SANDBOXING_DEFINES_YES = ENABLE_MANUAL_SANDBOXING;
 
-WK_DONT_LINK_SHIM = $(WK_DONT_LINK_SHIM_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WK_DONT_LINK_SHIM_101000 = YES;
-
-WK_LINK_SHIM[sdk=macosx*] = $(WK_NOT_$(WK_DONT_LINK_SHIM));
-
 WK_EMPTY_ = YES;
 WK_NOT_ = YES;
 WK_NOT_YES = NO;
index f416c12..58a73f6 100644 (file)
@@ -63,9 +63,6 @@ CODE_SIGN_ENTITLEMENTS_IOS_MANUAL_SANDBOXING_ = $(CODE_SIGN_ENTITLEMENTS_IOS_MAN
 CODE_SIGN_ENTITLEMENTS_IOS_MANUAL_SANDBOXING_NO = Configurations/$(WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE).entitlements;
 CODE_SIGN_ENTITLEMENTS_IOS_MANUAL_SANDBOXING_YES = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2/$(WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE)-no-sandbox.entitlements;
 
-WK_XPC_SERVICE_INFOPLIST_SUFFIX[sdk=macosx*] = $(WK_XPC_SERVICE_INFOPLIST_SUFFIX_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WK_XPC_SERVICE_INFOPLIST_SUFFIX_101000 = -10.9-10.10;
-
 WK_XPC_SERVICE_INSERT_LIBRARIES_DIR = $(WK_XPC_SERVICE_INSERT_LIBRARIES_DIR_$(WK_RELOCATABLE_FRAMEWORKS));
 WK_XPC_SERVICE_INSERT_LIBRARIES_DIR_ = $(WK_XPC_SERVICE_INSERT_LIBRARIES_DIR_NO);
 WK_XPC_SERVICE_INSERT_LIBRARIES_DIR_NO = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Frameworks;
index 41a9f24..b150ffc 100644 (file)
@@ -30,7 +30,6 @@ ONLY_ACTIVE_ARCH = YES;
 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
 MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
 MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
 MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
@@ -42,7 +41,6 @@ DEBUG_INFORMATION_FORMAT = dwarf;
 WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphoneos*] = WebKitSystemInterfaceIOSDevice$(WK_TARGET_IOS_VERSION_MAJOR);
 WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphonesimulator*] = WebKitSystemInterfaceIOSSimulator$(WK_TARGET_IOS_VERSION_MAJOR);
 WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=macosx*] = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000 = WebKitSystemInterfaceYosemite;
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101100 = WebKitSystemInterfaceElCapitan;
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101200 = WebKitSystemInterfaceOSX10.12;
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101300 = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101200);
index 77ff8ac..9e56e68 100644 (file)
 // Set any ENABLE_FEATURE_NAME macro to an empty string to disable that feature.
 
 TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101000 = YES;
 TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101100 = YES;
 
 TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101000 = YES;
 TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101100 = YES;
 TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101200 = YES;
 
index 1ddd761..ec629ad 100644 (file)
@@ -28,7 +28,7 @@ WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE = Network-iOS;
 PRODUCT_NAME = com.apple.WebKit.Networking;
 PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_NAME);
 INFOPLIST_FILE[sdk=iphone*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist;
-INFOPLIST_FILE[sdk=macosx*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX$(WK_XPC_SERVICE_INFOPLIST_SUFFIX).plist;
+INFOPLIST_FILE[sdk=macosx*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist;
 
-OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(OTHER_LDFLAGS_SHIM_$(WK_LINK_SHIM)) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
-OTHER_LDFLAGS_SHIM_YES = $(BUILT_PRODUCTS_DIR)/SecItemShim.dylib;
+OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
+OTHER_LDFLAGS[sdk=macosx*] = $(inherited) $(BUILT_PRODUCTS_DIR)/SecItemShim.dylib;
index 0200c19..bbcd6cc 100644 (file)
@@ -27,11 +27,10 @@ VALID_ARCHS_macosx_NO = i386;
 
 PRODUCT_NAME = com.apple.WebKit.Plugin.32;
 PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_NAME);
-INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64$(WK_XPC_SERVICE_INFOPLIST_SUFFIX).Info.plist;
+INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist;
 
 OTHER_LDFLAGS = $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
-OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit $(OTHER_LDFLAGS_SHIM_$(WK_LINK_SHIM));
-OTHER_LDFLAGS_SHIM_YES = $(BUILT_PRODUCTS_DIR)/PluginProcessShim.dylib;
+OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit $(BUILT_PRODUCTS_DIR)/PluginProcessShim.dylib;
 
 CODE_SIGN_ENTITLEMENTS = Configurations/PluginService.entitlements;
 
index 52dd583..06859b0 100644 (file)
@@ -27,11 +27,10 @@ VALID_ARCHS_macosx_NO = x86_64;
 
 PRODUCT_NAME = com.apple.WebKit.Plugin.64;
 PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_NAME);
-INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64$(WK_XPC_SERVICE_INFOPLIST_SUFFIX).Info.plist;
+INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist;
 
 OTHER_LDFLAGS = $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
-OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit $(OTHER_LDFLAGS_SHIM_$(WK_LINK_SHIM));
-OTHER_LDFLAGS_SHIM_YES = $(BUILT_PRODUCTS_DIR)/PluginProcessShim.dylib;
+OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit $(BUILT_PRODUCTS_DIR)/PluginProcessShim.dylib;
 
 CODE_SIGN_ENTITLEMENTS = Configurations/PluginService.entitlements;
 
index e3c48ef..a5173da 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_101000 = 10;
 SYSTEM_VERSION_PREFIX_macosx_101100 = 11;
 SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
 SYSTEM_VERSION_PREFIX_macosx_101300 = 13;
index 89f940c..dbfee5f 100644 (file)
@@ -32,11 +32,10 @@ OTHER_CODE_SIGN_FLAGS[sdk=macosx*] = $(WK_XPC_DOMAIN_EXTENSION_CODE_SIGN_FLAGS);
 PRODUCT_NAME = com.apple.WebKit.WebContent;
 PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_NAME);
 INFOPLIST_FILE[sdk=iphone*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist;
-INFOPLIST_FILE[sdk=macosx*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX$(WK_XPC_SERVICE_INFOPLIST_SUFFIX).plist;
+INFOPLIST_FILE[sdk=macosx*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist;
 
 OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH_$(WK_WEBCONTENT_SERVICE_NEEDS_VERSIONED_FRAMEWORK_PATH_LDFLAG)) $(OTHER_LDFLAGS_PLATFORM) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
-OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit $(OTHER_LDFLAGS_SHIM_$(WK_LINK_SHIM));
-OTHER_LDFLAGS_SHIM_YES = $(BUILT_PRODUCTS_DIR)/WebProcessShim.dylib;
+OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit $(BUILT_PRODUCTS_DIR)/WebProcessShim.dylib;
 
 WK_WEBCONTENT_SERVICE_NEEDS_XPC_DOMAIN_EXTENSION_ENTITLEMENT = $(WK_WEBCONTENT_SERVICE_NEEDS_XPC_DOMAIN_EXTENSION_ENTITLEMENT_$(WK_EMPTY_$(WK_WEBCONTENT_SERVICE_NEEDS_XPC_DOMAIN_EXTENSION_ENTITLEMENT)));
 WK_WEBCONTENT_SERVICE_NEEDS_XPC_DOMAIN_EXTENSION_ENTITLEMENT_ = $(WK_WEBCONTENT_SERVICE_NEEDS_XPC_DOMAIN_EXTENSION_ENTITLEMENT_NO);
index 5d17368..16a187c 100644 (file)
@@ -75,7 +75,6 @@ EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = PluginProcessShim.dylib SecItemShim.dy
 INSTALLHDRS_SCRIPT_PHASE = YES;
 
 WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED[sdk=macosx*] = $(WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED_macosx_101000 = YES;
 WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED_macosx_101100 = YES;
 WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED_macosx_101200 = YES;
 
index 94da629..55b4afc 100644 (file)
@@ -32,7 +32,6 @@
 (allow process-info-pidinfo)
 (allow process-info-setcontrol (target self))
 
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
 (deny sysctl*)
 (allow sysctl-read
     (sysctl-name
@@ -43,7 +42,6 @@
         "vm.footprint_suspend"))
 
 (deny iokit-get-properties)
-#endif
 
 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
 (deny mach-lookup (xpc-service-name-prefix ""))
 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
     (global-name "com.apple.analyticsd")
 #endif
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
     (global-name "com.apple.lsd.mapdb")
-#endif
 )
 
 ;; Sandbox extensions
diff --git a/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist b/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist
deleted file mode 100644 (file)
index c9e39a7..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>CFBundleGetInfoString</key>
-       <string>${BUNDLE_VERSION}, Copyright 2003-2017 Apple Inc.</string>
-       <key>CFBundleDevelopmentRegion</key>
-       <string>English</string>
-       <key>CFBundleExecutable</key>
-       <string>${EXECUTABLE_NAME}</string>
-       <key>CFBundleIdentifier</key>
-       <string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
-       <key>CFBundleInfoDictionaryVersion</key>
-       <string>6.0</string>
-       <key>CFBundleName</key>
-       <string>${PRODUCT_NAME}</string>
-       <key>CFBundlePackageType</key>
-       <string>XPC!</string>
-       <key>CFBundleShortVersionString</key>
-       <string>${SHORT_VERSION_STRING}</string>
-       <key>CFBundleSignature</key>
-       <string>????</string>
-       <key>CFBundleVersion</key>
-       <string>${BUNDLE_VERSION}</string>
-       <key>LSFileQuarantineEnabled</key>
-       <true/>
-       <key>NSPrincipalClass</key>
-       <string>NSApplication</string>
-       <key>WebKitEntryPoint</key>
-       <string>NetworkServiceInitializer</string>
-       <key>LSUIElement</key>
-       <true/>
-       <key>XPCService</key>
-       <dict>
-               <key>ServiceType</key>
-               <string>Application</string>
-               <key>JoinExistingSession</key>
-               <true/>
-               <key>RunLoopType</key>
-               <string>NSRunLoop</string>
-               <key>_MultipleInstances</key>
-               <true/>
-               <key>EnvironmentVariables</key>
-               <dict>
-                       <key>DYLD_INSERT_LIBRARIES</key>
-                       <string>$(WK_XPC_SERVICE_INSERT_LIBRARIES_DIR)/SecItemShim.dylib</string>
-               </dict>
-       </dict>
-</dict>
-</plist>
index 4f0beb2..fef5c97 100644 (file)
@@ -54,7 +54,7 @@ void NetworkProcessCreationParameters::encode(IPC::Encoder& encoder) const
     encoder << shouldEnableNetworkCacheSpeculativeRevalidation;
 #endif
 #endif
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+#if PLATFORM(MAC)
     encoder << uiProcessCookieStorageIdentifier;
 #endif
 #if PLATFORM(IOS)
@@ -80,7 +80,7 @@ void NetworkProcessCreationParameters::encode(IPC::Encoder& encoder) const
 #endif
     encoder << httpProxy;
     encoder << httpsProxy;
-#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
+#if PLATFORM(COCOA)
     IPC::encode(encoder, networkATSContext.get());
 #endif
     encoder << cookieStoragePartitioningEnabled;
@@ -126,7 +126,7 @@ bool NetworkProcessCreationParameters::decode(IPC::Decoder& decoder, NetworkProc
         return false;
 #endif
 #endif
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+#if PLATFORM(MAC)
     if (!decoder.decode(result.uiProcessCookieStorageIdentifier))
         return false;
 #endif
@@ -171,7 +171,7 @@ bool NetworkProcessCreationParameters::decode(IPC::Decoder& decoder, NetworkProc
         return false;
     if (!decoder.decode(result.httpsProxy))
         return false;
-#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
+#if PLATFORM(COCOA)
     if (!IPC::decode(decoder, result.networkATSContext))
         return false;
 #endif
index 736d07a..a21ea12 100644 (file)
@@ -63,7 +63,7 @@ struct NetworkProcessCreationParameters {
     bool shouldEnableNetworkCacheSpeculativeRevalidation { false };
 #endif
 #endif
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+#if PLATFORM(MAC)
     Vector<uint8_t> uiProcessCookieStorageIdentifier;
 #endif
 #if PLATFORM(IOS)
@@ -91,7 +91,7 @@ struct NetworkProcessCreationParameters {
 #endif
     String httpProxy;
     String httpsProxy;
-#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
+#if PLATFORM(COCOA)
     RetainPtr<CFDataRef> networkATSContext;
 #endif
     bool cookieStoragePartitioningEnabled;
index e7ca889..ede6023 100644 (file)
@@ -75,9 +75,7 @@ void NetworkProcess::platformInitializeNetworkProcessCocoa(const NetworkProcessC
 #endif
     m_diskCacheDirectory = parameters.diskCacheDirectory;
 
-#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     _CFNetworkSetATSContext(parameters.networkATSContext.get());
-#endif
 
     SessionTracker::setIdentifierBase(parameters.uiProcessBundleIdentifier);
 
@@ -93,7 +91,7 @@ void NetworkProcess::platformInitializeNetworkProcessCocoa(const NetworkProcessC
 
     initializeNetworkSettings();
 
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+#if PLATFORM(MAC)
     setSharedHTTPCookieStorage(parameters.uiProcessCookieStorageIdentifier);
 #endif
 
index 1019ca5..8aa005e 100644 (file)
@@ -32,7 +32,6 @@
 (allow process-info-pidinfo)
 (allow process-info-setcontrol (target self))
 
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
 (deny sysctl*)
 (allow sysctl-read
     (sysctl-name
@@ -43,7 +42,6 @@
         "vm.footprint_suspend"))
 
 (deny iokit-get-properties)
-#endif
 
 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
 (deny mach-lookup (xpc-service-name-prefix ""))
 #endif
     (global-name "com.apple.cookied")
     (global-name "com.apple.cfnetwork.AuthBrokerAgent")
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
     (global-name "com.apple.lsd.mapdb")
     (global-name "com.apple.nesessionmanager.flow-divert-token")
-#endif
 )
 
 ;; Security framework
index 2e0c593..54a7f0a 100644 (file)
@@ -143,10 +143,6 @@ public:
 
     Client& client() const { return m_client; }
 
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
-    void setShouldCloseConnectionOnMachExceptions();
-#endif
-
     void setOnlySendMessagesAsDispatchWhenWaitingForSyncReplyWhenProcessingSuchAMessage(bool);
     void setShouldExitOnSyncMessageSendFailure(bool shouldExitOnSyncMessageSendFailure);
 
@@ -332,14 +328,6 @@ private:
     dispatch_source_t m_receiveSource;
 
     std::unique_ptr<MachMessage> m_pendingOutgoingMachMessage;
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
-    void exceptionSourceEventHandler();
-
-    // If setShouldCloseConnectionOnMachExceptions has been called, this has
-    // the exception port that exceptions from the other end will be sent on.
-    mach_port_t m_exceptionPort;
-    dispatch_source_t m_exceptionPortDataAvailableSource;
-#endif
 
     OSObjectPtr<xpc_connection_t> m_xpcConnection;
 #endif
index e6ab9dd..fe875b4 100644 (file)
@@ -144,15 +144,6 @@ void Connection::platformInvalidate()
     dispatch_release(m_receiveSource);
     m_receiveSource = nullptr;
     m_receivePort = MACH_PORT_NULL;
-
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
-    if (m_exceptionPort) {
-        dispatch_source_cancel(m_exceptionPortDataAvailableSource);
-        dispatch_release(m_exceptionPortDataAvailableSource);
-        m_exceptionPortDataAvailableSource = 0;
-        m_exceptionPort = MACH_PORT_NULL;
-    }
-#endif
 }
     
 void Connection::terminateSoon(Seconds interval)
@@ -163,11 +154,6 @@ void Connection::terminateSoon(Seconds interval)
     
 void Connection::platformInitialize(Identifier identifier)
 {
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
-    m_exceptionPort = MACH_PORT_NULL;
-    m_exceptionPortDataAvailableSource = nullptr;
-#endif
-
     if (m_isServer) {
         m_receivePort = identifier.port;
         m_sendPort = MACH_PORT_NULL;
@@ -225,33 +211,12 @@ bool Connection::open()
         mach_port_mod_refs(mach_task_self(), receivePort, MACH_PORT_RIGHT_RECEIVE, -1);
     });
 
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
-    if (m_exceptionPort) {
-        m_exceptionPortDataAvailableSource = dispatch_source_create(DISPATCH_SOURCE_TYPE_MACH_RECV, m_exceptionPort, 0, m_connectionQueue->dispatchQueue());
-        dispatch_source_set_event_handler(m_exceptionPortDataAvailableSource, [connection] {
-            connection->exceptionSourceEventHandler();
-        });
-        dispatch_source_set_cancel_handler(m_exceptionPortDataAvailableSource, [connection, exceptionPort = m_exceptionPort] {
-            mach_port_mod_refs(mach_task_self(), exceptionPort, MACH_PORT_RIGHT_RECEIVE, -1);
-        });
-
-        auto encoder = std::make_unique<Encoder>("IPC", "SetExceptionPort", 0);
-        encoder->encode(MachPort(m_exceptionPort, MACH_MSG_TYPE_MAKE_SEND));
-
-        sendMessage(WTFMove(encoder), { });
-    }
-#endif
-
     ref();
     dispatch_async(m_connectionQueue->dispatchQueue(), ^{
         dispatch_resume(m_receiveSource);
 
         if (m_sendSource)
             dispatch_resume(m_sendSource);
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
-        if (m_exceptionPortDataAvailableSource)
-            dispatch_resume(m_exceptionPortDataAvailableSource);
-#endif
 
         deref();
     });
@@ -592,51 +557,6 @@ void Connection::receiveSourceEventHandler()
     processIncomingMessage(WTFMove(decoder));
 }    
 
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
-void Connection::exceptionSourceEventHandler()
-{
-    ReceiveBuffer buffer;
-
-    mach_msg_header_t* header = readFromMachPort(m_exceptionPort, buffer);
-    if (!header)
-        return;
-
-    // We've read the exception message. Now send it on to the real exception port.
-
-    // The remote port should have a send once right.
-    ASSERT(MACH_MSGH_BITS_REMOTE(header->msgh_bits) == MACH_MSG_TYPE_MOVE_SEND_ONCE);
-
-    // Now get the real exception port.
-    mach_port_t exceptionPort = machExceptionPort();
-
-    // First, get the complex bit from the source message.
-    mach_msg_bits_t messageBits = header->msgh_bits & MACH_MSGH_BITS_COMPLEX;
-    messageBits |= MACH_MSGH_BITS(MACH_MSG_TYPE_COPY_SEND, MACH_MSG_TYPE_MOVE_SEND_ONCE);
-
-    header->msgh_bits = messageBits;
-    header->msgh_local_port = header->msgh_remote_port;
-    header->msgh_remote_port = exceptionPort;
-
-    // Now send along the message.
-    kern_return_t kr = mach_msg(header, MACH_SEND_MSG, header->msgh_size, 0, MACH_PORT_NULL, MACH_MSG_TIMEOUT_NONE, MACH_PORT_NULL);
-    if (kr != KERN_SUCCESS)
-        LOG_ERROR("Failed to send message to real exception port. %s (%x)", mach_error_string(kr), kr);
-
-    connectionDidClose();
-}
-
-void Connection::setShouldCloseConnectionOnMachExceptions()
-{
-    ASSERT(m_exceptionPort == MACH_PORT_NULL);
-
-    if (mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &m_exceptionPort) != KERN_SUCCESS)
-        ASSERT_NOT_REACHED();
-
-    if (mach_port_insert_right(mach_task_self(), m_exceptionPort, m_exceptionPort, MACH_MSG_TYPE_MAKE_SEND) != KERN_SUCCESS)
-        ASSERT_NOT_REACHED();
-}
-#endif
-
 IPC::Connection::Identifier Connection::identifier() const
 {
     return Identifier(m_isServer ? m_receivePort : m_sendPort, m_xpcConnection);
index 9549b9f..0cdfa7d 100644 (file)
@@ -62,7 +62,7 @@ public:
     void setColorSpace(CGColorSpaceRef);
     CGColorSpaceRef colorSpace() const;
 
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+#if PLATFORM(MAC)
     void setColorMatchUntaggedContent(bool);
     bool colorMatchUntaggedContent() const;
 #endif
index 5d02d05..1be5652 100644 (file)
@@ -102,7 +102,7 @@ CGColorSpaceRef LayerHostingContext::colorSpace() const
     return [m_context colorSpace];
 }
 
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+#if PLATFORM(MAC)
 void LayerHostingContext::setColorMatchUntaggedContent(bool colorMatchUntaggedContent)
 {
     [m_context setColorMatchUntaggedContent:colorMatchUntaggedContent];
@@ -114,7 +114,6 @@ bool LayerHostingContext::colorMatchUntaggedContent() const
 }
 #endif
 
-#if HAVE(COREANIMATION_FENCES)
 void LayerHostingContext::setFencePort(mach_port_t fencePort)
 {
     [m_context setFencePort:fencePort];
@@ -124,19 +123,5 @@ MachSendRight LayerHostingContext::createFencePort()
 {
     return MachSendRight::adopt([m_context createFencePort]);
 }
-#else
-NO_RETURN_DUE_TO_ASSERT void LayerHostingContext::setFencePort(mach_port_t fencePort)
-{
-    ASSERT_NOT_REACHED();
-}
-
-NO_RETURN_DUE_TO_ASSERT MachSendRight LayerHostingContext::createFencePort()
-{
-    ASSERT_NOT_REACHED();
-#if ASSERT_DISABLED
-    return MachSendRight();
-#endif
-}
-#endif
 
 } // namespace WebKit
diff --git a/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist b/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist
deleted file mode 100644 (file)
index 3f0e1e5..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>CFBundleGetInfoString</key>
-       <string>${BUNDLE_VERSION}, Copyright 2003-2017 Apple Inc.</string>
-       <key>CFBundleDevelopmentRegion</key>
-       <string>English</string>
-       <key>CFBundleExecutable</key>
-       <string>${EXECUTABLE_NAME}</string>
-       <key>CFBundleIdentifier</key>
-       <string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
-       <key>CFBundleInfoDictionaryVersion</key>
-       <string>6.0</string>
-       <key>CFBundleName</key>
-       <string>${PRODUCT_NAME}</string>
-       <key>CFBundlePackageType</key>
-       <string>XPC!</string>
-       <key>CFBundleShortVersionString</key>
-       <string>${SHORT_VERSION_STRING}</string>
-       <key>CFBundleSignature</key>
-       <string>????</string>
-       <key>CFBundleVersion</key>
-       <string>${BUNDLE_VERSION}</string>
-       <key>LSFileQuarantineEnabled</key>
-       <true/>
-       <key>NSPrincipalClass</key>
-       <string>NSApplication</string>
-       <key>WebKitEntryPoint</key>
-       <string>PluginServiceInitializer</string>
-       <key>LSUIElement</key>
-       <true/>
-       <key>NSSupportsAutomaticGraphicsSwitching</key>
-       <true/>
-       <key>NSSupportsAppNap</key>
-       <true/>
-       <key>XPCService</key>
-       <dict>
-               <key>ServiceType</key>
-               <string>Application</string>
-               <key>RunLoopType</key>
-               <string>_NSApplicationMain</string>
-               <key>JoinExistingSession</key>
-               <true/>
-               <key>_MultipleInstances</key>
-               <true/>
-               <key>_AbandonCoalition</key>
-               <true/>
-               <key>EnvironmentVariables</key>
-               <dict>
-                       <key>DYLD_INSERT_LIBRARIES</key>
-                       <string>$(WK_XPC_SERVICE_INSERT_LIBRARIES_DIR)/PluginProcessShim.dylib</string>
-                       <key>NSStringDisableTagged</key>
-                       <string>YES</string>
-               </dict>
-       </dict>
-</dict>
-</plist>
index e590c96..cf66906 100644 (file)
@@ -135,10 +135,8 @@ void PluginControllerProxy::updateLayerHostingContext(LayerHostingMode layerHost
 #endif
     }
 
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
     m_layerHostingContext->setColorSpace(sRGBColorSpaceRef());
     m_layerHostingContext->setColorMatchUntaggedContent(true);
-#endif
 
     m_layerHostingContext->setRootLayer(platformLayer);
 }
index 36a22e4..8cb66a2 100644 (file)
@@ -112,9 +112,6 @@ shimLSOpenCFURLRef(CFURLRef url, CFURLRef* launchedURL)
     return LSOpenCFURLRef(url, launchedURL);
 }
 
-#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101100
-SUPPRESS_ASAN
-#endif
 static kern_return_t shimMachVMMap(vm_map_t task, mach_vm_address_t *address, mach_vm_size_t size, mach_vm_offset_t mask, int flags, mem_entry_name_port_t object, memory_object_offset_t offset, boolean_t copy, vm_prot_t currentProtection, vm_prot_t maxProtection, vm_inherit_t inheritance)
 {
     if (task == mach_task_self()) {
index 84a9cbf..7d76f63 100644 (file)
@@ -32,7 +32,6 @@
 (allow process-info-pidinfo)
 (allow process-info-setcontrol (target self))
 
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
 (deny sysctl*)
 (allow sysctl-read
     (sysctl-name
     (iokit-property "startup-timing")
     (iokit-property "touch-size-id")
 )
-#endif
 
 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
 (deny mach-lookup (xpc-service-name-prefix ""))
 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
     (global-name "com.apple.analyticsd")
 #endif
-#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101100
-    (global-name "com.apple.audio.VDCAssistant")
-#endif
     (global-name "com.apple.audio.audiohald")
     (global-name "com.apple.audio.coreaudiod")
     (global-name "com.apple.cfnetwork.AuthBrokerAgent")
     (global-name "com.apple.cookied") ;; FIXME: <rdar://problem/10790768> Limit access to cookies.
     (global-name "com.apple.coreservices.launchservicesd")
     (global-name "com.apple.fonts")
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
     (global-name "com.apple.lsd.mapdb")
-#endif
     (global-name "com.apple.ocspd")
     (global-name "com.apple.pasteboard.1")
     (global-name "com.apple.pbs.fetch_services")
index 6fe72b1..2e30c1f 100644 (file)
@@ -88,7 +88,7 @@ protected:
     virtual void initializeSandbox(const ChildProcessInitializationParameters&, SandboxInitializationParameters&);
     virtual void initializeConnection(IPC::Connection*);
 
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+#if PLATFORM(MAC)
     static void setSharedHTTPCookieStorage(const Vector<uint8_t>& identifier);
 #endif
 
index f2a0233..feea1ef 100644 (file)
@@ -78,50 +78,9 @@ static bool getPluginArchitecture(CFBundleRef bundle, PluginModuleInfo& plugin)
     return false;
 }
 
-#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
-static RetainPtr<CFDictionaryRef> contentsOfPropertyListAtURL(CFURLRef propertyListURL)
-{
-    RetainPtr<NSData> propertyListData = adoptNS([[NSData alloc] initWithContentsOfURL:(NSURL *)propertyListURL]);
-    if (!propertyListData)
-        return 0;
-
-    RetainPtr<CFPropertyListRef> propertyList = adoptCF(CFPropertyListCreateWithData(kCFAllocatorDefault, (CFDataRef)propertyListData.get(), kCFPropertyListImmutable, 0, 0));
-    if (!propertyList)
-        return 0;
-
-    if (CFGetTypeID(propertyList.get()) != CFDictionaryGetTypeID())
-        return 0;
-
-    return static_cast<CFDictionaryRef>(propertyList.get());
-}
-#endif
-
-static RetainPtr<CFDictionaryRef> getMIMETypesFromPluginBundle(CFBundleRef bundle, const PluginModuleInfo& plugin)
-{
-#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
-    CFStringRef propertyListFilename = static_cast<CFStringRef>(CFBundleGetValueForInfoDictionaryKey(bundle, CFSTR("WebPluginMIMETypesFilename")));
-    if (propertyListFilename) {
-        RetainPtr<CFStringRef> propertyListPath = adoptCF(CFStringCreateWithFormat(kCFAllocatorDefault, 0, CFSTR("%@/Library/Preferences/%@"), NSHomeDirectory(), propertyListFilename));
-        RetainPtr<CFURLRef> propertyListURL = adoptCF(CFURLCreateWithFileSystemPath(kCFAllocatorDefault, propertyListPath.get(), kCFURLPOSIXPathStyle, FALSE));
-
-        RetainPtr<CFDictionaryRef> propertyList = contentsOfPropertyListAtURL(propertyListURL.get());
-
-        if (!propertyList && PluginProcessProxy::createPropertyListFile(plugin))
-            propertyList = contentsOfPropertyListAtURL(propertyListURL.get());
-
-        if (!propertyList)
-            return 0;
-        
-        return static_cast<CFDictionaryRef>(CFDictionaryGetValue(propertyList.get(), CFSTR("WebPluginMIMETypes")));
-    }
-#endif
-    
-    return static_cast<CFDictionaryRef>(CFBundleGetValueForInfoDictionaryKey(bundle, CFSTR("WebPluginMIMETypes")));
-}
-
 static bool getPluginInfoFromPropertyLists(CFBundleRef bundle, PluginModuleInfo& plugin)
 {
-    RetainPtr<CFDictionaryRef> mimeTypes = getMIMETypesFromPluginBundle(bundle, plugin);
+    RetainPtr<CFDictionaryRef> mimeTypes = static_cast<CFDictionaryRef>(CFBundleGetValueForInfoDictionaryKey(bundle, CFSTR("WebPluginMIMETypes")));
     if (!mimeTypes || CFGetTypeID(mimeTypes.get()) != CFDictionaryGetTypeID())
         return false;
 
@@ -209,12 +168,7 @@ bool NetscapePluginModule::getPluginInfo(const String& pluginPath, PluginModuleI
     RetainPtr<CFURLRef> bundleURL = adoptCF(CFURLCreateWithFileSystemPath(kCFAllocatorDefault, pluginPath.createCFString().get(), kCFURLPOSIXPathStyle, false));
     
     // Try to initialize the bundle.
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
     RetainPtr<CFBundleRef> bundle = adoptCF(_CFBundleCreateUnique(kCFAllocatorDefault, bundleURL.get()));
-#else
-    RetainPtr<CFBundleRef> bundle = adoptCF(CFBundleCreate(kCFAllocatorDefault, bundleURL.get()));
-#endif
-
     if (!bundle)
         return false;
     
index 3988e8c..7bd78b6 100644 (file)
@@ -47,10 +47,8 @@ void PluginProcessCreationParameters::encode(IPC::Encoder& encoder) const
     encoder << terminationTimeout;
 #if PLATFORM(COCOA)
     encoder << acceleratedCompositingPort;
-#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     IPC::encode(encoder, networkATSContext.get());
 #endif
-#endif
 #if OS(LINUX)
     encoder << memoryPressureMonitorHandle;
 #endif
@@ -69,11 +67,9 @@ bool PluginProcessCreationParameters::decode(IPC::Decoder& decoder, PluginProces
 #if PLATFORM(COCOA)
     if (!decoder.decode(result.acceleratedCompositingPort))
         return false;
-#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     if (!IPC::decode(decoder, result.networkATSContext))
         return false;
 #endif
-#endif
 #if OS(LINUX)
     if (!decoder.decode(result.memoryPressureMonitorHandle))
         return false;
index b1a34a4..43c4c98 100644 (file)
@@ -57,10 +57,8 @@ struct PluginProcessCreationParameters {
 
 #if PLATFORM(COCOA)
     WebCore::MachSendRight acceleratedCompositingPort;
-#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     RetainPtr<CFDataRef> networkATSContext;
 #endif
-#endif
 #if OS(LINUX)
     IPC::Attachment memoryPressureMonitorHandle;
 #endif
index f03815b..4358e76 100644 (file)
@@ -57,7 +57,7 @@ void WebProcessCreationParameters::encode(IPC::Encoder& encoder) const
     encoder << mediaCacheDirectoryExtensionHandle;
     encoder << javaScriptConfigurationDirectory;
     encoder << javaScriptConfigurationDirectoryExtensionHandle;
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+#if PLATFORM(MAC)
     encoder << uiProcessCookieStorageIdentifier;
 #endif
 #if PLATFORM(IOS)
@@ -129,7 +129,7 @@ void WebProcessCreationParameters::encode(IPC::Encoder& encoder) const
     encoder << pluginLoadClientPolicies;
 #endif
 
-#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
+#if PLATFORM(COCOA)
     IPC::encode(encoder, networkATSContext.get());
 #endif
 
@@ -174,7 +174,7 @@ bool WebProcessCreationParameters::decode(IPC::Decoder& decoder, WebProcessCreat
         return false;
     if (!decoder.decode(parameters.javaScriptConfigurationDirectoryExtensionHandle))
         return false;
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+#if PLATFORM(MAC)
     if (!decoder.decode(parameters.uiProcessCookieStorageIdentifier))
         return false;
 #endif
@@ -303,7 +303,7 @@ bool WebProcessCreationParameters::decode(IPC::Decoder& decoder, WebProcessCreat
         return false;
 #endif
 
-#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
+#if PLATFORM(COCOA)
     if (!IPC::decode(decoder, parameters.networkATSContext))
         return false;
 #endif
index 163f511..c5d291b 100644 (file)
@@ -78,7 +78,7 @@ struct WebProcessCreationParameters {
     SandboxExtension::Handle mediaCacheDirectoryExtensionHandle;
     String javaScriptConfigurationDirectory;
     SandboxExtension::Handle javaScriptConfigurationDirectoryExtensionHandle;
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+#if PLATFORM(MAC)
     Vector<uint8_t> uiProcessCookieStorageIdentifier;
 #endif
 #if PLATFORM(IOS)
@@ -161,7 +161,7 @@ struct WebProcessCreationParameters {
     HashMap<String, HashMap<String, HashMap<String, uint8_t>>> pluginLoadClientPolicies;
 #endif
 
-#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
+#if PLATFORM(COCOA)
     RetainPtr<CFDataRef> networkATSContext;
 #endif
 
index 3e8e722..8c732ac 100644 (file)
@@ -177,15 +177,12 @@ void ChildProcess::initializeSandbox(const ChildProcessInitializationParameters&
     }
 }
 
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
 void ChildProcess::setSharedHTTPCookieStorage(const Vector<uint8_t>& identifier)
 {
     RetainPtr<CFDataRef> cookieStorageData = adoptCF(CFDataCreate(kCFAllocatorDefault, identifier.data(), identifier.size()));
     RetainPtr<CFHTTPCookieStorageRef> uiProcessCookieStorage = adoptCF(CFHTTPCookieStorageCreateFromIdentifyingData(kCFAllocatorDefault, cookieStorageData.get()));
     [NSHTTPCookieStorage _setSharedHTTPCookieStorage:adoptNS([[NSHTTPCookieStorage alloc] _initWithCFHTTPCookieStorage:uiProcessCookieStorage.get()]).get()];
 }
-#endif
-
 
 #if USE(APPKIT)
 void ChildProcess::stopNSAppRunLoop()
index d3c2fe5..c5a2345 100644 (file)
@@ -1404,140 +1404,6 @@ void WKPageSetPagePolicyClient(WKPageRef pageRef, const WKPagePolicyClientBase*
     toImpl(pageRef)->setPolicyClient(std::make_unique<PolicyClient>(wkClient));
 }
 
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
-static void fixUpBotchedPageUIClient(WKPageRef pageRef, const WKPageUIClientBase& wkClient)
-{
-    struct BotchedWKPageUIClientV4 {
-        WKPageUIClientBase                                                  base;
-
-        // Version 0.
-        WKPageCreateNewPageCallback_deprecatedForUseWithV0                  createNewPage_deprecatedForUseWithV0;
-        WKPageUIClientCallback                                              showPage;
-        WKPageUIClientCallback                                              close;
-        WKPageTakeFocusCallback                                             takeFocus;
-        WKPageFocusCallback                                                 focus;
-        WKPageUnfocusCallback                                               unfocus;
-        WKPageRunJavaScriptAlertCallback_deprecatedForUseWithV0             runJavaScriptAlert_deprecatedForUseWithV0;
-        WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV0           runJavaScriptConfirm_deprecatedForUseWithV0;
-        WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV0            runJavaScriptPrompt_deprecatedForUseWithV0;
-        WKPageSetStatusTextCallback                                         setStatusText;
-        WKPageMouseDidMoveOverElementCallback_deprecatedForUseWithV0        mouseDidMoveOverElement_deprecatedForUseWithV0;
-        WKPageMissingPluginButtonClickedCallback_deprecatedForUseWithV0     missingPluginButtonClicked_deprecatedForUseWithV0;
-        WKPageDidNotHandleKeyEventCallback                                  didNotHandleKeyEvent;
-        WKPageDidNotHandleWheelEventCallback                                didNotHandleWheelEvent;
-        WKPageGetToolbarsAreVisibleCallback                                 toolbarsAreVisible;
-        WKPageSetToolbarsAreVisibleCallback                                 setToolbarsAreVisible;
-        WKPageGetMenuBarIsVisibleCallback                                   menuBarIsVisible;
-        WKPageSetMenuBarIsVisibleCallback                                   setMenuBarIsVisible;
-        WKPageGetStatusBarIsVisibleCallback                                 statusBarIsVisible;
-        WKPageSetStatusBarIsVisibleCallback                                 setStatusBarIsVisible;
-        WKPageGetIsResizableCallback                                        isResizable;
-        WKPageSetIsResizableCallback                                        setIsResizable;
-        WKPageGetWindowFrameCallback                                        getWindowFrame;
-        WKPageSetWindowFrameCallback                                        setWindowFrame;
-        WKPageRunBeforeUnloadConfirmPanelCallback_deprecatedForUseWithV6    runBeforeUnloadConfirmPanel;
-        WKPageUIClientCallback                                              didDraw;
-        WKPageUIClientCallback                                              pageDidScroll;
-        WKPageExceededDatabaseQuotaCallback                                 exceededDatabaseQuota;
-        WKPageRunOpenPanelCallback                                          runOpenPanel;
-        WKPageDecidePolicyForGeolocationPermissionRequestCallback           decidePolicyForGeolocationPermissionRequest;
-        WKPageHeaderHeightCallback                                          headerHeight;
-        WKPageFooterHeightCallback                                          footerHeight;
-        WKPageDrawHeaderCallback                                            drawHeader;
-        WKPageDrawFooterCallback                                            drawFooter;
-        WKPagePrintFrameCallback                                            printFrame;
-        WKPageUIClientCallback                                              runModal;
-        void*                                                               unused1; // Used to be didCompleteRubberBandForMainFrame
-        WKPageSaveDataToFileInDownloadsFolderCallback                       saveDataToFileInDownloadsFolder;
-        void*                                                               shouldInterruptJavaScript_unavailable;
-
-        // Version 1.
-        WKPageCreateNewPageCallback_deprecatedForUseWithV1                  createNewPage;
-        WKPageMouseDidMoveOverElementCallback                               mouseDidMoveOverElement;
-        WKPageDecidePolicyForNotificationPermissionRequestCallback          decidePolicyForNotificationPermissionRequest;
-        WKPageUnavailablePluginButtonClickedCallback_deprecatedForUseWithV1 unavailablePluginButtonClicked_deprecatedForUseWithV1;
-
-        // Version 2.
-        WKPageShowColorPickerCallback                                       showColorPicker;
-        WKPageHideColorPickerCallback                                       hideColorPicker;
-        WKPageUnavailablePluginButtonClickedCallback                        unavailablePluginButtonClicked;
-
-        // Version 3.
-        WKPagePinnedStateDidChangeCallback                                  pinnedStateDidChange;
-
-        // Version 4.
-        WKPageRunJavaScriptAlertCallback_deprecatedForUseWithV5             runJavaScriptAlert;
-        WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV5           runJavaScriptConfirm;
-        WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV5            runJavaScriptPrompt;
-    };
-
-    const auto& botchedPageUIClient = reinterpret_cast<const BotchedWKPageUIClientV4&>(wkClient);
-
-    WKPageUIClientV5 fixedPageUIClient = {
-        { 5, botchedPageUIClient.base.clientInfo },
-        botchedPageUIClient.createNewPage_deprecatedForUseWithV0,
-        botchedPageUIClient.showPage,
-        botchedPageUIClient.close,
-        botchedPageUIClient.takeFocus,
-        botchedPageUIClient.focus,
-        botchedPageUIClient.unfocus,
-        botchedPageUIClient.runJavaScriptAlert_deprecatedForUseWithV0,
-        botchedPageUIClient.runJavaScriptConfirm_deprecatedForUseWithV0,
-        botchedPageUIClient.runJavaScriptPrompt_deprecatedForUseWithV0,
-        botchedPageUIClient.setStatusText,
-        botchedPageUIClient.mouseDidMoveOverElement_deprecatedForUseWithV0,
-        botchedPageUIClient.missingPluginButtonClicked_deprecatedForUseWithV0,
-        botchedPageUIClient.didNotHandleKeyEvent,
-        botchedPageUIClient.didNotHandleWheelEvent,
-        botchedPageUIClient.toolbarsAreVisible,
-        botchedPageUIClient.setToolbarsAreVisible,
-        botchedPageUIClient.menuBarIsVisible,
-        botchedPageUIClient.setMenuBarIsVisible,
-        botchedPageUIClient.statusBarIsVisible,
-        botchedPageUIClient.setStatusBarIsVisible,
-        botchedPageUIClient.isResizable,
-        botchedPageUIClient.setIsResizable,
-        botchedPageUIClient.getWindowFrame,
-        botchedPageUIClient.setWindowFrame,
-        botchedPageUIClient.runBeforeUnloadConfirmPanel,
-        botchedPageUIClient.didDraw,
-        botchedPageUIClient.pageDidScroll,
-        botchedPageUIClient.exceededDatabaseQuota,
-        botchedPageUIClient.runOpenPanel,
-        botchedPageUIClient.decidePolicyForGeolocationPermissionRequest,
-        botchedPageUIClient.headerHeight,
-        botchedPageUIClient.footerHeight,
-        botchedPageUIClient.drawHeader,
-        botchedPageUIClient.drawFooter,
-        botchedPageUIClient.printFrame,
-        botchedPageUIClient.runModal,
-        botchedPageUIClient.unused1,
-        botchedPageUIClient.saveDataToFileInDownloadsFolder,
-        botchedPageUIClient.shouldInterruptJavaScript_unavailable,
-        botchedPageUIClient.createNewPage,
-        botchedPageUIClient.mouseDidMoveOverElement,
-        botchedPageUIClient.decidePolicyForNotificationPermissionRequest,
-        botchedPageUIClient.unavailablePluginButtonClicked_deprecatedForUseWithV1,
-        botchedPageUIClient.showColorPicker,
-        botchedPageUIClient.hideColorPicker,
-        botchedPageUIClient.unavailablePluginButtonClicked,
-        botchedPageUIClient.pinnedStateDidChange,
-        nullptr,
-        nullptr,
-        nullptr,
-        nullptr,
-        nullptr,
-        nullptr,
-        botchedPageUIClient.runJavaScriptAlert,
-        botchedPageUIClient.runJavaScriptConfirm,
-        botchedPageUIClient.runJavaScriptPrompt,
-        nullptr,
-    };
-
-    WKPageSetPageUIClient(pageRef, &fixedPageUIClient.base);
-}
-#endif
-
 namespace WebKit {
 
 class RunBeforeUnloadConfirmPanelResultListener : public API::ObjectImpl<API::Object::Type::RunBeforeUnloadConfirmPanelResultListener> {
@@ -1689,13 +1555,6 @@ void WKPageRunJavaScriptPromptResultListenerCall(WKPageRunJavaScriptPromptResult
 
 void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient)
 {
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
-    if (wkClient && wkClient->version == 4) {
-        fixUpBotchedPageUIClient(pageRef, *wkClient);
-        return;
-    }
-#endif
-
     class UIClient : public API::Client<WKPageUIClientBase>, public API::UIClient {
     public:
         explicit UIClient(const WKPageUIClientBase* client)
index fd848cc..652c602 100644 (file)
@@ -169,9 +169,6 @@ void ChildProcessProxy::didFinishLaunching(ProcessLauncher*, IPC::Connection::Id
         return;
 
     m_connection = IPC::Connection::createServerConnection(connectionIdentifier, *this);
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
-    m_connection->setShouldCloseConnectionOnMachExceptions();
-#endif
 
     connectionWillOpen(*m_connection);
     m_connection->open();
index 7064159..3120b32 100644 (file)
@@ -236,11 +236,9 @@ void WebProcessPool::platformInitializeWebProcess(WebProcessCreationParameters&
             [(NSData *)data release];
         }, data.leakRef());
     }
-#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     parameters.networkATSContext = adoptCF(_CFNetworkCopyATSContext());
-#endif
 
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+#if PLATFORM(MAC)
     RetainPtr<CFDataRef> cookieStorageData = adoptCF(CFHTTPCookieStorageCreateIdentifyingData(kCFAllocatorDefault, [[NSHTTPCookieStorage sharedHTTPCookieStorage] _cookieStorage]));
     ASSERT(parameters.uiProcessCookieStorageIdentifier.isEmpty());
     parameters.uiProcessCookieStorageIdentifier.append(CFDataGetBytePtr(cookieStorageData.get()), CFDataGetLength(cookieStorageData.get()));
@@ -280,9 +278,7 @@ void WebProcessPool::platformInitializeNetworkProcess(NetworkProcessCreationPara
 
     parameters.httpProxy = [defaults stringForKey:WebKit2HTTPProxyDefaultsKey];
     parameters.httpsProxy = [defaults stringForKey:WebKit2HTTPSProxyDefaultsKey];
-#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     parameters.networkATSContext = adoptCF(_CFNetworkCopyATSContext());
-#endif
 
 #if ENABLE(NETWORK_CACHE)
     parameters.shouldEnableNetworkCache = isNetworkCacheEnabled();
@@ -298,7 +294,7 @@ void WebProcessPool::platformInitializeNetworkProcess(NetworkProcessCreationPara
     parameters.shouldSuppressMemoryPressureHandler = [defaults boolForKey:WebKitSuppressMemoryPressureHandlerDefaultsKey];
     parameters.loadThrottleLatency = Seconds { [defaults integerForKey:WebKitNetworkLoadThrottleLatencyMillisecondsDefaultsKey] / 1000. };
 
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+#if PLATFORM(MAC)
     RetainPtr<CFDataRef> cookieStorageData = adoptCF(CFHTTPCookieStorageCreateIdentifyingData(kCFAllocatorDefault, [[NSHTTPCookieStorage sharedHTTPCookieStorage] _cookieStorage]));
     ASSERT(parameters.uiProcessCookieStorageIdentifier.isEmpty());
     parameters.uiProcessCookieStorageIdentifier.append(CFDataGetBytePtr(cookieStorageData.get()), CFDataGetLength(cookieStorageData.get()));
@@ -599,9 +595,7 @@ void WebProcessPool::resetHSTSHostsAddedAfterDate(double startDateIntervalSince1
 {
     NSDate *startDate = [NSDate dateWithTimeIntervalSince1970:startDateIntervalSince1970];
     _CFNetworkResetHSTSHostsSinceDate(nullptr, (__bridge CFDateRef)startDate);
-#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     _CFNetworkResetHSTSHostsSinceDate(privateBrowsingSession(), (__bridge CFDateRef)startDate);
-#endif
 }
 
 void WebProcessPool::setCookieStoragePartitioningEnabled(bool enabled)
index ad468bb..4f80af2 100644 (file)
@@ -402,9 +402,7 @@ public:
     void registerDraggedTypes();
 #endif
 
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
     void startWindowDrag();
-#endif
 
     void dragImageForView(NSView *, NSImage *, CGPoint clientPoint, bool linkDrag);
     void setFileAndURLTypes(NSString *filename, NSString *extension, NSString *title, NSString *url, NSString *visibleURL, NSPasteboard *);
index 2986e53..91659e3 100644 (file)
@@ -1607,9 +1607,6 @@ void WebViewImpl::updateLayer()
     // udpate response if setFrameSize is called.
     if (frameSizeUpdatesDisabled())
         return;
-
-    if (DrawingAreaProxy* drawingArea = m_page->drawingArea())
-        drawingArea->waitForPossibleGeometryUpdate();
 }
 
 void WebViewImpl::drawRect(CGRect rect)
@@ -3767,12 +3764,10 @@ void WebViewImpl::registerDraggedTypes()
 }
 #endif // ENABLE(DRAG_SUPPORT)
 
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
 void WebViewImpl::startWindowDrag()
 {
     [m_view.window performWindowDragWithEvent:m_lastMouseDownEvent.get()];
 }
-#endif
 
 void WebViewImpl::dragImageForView(NSView *view, NSImage *image, CGPoint clientPoint, bool)
 {
index 5a8a9b7..e96cf73 100644 (file)
@@ -72,8 +72,6 @@ public:
     // The timeout we use when waiting for a DidUpdateGeometry message.
     static constexpr Seconds didUpdateBackingStoreStateTimeout() { return Seconds::fromMilliseconds(500); }
 
-    virtual void waitForPossibleGeometryUpdate(Seconds = didUpdateBackingStoreStateTimeout()) { }
-
     virtual void colorSpaceDidChange() { }
     virtual void minimumLayoutSizeDidChange() { }
 
index 6fc7a5c..17ede82 100644 (file)
@@ -218,9 +218,6 @@ void PluginProcessProxy::didFinishLaunching(ProcessLauncher*, IPC::Connection::I
     }
 
     m_connection = IPC::Connection::createServerConnection(connectionIdentifier, *this);
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
-    m_connection->setShouldCloseConnectionOnMachExceptions();
-#endif
 
     m_connection->open();
     
index 70806c1..01a52e3 100644 (file)
@@ -87,11 +87,6 @@ public:
 #if PLATFORM(COCOA)
     void setProcessSuppressionEnabled(bool);
 
-#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
-    // Creates a property list in ~/Library/Preferences that contains all the MIME types supported by the plug-in.
-    static bool createPropertyListFile(const PluginModuleInfo&);
-#endif
-
 #endif
 
 #if PLUGIN_ARCHITECTURE(X11)
index cea663b..b1d7f4f 100644 (file)
@@ -59,42 +59,6 @@ using namespace WebCore;
 
 namespace WebKit {
     
-#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
-bool PluginProcessProxy::createPropertyListFile(const PluginModuleInfo& plugin)
-{
-    CString pluginPathString = fileSystemRepresentation(plugin.path);
-
-    posix_spawnattr_t attr;
-    posix_spawnattr_init(&attr);
-
-    cpu_type_t cpuTypes[] = { plugin.pluginArchitecture };    
-    size_t outCount = 0;
-    posix_spawnattr_setbinpref_np(&attr, 1, cpuTypes, &outCount);
-
-    posix_spawnattr_setflags(&attr, POSIX_SPAWN_CLOEXEC_DEFAULT);
-
-    const char* args[] = { "/System/Library/Frameworks/WebKit.framework/PluginProcess.app/Contents/MacOS/PluginProcess", "/System/Library/Frameworks/WebKit.framework/WebKit", "-type", "pluginprocess", "-createPluginMIMETypesPreferences", pluginPathString.data(), 0 };
-
-    pid_t pid;
-    int result = posix_spawn(&pid, args[0], 0, &attr, const_cast<char* const*>(args), nullptr);
-    posix_spawnattr_destroy(&attr);
-
-    if (result)
-        return false;
-    int status;
-    if (waitpid(pid, &status, 0) < 0)
-        return false;
-
-    if (!WIFEXITED(status))
-        return false;
-
-    if (WEXITSTATUS(status) != EXIT_SUCCESS)
-        return false;
-
-    return true;
-}
-#endif
-
 void PluginProcessProxy::platformGetLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions, const PluginProcessAttributes& pluginProcessAttributes)
 {
     if (pluginProcessAttributes.moduleInfo.pluginArchitecture == CPU_TYPE_X86)
@@ -120,9 +84,7 @@ void PluginProcessProxy::platformInitializePluginProcess(PluginProcessCreationPa
 #if HAVE(HOSTED_CORE_ANIMATION)
     parameters.acceleratedCompositingPort = MachSendRight::create([CARemoteLayerServer sharedServer].serverPort);
 #endif
-#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     parameters.networkATSContext = adoptCF(_CFNetworkCopyATSContext());
-#endif
 }
 
 bool PluginProcessProxy::getPluginProcessSerialNumber(ProcessSerialNumber& pluginProcessSerialNumber)
index e0c12f9..c15fa5c 100644 (file)
@@ -1294,7 +1294,7 @@ void WebPageProxy::setTopContentInset(float contentInset)
 
     if (!isValid())
         return;
-#if HAVE(COREANIMATION_FENCES)
+#if PLATFORM(COCOA)
     MachSendRight fence = m_drawingArea->createFence();
 
     auto fenceAttachment = IPC::Attachment(fence.leakSendRight(), MACH_MSG_TYPE_MOVE_SEND);
index 7f4fbf4..76d29c9 100644 (file)
@@ -416,14 +416,12 @@ IntRect PageClientImpl::rootViewToScreen(const IntRect& rect)
     return enclosingIntRect(tempRect);
 }
 
-#if PLATFORM(MAC)
 IntRect PageClientImpl::rootViewToWindow(const WebCore::IntRect& rect)
 {
     NSRect tempRect = rect;
     tempRect = [m_view convertRect:tempRect toView:nil];
     return enclosingIntRect(tempRect);
 }
-#endif
 
 void PageClientImpl::doneWithKeyEvent(const NativeWebKeyboardEvent& event, bool eventWasHandled)
 {
@@ -841,9 +839,7 @@ void PageClientImpl::derefView()
 
 void PageClientImpl::startWindowDrag()
 {
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
     m_impl->startWindowDrag();
-#endif
 }
 
 NSWindow *PageClientImpl::platformWindow()
index 263af8f..ef5711c 100644 (file)
@@ -221,9 +221,7 @@ void RemoteWebInspectorProxy::platformAppend(const String& suggestedURL, const S
 
 void RemoteWebInspectorProxy::platformStartWindowDrag()
 {
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
     m_webView->_page->startWindowDrag();
-#endif
 }
 
 void RemoteWebInspectorProxy::platformOpenInNewTab(const String& url)
index da0c3e0..4ccf564 100644 (file)
@@ -40,7 +40,6 @@ private:
     // DrawingAreaProxy
     void deviceScaleFactorDidChange() override;
     void sizeDidChange() override;
-    void waitForPossibleGeometryUpdate(Seconds timeout = didUpdateBackingStoreStateTimeout()) override;
     void colorSpaceDidChange() override;
     void minimumLayoutSizeDidChange() override;
 
index be89e53..010d773 100644 (file)
@@ -71,19 +71,6 @@ void TiledCoreAnimationDrawingAreaProxy::sizeDidChange()
     sendUpdateGeometry();
 }
 
-void TiledCoreAnimationDrawingAreaProxy::waitForPossibleGeometryUpdate(Seconds timeout)
-{
-#if !HAVE(COREANIMATION_FENCES)
-    if (!m_isWaitingForDidUpdateGeometry)
-        return;
-
-    if (m_webPageProxy.process().state() != WebProcessProxy::State::Running)
-        return;
-
-    m_webPageProxy.process().connection()->waitForAndDispatchImmediately<Messages::DrawingAreaProxy::DidUpdateGeometry>(m_webPageProxy.pageID(), timeout, IPC::WaitForOption::InterruptWaitingIfSyncMessageArrives);
-#endif
-}
-
 void TiledCoreAnimationDrawingAreaProxy::colorSpaceDidChange()
 {
     m_webPageProxy.process().send(Messages::DrawingArea::SetColorSpace(m_webPageProxy.colorSpace()), m_webPageProxy.pageID());
@@ -153,7 +140,6 @@ void TiledCoreAnimationDrawingAreaProxy::willSendUpdateGeometry()
 
 MachSendRight TiledCoreAnimationDrawingAreaProxy::createFence()
 {
-#if HAVE(COREANIMATION_FENCES)
     if (!m_webPageProxy.isValid())
         return MachSendRight();
 
@@ -189,9 +175,6 @@ MachSendRight TiledCoreAnimationDrawingAreaProxy::createFence()
     } forPhase:kCATransactionPhasePostCommit];
 
     return fencePort;
-#else
-    return MachSendRight();
-#endif
 }
 
 void TiledCoreAnimationDrawingAreaProxy::sendUpdateGeometry()
index 2c457c7..d84a93c 100644 (file)
@@ -229,12 +229,10 @@ RetainPtr<NSWindow> WebInspectorProxy::createFrontendWindow(NSRect savedWindowFr
     [window setReleasedWhenClosed:NO];
     [window setCollectionBehavior:([window collectionBehavior] | NSWindowCollectionBehaviorFullScreenPrimary)];
 
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
     CGFloat approximatelyHalfScreenSize = ([window screen].frame.size.width / 2) - 4;
     CGFloat minimumFullScreenWidth = std::max<CGFloat>(636, approximatelyHalfScreenSize);
     [window setMinFullScreenContentSize:NSMakeSize(minimumFullScreenWidth, minimumWindowHeight)];
     [window setCollectionBehavior:([window collectionBehavior] | NSWindowCollectionBehaviorFullScreenAllowsTiling)];
-#endif
 
     [window setTitlebarAppearsTransparent:YES];
 
@@ -687,9 +685,7 @@ void WebInspectorProxy::platformSetAttachedWindowWidth(unsigned width)
 
 void WebInspectorProxy::platformStartWindowDrag()
 {
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
     m_inspectorView->_page->startWindowDrag();
-#endif
 }
 
 String WebInspectorProxy::inspectorPageURL()
index 4f72df1..671b254 100644 (file)
@@ -112,9 +112,7 @@ void WebPopupMenuProxyMac::showPopupMenu(const IntRect& rect, TextDirection text
     [m_popup setUserInterfaceLayoutDirection:textDirection == LTR ? NSUserInterfaceLayoutDirectionLeftToRight : NSUserInterfaceLayoutDirectionRightToLeft];
 
     NSMenu *menu = [m_popup menu];
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
     [menu setUserInterfaceLayoutDirection:textDirection == LTR ? NSUserInterfaceLayoutDirectionLeftToRight : NSUserInterfaceLayoutDirectionRightToLeft];
-#endif
 
     // These values were borrowed from AppKit to match their placement of the menu.
     const int popOverHorizontalAdjust = -13;
index c8fcb8c..cd00f23 100644 (file)
                1A66BF8E18A052ED002071B4 /* WKWebViewInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebViewInternal.h; sourceTree = "<group>"; };
                1A67CD2D1CBC513F00BFE3EA /* WKOpenPanelParametersInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKOpenPanelParametersInternal.h; sourceTree = "<group>"; };
                1A698F171E4910220064E881 /* ChildProcessCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ChildProcessCocoa.mm; sourceTree = "<group>"; };
-               1A6D141F1B0167D500785FF0 /* Info-OSX-10.9-10.10.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Info-OSX-10.9-10.10.plist"; sourceTree = "<group>"; };
-               1A6D14211B01681600785FF0 /* PluginService.32-64-10.9-10.10.Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "PluginService.32-64-10.9-10.10.Info.plist"; path = "PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist"; sourceTree = SOURCE_ROOT; };
                1A6D86BF1DF75265007745E8 /* MachMessage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MachMessage.cpp; sourceTree = "<group>"; };
                1A6D86C01DF75265007745E8 /* MachMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MachMessage.h; sourceTree = "<group>"; };
                1A6FA21D1BD0435B00AAA650 /* WKFrameInfoPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKFrameInfoPrivate.h; sourceTree = "<group>"; };
                1A7865B816CAC71500ACE83A /* PluginProcessConnectionManagerMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginProcessConnectionManagerMessages.h; sourceTree = "<group>"; };
                1A7C0DF41B7D1F1000A9B848 /* WKWindowFeaturesRef.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKWindowFeaturesRef.cpp; sourceTree = "<group>"; };
                1A7C0DF51B7D1F1000A9B848 /* WKWindowFeaturesRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWindowFeaturesRef.h; sourceTree = "<group>"; };
-               1A7DA54D1AFD8B380018239D /* Info-OSX-10.9-10.10.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Info-OSX-10.9-10.10.plist"; sourceTree = "<group>"; };
                1A7E377418E4A33A003D0FFF /* WKScriptMessageHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKScriptMessageHandler.h; sourceTree = "<group>"; };
                1A7E377618E4A4FE003D0FFF /* WKScriptMessage.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKScriptMessage.mm; sourceTree = "<group>"; };
                1A7E377718E4A4FE003D0FFF /* WKScriptMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKScriptMessage.h; sourceTree = "<group>"; };
                        isa = PBXGroup;
                        children = (
                                26659AA0185FAAED004303DD /* Info-iOS.plist */,
-                               1A6D141F1B0167D500785FF0 /* Info-OSX-10.9-10.10.plist */,
                                BC8283A316B4BD9100A278FE /* Info-OSX.plist */,
                        );
                        path = NetworkService;
                BC8283E916B4F8E200A278FE /* PluginService */ = {
                        isa = PBXGroup;
                        children = (
-                               1A6D14211B01681600785FF0 /* PluginService.32-64-10.9-10.10.Info.plist */,
                                BCFCA89516DE96CB00074069 /* PluginService.32-64.Info.plist */,
                        );
                        name = PluginService;
                        isa = PBXGroup;
                        children = (
                                375FB4731883415600BE34D4 /* Info-iOS.plist */,
-                               1A7DA54D1AFD8B380018239D /* Info-OSX-10.9-10.10.plist */,
                                BCACC44016B24CAA00B6E092 /* Info-OSX.plist */,
                        );
                        path = WebContentService;
diff --git a/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist b/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist
deleted file mode 100644 (file)
index b9558ce..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>CFBundleFollowParentLocalization</key>
-       <true/>
-       <key>CFBundleGetInfoString</key>
-       <string>${BUNDLE_VERSION}, Copyright 2003-2017 Apple Inc.</string>
-       <key>CFBundleDevelopmentRegion</key>
-       <string>English</string>
-       <key>CFBundleExecutable</key>
-       <string>${EXECUTABLE_NAME}</string>
-       <key>CFBundleIdentifier</key>
-       <string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
-       <key>CFBundleInfoDictionaryVersion</key>
-       <string>6.0</string>
-       <key>CFBundleName</key>
-       <string>${PRODUCT_NAME}</string>
-       <key>CFBundlePackageType</key>
-       <string>XPC!</string>
-       <key>CFBundleShortVersionString</key>
-       <string>${SHORT_VERSION_STRING}</string>
-       <key>CFBundleSignature</key>
-       <string>????</string>
-       <key>CFBundleVersion</key>
-       <string>${BUNDLE_VERSION}</string>
-       <key>LSFileQuarantineEnabled</key>
-       <true/>
-       <key>NSPrincipalClass</key>
-       <string>NSApplication</string>
-       <key>WebKitEntryPoint</key>
-       <string>WebContentServiceInitializer</string>
-       <key>LSUIElement</key>
-       <true/>
-       <key>NSSupportsAutomaticGraphicsSwitching</key>
-       <true/>
-       <key>NSSupportsAppNap</key>
-       <true/>
-       <key>NSMainNibFile</key>
-       <string>WebContentProcess</string>
-       <key>XPCService</key>
-       <dict>
-               <key>JoinExistingSession</key>
-               <true/>
-               <key>ServiceType</key>
-               <string>Application</string>
-               <key>RunLoopType</key>
-               <string>_NSApplicationMain</string>
-               <key>_MultipleInstances</key>
-               <true/>
-               <key>EnvironmentVariables</key>
-               <dict>
-                       <key>DYLD_INSERT_LIBRARIES</key>
-                       <string>$(WK_XPC_SERVICE_INSERT_LIBRARIES_DIR)/WebProcessShim.dylib</string>
-               </dict>
-       </dict>
-</dict>
-</plist>
index 1314977..e00e844 100644 (file)
@@ -2575,7 +2575,7 @@ void WebPage::setDrawsBackground(bool drawsBackground)
     m_drawingArea->setNeedsDisplay();
 }
 
-#if HAVE(COREANIMATION_FENCES)
+#if PLATFORM(COCOA)
 void WebPage::setTopContentInsetFenced(float contentInset, IPC::Attachment fencePort)
 {
     m_drawingArea->addFence(MachSendRight::create(fencePort.port()));
index bf4bcea..c72e579 100644 (file)
@@ -1098,7 +1098,7 @@ private:
 
     void setDrawsBackground(bool);
 
-#if HAVE(COREANIMATION_FENCES)
+#if PLATFORM(COCOA)
     void setTopContentInsetFenced(float, IPC::Attachment);
 #endif
     void setTopContentInset(float);
index ac93f2b..9c13ea6 100644 (file)
@@ -27,7 +27,7 @@ messages -> WebPage LegacyReceiver {
 
     SetDrawsBackground(bool drawsBackground)
 
-#if HAVE(COREANIMATION_FENCES)
+#if PLATFORM(COCOA)
     SetTopContentInsetFenced(float contentInset, IPC::Attachment fencePort)
 #endif
     SetTopContentInset(float contentInset)
index b29caa6..50afd68 100644 (file)
@@ -780,11 +780,7 @@ static void addAnimationToLayer(CALayer *layer, RemoteLayerTreeHost* layerTreeHo
                 [springAnimation setMass:function.mass()];
                 [springAnimation setStiffness:function.stiffness()];
                 [springAnimation setDamping:function.damping()];
-#if PLATFORM(IOS) || PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
                 [springAnimation setInitialVelocity:function.initialVelocity()];
-#else
-                [springAnimation setVelocity:function.initialVelocity()];
-#endif
             }
         }
         caAnimation = springAnimation;
index 9c2e73a..2ff4623 100644 (file)
@@ -346,7 +346,6 @@ void RemoteLayerTreeDrawingArea::flushLayers()
     if (m_scrolledViewExposedRect)
         visibleRect.intersect(m_scrolledViewExposedRect.value());
 
-#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     RefPtr<WebPage> retainedPage = &m_webPage;
     [CATransaction addCommitHandler:[retainedPage] {
         if (Page* corePage = retainedPage->corePage()) {
@@ -354,7 +353,6 @@ void RemoteLayerTreeDrawingArea::flushLayers()
                 corePage->inspectorController().didComposite(*coreFrame);
         }
     } forPhase:kCATransactionPhasePostCommit];
-#endif
 
     m_webPage.mainFrameView()->flushCompositingStateIncludingSubframes();
 
index 1b30b53..1e79ddd 100644 (file)
@@ -428,7 +428,6 @@ bool TiledCoreAnimationDrawingArea::flushLayers()
             m_viewOverlayRootLayer->flushCompositingState(visibleRect);
 
         RefPtr<WebPage> retainedPage = &m_webPage;
-#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
         [CATransaction addCommitHandler:[retainedPage] {
             if (Page* corePage = retainedPage->corePage()) {
                 if (Frame* coreFrame = retainedPage->mainFrame())
@@ -437,12 +436,6 @@ bool TiledCoreAnimationDrawingArea::flushLayers()
             if (auto drawingArea = static_cast<TiledCoreAnimationDrawingArea*>(retainedPage->drawingArea()))
                 drawingArea->sendPendingNewlyReachedLayoutMilestones();
         } forPhase:kCATransactionPhasePostCommit];
-#else
-        dispatch_async(dispatch_get_main_queue(), [retainedPage] {
-            if (auto drawingArea = static_cast<TiledCoreAnimationDrawingArea*>(retainedPage->drawingArea()))
-                drawingArea->sendPendingNewlyReachedLayoutMilestones();
-        });
-#endif
 
         bool returnValue = m_webPage.mainFrameView()->flushCompositingStateIncludingSubframes();
 #if ENABLE(ASYNC_SCROLLING)
@@ -567,21 +560,14 @@ void TiledCoreAnimationDrawingArea::updateGeometry(const IntSize& viewSize, cons
 
     [CATransaction commit];
 
-    if (flushSynchronously) {
+    if (flushSynchronously)
         [CATransaction flush];
-#if !HAVE(COREANIMATION_FENCES)
-        // We can't synchronize here if we're using fences or we'll blow the fence every time (and we don't need to).
-        [CATransaction synchronize];
-#endif
-    }
 
     m_webPage.send(Messages::DrawingAreaProxy::DidUpdateGeometry());
 
     m_inUpdateGeometry = false;
 
-#if HAVE(COREANIMATION_FENCES)
     m_layerHostingContext->setFencePort(fencePort.sendRight());
-#endif
 }
 
 void TiledCoreAnimationDrawingArea::setDeviceScaleFactor(float deviceScaleFactor)
index b8298ae..6d4d6a3 100644 (file)
@@ -137,7 +137,7 @@ void WebProcess::platformInitializeWebProcess(WebProcessCreationParameters&& par
         JSC::processConfigFile(javaScriptConfigFile.latin1().data(), "com.apple.WebKit.WebContent", parameters.uiProcessBundleIdentifier.latin1().data());
     }
 
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+#if PLATFORM(MAC)
     setSharedHTTPCookieStorage(parameters.uiProcessCookieStorageIdentifier);
 #endif
 
@@ -163,9 +163,7 @@ void WebProcess::platformInitializeWebProcess(WebProcessCreationParameters&& par
     Method methodToPatch = class_getInstanceMethod([NSApplication class], @selector(accessibilityFocusedUIElement));
     method_setImplementation(methodToPatch, (IMP)NSApplicationAccessibilityFocusedUIElement);
 #endif
-#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     _CFNetworkSetATSContext(parameters.networkATSContext.get());
-#endif
 
 #if TARGET_OS_IPHONE
     // Priority decay on iOS 9 is impacting page load time so we fix the priority of the WebProcess' main thread (rdar://problem/22003112).
index 7ee963f..e584ade 100644 (file)
@@ -35,7 +35,6 @@
 (allow process-codesigning-status*)
 #endif
 
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
 (deny sysctl*)
 (allow sysctl-read
     (sysctl-name
     (iokit-property "startup-timing")
     (iokit-property "touch-size-id")
 )
-#endif
 
 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
 (deny mach-lookup (xpc-service-name-prefix ""))
        (global-name "com.apple.SystemConfiguration.configd")
        (global-name "com.apple.SystemConfiguration.PPPController")
        (global-name "com.apple.audio.SystemSoundServer-OSX")
-#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101100
-       (global-name "com.apple.audio.VDCAssistant")
-#endif
 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
        (global-name "com.apple.analyticsd")
 #endif
 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
        (global-name "com.apple.mediaremoted.xpc")
 #endif
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
        (global-name "com.apple.lsd.mapdb")
        (global-name "com.apple.nesessionmanager.flow-divert-token")
-#endif
        (global-name "com.apple.speech.speechsynthesisd")
        (global-name "com.apple.speech.synthesis.console")
        (global-name "com.apple.system.opendirectoryd.api")
index 23c56f1..b57295b 100644 (file)
@@ -1,3 +1,13 @@
+2017-07-01  Dan Bernstein  <mitz@apple.com>
+
+        [macOS] Remove code only needed when building for OS X Yosemite
+        https://bugs.webkit.org/show_bug.cgi?id=174067
+
+        Reviewed by Tim Horton.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+
 2017-06-30  Ryosuke Niwa  <rniwa@webkit.org>
 
         Ran sort-Xcode-project-file.
index 4b9bfd9..0b77f80 100644 (file)
@@ -86,7 +86,6 @@ PREBINDING = NO;
 WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough;
 
 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
-TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
 TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
 TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
 TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
index cdf3f71..58192a0 100644 (file)
@@ -29,7 +29,6 @@ ONLY_ACTIVE_ARCH = YES;
 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
 MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
 MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
 MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
index 10f346c..66fc34b 100644 (file)
@@ -1,3 +1,36 @@
+2017-07-01  Dan Bernstein  <mitz@apple.com>
+
+        [macOS] Remove code only needed when building for OS X Yosemite
+        https://bugs.webkit.org/show_bug.cgi?id=174067
+
+        Reviewed by Tim Horton.
+
+        * DumpRenderTree/mac/Configurations/Base.xcconfig:
+        * DumpRenderTree/mac/Configurations/DebugRelease.xcconfig:
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        (setDefaultsToConsistentValuesForTesting):
+        * DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm:
+        (-[DumpRenderTreeDraggingInfo resetSpringLoading]):
+        * MiniBrowser/Configurations/Base.xcconfig:
+        * MiniBrowser/Configurations/DebugRelease.xcconfig:
+        * TestWebKitAPI/Configurations/Base.xcconfig:
+        * TestWebKitAPI/Configurations/DebugRelease.xcconfig:
+        * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+        * TestWebKitAPI/Tests/WebCore/ComplexTextController.cpp:
+        (TestWebKitAPI::TEST_F):
+        * TestWebKitAPI/Tests/WebCore/cocoa/WebCoreNSURLSession.mm:
+        * TestWebKitAPI/Tests/mac/DragAndDropPasteboardTests.mm:
+        * TestWebKitAPI/Tests/mac/FullscreenZoomInitialFrame.mm:
+        (TestWebKitAPI::TEST_F):
+        * TestWebKitAPI/Tests/mac/StringTruncator.mm:
+        (TestWebKitAPI::TEST):
+        * WebKitTestRunner/Configurations/Base.xcconfig:
+        * WebKitTestRunner/Configurations/DebugRelease.xcconfig:
+        * WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm:
+        (WTR::InjectedBundle::platformInitialize):
+        * WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.mm:
+        (-[WebKitTestRunnerDraggingInfo resetSpringLoading]):
+
 2017-07-01  Chris Dumez  <cdumez@apple.com>
 
         Replace ResourceLoadStatisticsStore C API with Cocoa SPI
index a52c094..17cd893 100644 (file)
@@ -82,7 +82,6 @@ DEBUG_DEFINES_normal = NDEBUG;
 DEBUG_DEFINES = $(DEBUG_DEFINES_$(CURRENT_VARIANT));
 
 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
-TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
 TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
 TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
 TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
index f72d110..ae2d8ef 100644 (file)
@@ -30,7 +30,6 @@ ONLY_ACTIVE_ARCH = YES;
 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
 
 MACOSX_DEPLOYMENT_TARGET[sdk=macosx*] = $(MACOSX_DEPLOYMENT_TARGET_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
 MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
 MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
 MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
@@ -39,7 +38,6 @@ MACOSX_DEPLOYMENT_TARGET_macosx_101400 = 10.14;
 WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphoneos*] = WebKitSystemInterfaceIOSDevice$(WK_TARGET_IOS_VERSION_MAJOR);
 WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphonesimulator*] = WebKitSystemInterfaceIOSSimulator$(WK_TARGET_IOS_VERSION_MAJOR);
 WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=macosx*] = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000 = WebKitSystemInterfaceYosemite;
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101100 = WebKitSystemInterfaceElCapitan;
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101200 = WebKitSystemInterfaceOSX10.12;
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101300 = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101200);
index 280eb7e..0db42df 100644 (file)
@@ -1023,7 +1023,7 @@ static void setDefaultsToConsistentValuesForTesting()
         @"NSOverlayScrollersEnabled": @NO,
         @"AppleShowScrollBars": @"Always",
         @"NSButtonAnimationsEnabled": @NO, // Ideally, we should find a way to test animations, but for now, make sure that the dumped snapshot matches actual state.
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100 && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200
         @"AppleSystemFontOSSubversion": @(10),
 #endif
         @"NSWindowDisplayWithRunLoopObserver": @YES, // Temporary workaround, see <rdar://problem/20351297>.
@@ -1043,7 +1043,7 @@ static void setDefaultsToConsistentValuesForTesting()
         WebStorageDirectoryDefaultsKey: [libraryPath stringByAppendingPathComponent:@"LocalStorage"],
         WebKitLocalCacheDefaultsKey: [libraryPath stringByAppendingPathComponent:@"LocalCache"],
         WebKitResourceLoadStatisticsDirectoryDefaultsKey: [libraryPath stringByAppendingPathComponent:@"LocalStorage"],
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100 && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200
         // This needs to also be added to argument domain because of <rdar://problem/20210002>.
         @"AppleSystemFontOSSubversion": @(10),
 #endif
index 6337692..f219d79 100644 (file)
     // Ignored.
 }
 
-#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101100
 -(NSSpringLoadingHighlight)springLoadingHighlight
 {
     return NSSpringLoadingHighlightNone;
 - (void)resetSpringLoading
 {
 }
-#endif
 
 @end
 
index 4f71c5d..850d2dc 100644 (file)
@@ -60,7 +60,6 @@ GCC_NO_COMMON_BLOCKS = YES;
 SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx tvos tvsimulator watchos watchsimulator;
 
 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
-TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
 TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
 TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
 TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
index 2357d0c..3a87df0 100644 (file)
@@ -30,7 +30,6 @@ ONLY_ACTIVE_ARCH = YES;
 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
-MACOSX_DEPLOYMENT_TARGET_101000 = 10.10;
 MACOSX_DEPLOYMENT_TARGET_101100 = 10.11;
 MACOSX_DEPLOYMENT_TARGET_101200 = 10.12;
 MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
index 06b55c8..7b863dc 100644 (file)
@@ -73,7 +73,6 @@ DEBUG_DEFINES = $(DEBUG_DEFINES_$(CURRENT_VARIANT));
 SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
 
 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
-TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
 TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
 TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
 TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
index b663dc2..8e3c7c6 100644 (file)
@@ -30,7 +30,6 @@ ONLY_ACTIVE_ARCH = YES;
 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
-MACOSX_DEPLOYMENT_TARGET_101000 = 10.10;
 MACOSX_DEPLOYMENT_TARGET_101100 = 10.11;
 MACOSX_DEPLOYMENT_TARGET_101200 = 10.12;
 MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
index 77ff8ac..9e56e68 100644 (file)
 // Set any ENABLE_FEATURE_NAME macro to an empty string to disable that feature.
 
 TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101000 = YES;
 TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101100 = YES;
 
 TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101000 = YES;
 TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101100 = YES;
 TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101200 = YES;
 
index 680dac0..8af8158 100644 (file)
@@ -53,13 +53,8 @@ TEST_F(ComplexTextControllerTest, InitialAdvanceWithLeftRunInRTL)
     font.update();
     auto spaceWidth = font.primaryFont().spaceWidth();
 
-#if USE_LAYOUT_SPECIFIC_ADVANCES
     Vector<FloatSize> advances = { FloatSize(), FloatSize(21.640625, 0.0), FloatSize(42.3046875, 0.0), FloatSize(55.8984375, 0.0), FloatSize(22.34375, 0.0) };
     Vector<FloatPoint> origins = { FloatPoint(-15.15625, 18.046875), FloatPoint(), FloatPoint(), FloatPoint(), FloatPoint() };
-#else
-    Vector<FloatSize> advances = { FloatSize(15.15625, -18.046875), FloatSize(21.640625, 0.0), FloatSize(42.3046875, 0.0), FloatSize(55.8984375, 0.0), FloatSize(22.34375, 0.0) };
-    Vector<FloatPoint> origins = { };
-#endif
 
     FloatSize initialAdvance = FloatSize(-15.15625, 18.046875);
 
@@ -104,13 +99,8 @@ TEST_F(ComplexTextControllerTest, InitialAdvanceInRTL)
     FontCascade font(description);
     font.update();
 
-#if USE_LAYOUT_SPECIFIC_ADVANCES
     Vector<FloatSize> advances = { FloatSize(), FloatSize(21.640625, 0.0), FloatSize(42.3046875, 0.0), FloatSize(55.8984375, 0.0), FloatSize(22.34375, 0.0) };
     Vector<FloatPoint> origins = { FloatPoint(-15.15625, 18.046875), FloatPoint(), FloatPoint(), FloatPoint(), FloatPoint() };
-#else
-    Vector<FloatSize> advances = { FloatSize(15.15625, -18.046875), FloatSize(21.640625, 0.0), FloatSize(42.3046875, 0.0), FloatSize(55.8984375, 0.0), FloatSize(22.34375, 0.0) };
-    Vector<FloatPoint> origins = { };
-#endif
 
     FloatSize initialAdvance = FloatSize(-15.15625, 18.046875);
 
@@ -154,13 +144,8 @@ TEST_F(ComplexTextControllerTest, InitialAdvanceWithLeftRunInLTR)
     font.update();
     auto spaceWidth = font.primaryFont().spaceWidth();
 
-#if USE_LAYOUT_SPECIFIC_ADVANCES
     Vector<FloatSize> advances = { FloatSize(76.347656, 0.000000), FloatSize(0.000000, 0.000000) };
     Vector<FloatPoint> origins = { FloatPoint(), FloatPoint(-23.281250, -8.398438) };
-#else
-    Vector<FloatSize> advances = { FloatSize(53.066406, -8.398438), FloatSize(23.281250, 8.398438) };
-    Vector<FloatPoint> origins = { };
-#endif
 
     FloatSize initialAdvance = FloatSize(28.144531, 0);
 
@@ -201,13 +186,8 @@ TEST_F(ComplexTextControllerTest, InitialAdvanceInLTR)
     FontCascade font(description);
     font.update();
 
-#if USE_LAYOUT_SPECIFIC_ADVANCES
     Vector<FloatSize> advances = { FloatSize(76.347656, 0.000000), FloatSize(0.000000, 0.000000) };
     Vector<FloatPoint> origins = { FloatPoint(), FloatPoint(-23.281250, -8.398438) };
-#else
-    Vector<FloatSize> advances = { FloatSize(53.066406, -8.398438), FloatSize(23.281250, 8.398438) };
-    Vector<FloatPoint> origins = { };
-#endif
 
     FloatSize initialAdvance = FloatSize(28.144531, 0);
 
@@ -364,11 +344,7 @@ TEST_F(ComplexTextControllerTest, TotalWidthWithJustification)
     font.update();
 
     Vector<FloatSize> advances = { FloatSize(1, 0), FloatSize(2, 0), FloatSize(4, 0), FloatSize(8, 0), FloatSize(16, 0) };
-#if USE_LAYOUT_SPECIFIC_ADVANCES
     Vector<FloatPoint> origins = { FloatPoint(), FloatPoint(), FloatPoint(), FloatPoint(), FloatPoint() };
-#else
-    Vector<FloatPoint> origins = { };
-#endif
 
     FloatSize initialAdvance = FloatSize();
 
index c371fe3..d7c3e33 100644 (file)
@@ -25,7 +25,7 @@
 
 #import "config.h"
 
-#if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+#if !PLATFORM(IOS)
 
 #import "PlatformUtilities.h"
 #import <JavaScriptCore/InitializeThreading.h>
index f17b15f..0b881a0 100644 (file)
 {
 }
 
-#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101100
-
 - (NSSpringLoadingHighlight)springLoadingHighlight
 {
     return NSSpringLoadingHighlightNone;
 {
 }
 
-#endif
-
 @end
 
 namespace TestWebKitAPI {
index 61046ee..d8e3579 100644 (file)
@@ -189,12 +189,8 @@ TEST_F(FullscreenZoomInitialFrame, WebKit)
     runWebKit1Test();
 }
 
-#if __MAC_OS_X_VERSION_MIN_REQUIRED > 101000
 // FIXME:<rdar://problem/20504403>
 TEST_F(FullscreenZoomInitialFrame, DISABLED_WebKit2)
-#else
-TEST_F(FullscreenZoomInitialFrame, WebKit2)
-#endif
 {
     runWebKit2Test();
 }
index 354d1dd..c86e8e5 100644 (file)
@@ -35,11 +35,7 @@ TEST(WebKit1, StringTruncator)
     @autoreleasepool {
         EXPECT_EQ(nil, [WebStringTruncator centerTruncateString:@"abcdefghijklmnopqrstuvwxyz" toWidth:100 withFont:nil]);
         EXPECT_STREQ([[WebStringTruncator centerTruncateString:@"abcdefghijklmnopqrstuvwxyz" toWidth:100 withFont:[NSFont fontWithName:@"Helvetica" size:12]] UTF8String], "abcdefg…tuvwxyz");
-#if __MAC_OS_X_VERSION_MIN_REQUIRED > 101000
         EXPECT_STREQ([[WebStringTruncator centerTruncateString:@"abcdefghijklmnopqrstuvwxyz" toWidth:100] UTF8String], "abcdef…uvwxyz");
-#else
-        EXPECT_STREQ([[WebStringTruncator centerTruncateString:@"abcdefghijklmnopqrstuvwxyz" toWidth:100] UTF8String], "abcdef…vwxyz");
-#endif
         EXPECT_EQ(nil, [WebStringTruncator rightTruncateString:@"abcdefghijklmnopqrstuvwxyz" toWidth:100 withFont:nil]);
         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 881e6d5..00eb26d 100644 (file)
@@ -56,7 +56,6 @@ DEBUG_DEFINES_normal = NDEBUG;
 DEBUG_DEFINES = $(DEBUG_DEFINES_$(CURRENT_VARIANT));
 
 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
-TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
 TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
 TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
 TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
index c8f3e96..088670a 100644 (file)
@@ -30,7 +30,6 @@ ONLY_ACTIVE_ARCH = YES;
 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
-MACOSX_DEPLOYMENT_TARGET_101000 = 10.10;
 MACOSX_DEPLOYMENT_TARGET_101100 = 10.11;
 MACOSX_DEPLOYMENT_TARGET_101200 = 10.12;
 MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
@@ -39,7 +38,6 @@ MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
 WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphoneos*] = WebKitSystemInterfaceIOSDevice$(WK_TARGET_IOS_VERSION_MAJOR);
 WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphonesimulator*] = WebKitSystemInterfaceIOSSimulator$(WK_TARGET_IOS_VERSION_MAJOR);
 WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=macosx*] = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000 = WebKitSystemInterfaceYosemite;
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101100 = WebKitSystemInterfaceElCapitan;
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101200 = WebKitSystemInterfaceOSX10.12;
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101300 = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101200);
index 7906c72..ca38f86 100644 (file)
@@ -76,7 +76,7 @@ void InjectedBundle::platformInitialize(WKTypeRef initializationUserData)
             @"wellcome": @"welcome",
             @"hellolfworld": @"hello\nworld"
         },
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100 && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200
+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101200
         @"AppleSystemFontOSSubversion": @(10),
 #endif
         @"AppleEnableSwipeNavigateWithScrolls": @YES,
index bcd793e..1ea2c84 100644 (file)
@@ -146,7 +146,6 @@ using namespace WTR;
     // Ignored.
 }
 
-#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101100
 -(NSSpringLoadingHighlight)springLoadingHighlight
 {
     return NSSpringLoadingHighlightNone;
@@ -155,6 +154,5 @@ using namespace WTR;
 - (void)resetSpringLoading
 {
 }
-#endif
 
 @end