Changeset 219050 in webkit


Ignore:
Timestamp:
Jul 1, 2017, 2:12:04 PM (8 years ago)
Author:
mitz@apple.com
Message:

[macOS] Remove code only needed when building for OS X Yosemite
​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]):

Location:
trunk
Files:
3 deleted
155 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/API/WebKitAvailability.h

    r197985 r219050  
    6767#endif
    6868
    69 #endif /* __MAC_OS_X_VERSION_MIN_REQUIRED <= 101100 */
     69#endif /* !TARGET_OS_IPHONE && __MAC_OS_X_VERSION_MIN_REQUIRED < 101100 */
    7070
    7171#if defined(BUILDING_GTK__)

  • trunk/Source/JavaScriptCore/ChangeLog

    r219047 r219050  
     12017-07-01  Dan Bernstein  <mitz@apple.com>
     2
     3        [macOS] Remove code only needed when building for OS X Yosemite
     4        https://bugs.webkit.org/show_bug.cgi?id=174067
     5
     6        Reviewed by Tim Horton.
     7
     8        * API/WebKitAvailability.h:
     9        * Configurations/Base.xcconfig:
     10        * Configurations/DebugRelease.xcconfig:
     11        * Configurations/FeatureDefines.xcconfig:
     12        * Configurations/Version.xcconfig:
     13
    1142017-07-01  Yusuke Suzuki  <utatane.tea@gmail.com>
    215

  • trunk/Source/JavaScriptCore/Configurations/Base.xcconfig

    r217531 r219050  
    9090
    9191TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
    92 TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
    9392TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
    9493TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;

  • trunk/Source/JavaScriptCore/Configurations/DebugRelease.xcconfig

    r218057 r219050  
    3131
    3232MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    33 MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
    3433MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
    3534MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;

  • trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig

    r219012 r219050  
    3333
    3434TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    35 TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101000 = YES;
    3635TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101100 = YES;
    3736
    3837TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    39 TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101000 = YES;
    4038TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101100 = YES;
    4139TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101200 = YES;

  • trunk/Source/JavaScriptCore/Configurations/Version.xcconfig

    r218942 r219050  
    3636SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
    3737SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    38 SYSTEM_VERSION_PREFIX_macosx_101000 = 10;
    3938SYSTEM_VERSION_PREFIX_macosx_101100 = 11;
    4039SYSTEM_VERSION_PREFIX_macosx_101200 = 12;

  • trunk/Source/ThirdParty/ANGLE/ChangeLog

    r218057 r219050  
     12017-07-01  Dan Bernstein  <mitz@apple.com>
     2
     3        [macOS] Remove code only needed when building for OS X Yosemite
     4        https://bugs.webkit.org/show_bug.cgi?id=174067
     5
     6        Reviewed by Tim Horton.
     7
     8        * Configurations/Base.xcconfig:
     9        * Configurations/DebugRelease.xcconfig:
     10
    1112017-06-10  Dan Bernstein  <mitz@apple.com>
    212

  • trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig

    r217531 r219050  
    5050
    5151TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
    52 TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
    5352TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
    5453TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;

  • trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig

    r218057 r219050  
    88
    99MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    10 MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
    1110MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
    1211MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;

  • trunk/Source/ThirdParty/libwebrtc/ChangeLog

    r218850 r219050  
     12017-07-01  Dan Bernstein  <mitz@apple.com>
     2
     3        [macOS] Remove code only needed when building for OS X Yosemite
     4        https://bugs.webkit.org/show_bug.cgi?id=174067
     5
     6        Reviewed by Tim Horton.
     7
     8        * Configurations/Base.xcconfig:
     9        * Configurations/DebugRelease.xcconfig:
     10
    1112017-06-27  Youenn Fablet  <youenn@apple.com>
    212

  • trunk/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig

    r217531 r219050  
    5151
    5252TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
    53 TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
    5453TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
    5554TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;

  • trunk/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig

    r218057 r219050  
    88
    99MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    10 MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
    1110MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
    1211MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;

  • trunk/Source/WTF/ChangeLog

    r219048 r219050  
     12017-07-01  Dan Bernstein  <mitz@apple.com>
     2
     3        [macOS] Remove code only needed when building for OS X Yosemite
     4        https://bugs.webkit.org/show_bug.cgi?id=174067
     5
     6        Reviewed by Tim Horton.
     7
     8        * Configurations/Base.xcconfig:
     9        * Configurations/DebugRelease.xcconfig:
     10        * wtf/Platform.h:
     11        * wtf/mac/AppKitCompatibilityDeclarations.h:
     12        * wtf/spi/cocoa/SecuritySPI.h:
     13        * wtf/text/TextBreakIterator.cpp:
     14
    1152017-07-01  Joseph Pecoraro  <pecoraro@apple.com>
    216

  • trunk/Source/WTF/Configurations/Base.xcconfig

    r217531 r219050  
    8989
    9090TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
    91 TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
    9291TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
    9392TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;

  • trunk/Source/WTF/Configurations/DebugRelease.xcconfig

    r218057 r219050  
    3030
    3131MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    32 MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
    3332MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
    3433MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;

  • trunk/Source/WTF/wtf/Platform.h

    r218901 r219050  
    574574#endif
    575575
    576 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
    577 #define HAVE_NSSCROLLING_FILTERS 1
    578 #else
    579 #define HAVE_NSSCROLLING_FILTERS 0
    580 #endif
    581 
    582576/* OS X defines a series of platform macros for debugging. */
    583577/* Some of them are really annoying because they use common names (e.g. check()). */
    … …  
    11461140#endif
    11471141
    1148 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || PLATFORM(IOS)
     1142#if PLATFORM(COCOA)
    11491143#define HAVE_TIMINGDATAOPTIONS 1
    11501144#endif
    … …  
    12001194#if PLATFORM(COCOA)
    12011195#define USE_MEDIATOOLBOX 1
    1202 #endif
    1203 
    1204 /* While 10.10 has support for fences, it is missing some API important for our integration of them. */
    1205 #if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
    1206 #define HAVE_COREANIMATION_FENCES 1
    12071196#endif
    12081197

  • trunk/Source/WTF/wtf/mac/AppKitCompatibilityDeclarations.h

    r208455 r219050  
    108108static const NSEventType NSEventTypeSystemDefined = NSSystemDefined;
    109109
    110 #if __MAC_OS_X_VERSION_MAX_ALLOWED < 101100
    111 static const NSTextAlignment NSTextAlignmentRight = NSRightTextAlignment;
    112 static const NSTextAlignment NSTextAlignmentCenter = NSCenterTextAlignment;
    113 static const NSTextAlignment NSTextAlignmentLeft = NSLeftTextAlignment;
    114 static const NSTextAlignment NSTextAlignmentNatural = NSNaturalTextAlignment;
    115 static const NSTextAlignment NSTextAlignmentJustified = NSJustifiedTextAlignment;
    116 
    117 typedef NSInteger NSWritingDirectionFormatType;
    118 static const NSWritingDirectionFormatType = NSTextWritingDirectionOverride;
    119 static const NSWritingDirectionEmbedding = NSTextWritingDirectionEmbedding;
    120 #endif
    121 
    122110typedef NSUInteger NSWindowStyleMask;
    123111static const NSWindowStyleMask NSWindowStyleMaskBorderless = NSBorderlessWindowMask;

  • trunk/Source/WTF/wtf/spi/cocoa/SecuritySPI.h

    r205488 r219050  
    3838#else
    3939
    40 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || PLATFORM(IOS)
    4140typedef uint32_t SecSignatureHashAlgorithm;
    4241enum {
    … …  
    5756
    5857WTF_EXTERN_C_END
    59 #endif
    6058
    6159#endif

  • trunk/Source/WTF/wtf/text/TextBreakIterator.cpp

    r213095 r219050  
    3232#include <wtf/text/StringBuilder.h>
    3333
    34 // FIXME: This needs a better name
    35 #define ADDITIONAL_EMOJI_SUPPORT (PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100))
    36 
    3734namespace WTF {
    3835

  • trunk/Source/WebCore/ChangeLog

    r219045 r219050  
     12017-07-01  Dan Bernstein  <mitz@apple.com>
     2
     3        [macOS] Remove code only needed when building for OS X Yosemite
     4        https://bugs.webkit.org/show_bug.cgi?id=174067
     5
     6        Reviewed by Tim Horton.
     7
     8        * Configurations/Base.xcconfig:
     9        * Configurations/DebugRelease.xcconfig:
     10        * Configurations/FeatureDefines.xcconfig:
     11        * Configurations/Version.xcconfig:
     12        * accessibility/AXObjectCache.cpp:
     13        (WebCore::AXObjectCache::setEnhancedUserInterfaceAccessibility):
     14        * html/HTMLCanvasElement.cpp:
     15        * page/WheelEventDeltaFilter.cpp:
     16        (WebCore::WheelEventDeltaFilter::create):
     17        * page/mac/WheelEventDeltaFilterMac.h:
     18        * page/mac/WheelEventDeltaFilterMac.mm:
     19        * page/scrolling/ScrollingMomentumCalculator.cpp:
     20        * page/scrolling/mac/ScrollingMomentumCalculatorMac.h:
     21        * page/scrolling/mac/ScrollingMomentumCalculatorMac.mm:
     22        * platform/cocoa/NetworkExtensionContentFilter.mm:
     23        (replacementDataFromDecisionInfo):
     24        (WebCore::NetworkExtensionContentFilter::initialize):
     25        (WebCore::NetworkExtensionContentFilter::willSendRequest):
     26        (WebCore::NetworkExtensionContentFilter::responseReceived):
     27        (WebCore::NetworkExtensionContentFilter::addData):
     28        (WebCore::NetworkExtensionContentFilter::finishedAddingData):
     29        (WebCore::NetworkExtensionContentFilter::unblockHandler):
     30        * platform/graphics/ComplexTextController.h:
     31        * platform/graphics/ca/cocoa/PlatformCAAnimationCocoa.mm:
     32        (PlatformCAAnimationCocoa::setTimingFunction):
     33        * platform/graphics/cocoa/FontCacheCoreText.cpp:
     34        (WebCore::FontCache::platformAlternateFamilyName):
     35        * platform/graphics/cocoa/FontCocoa.mm:
     36        (WebCore::Font::platformInit):
     37        * platform/graphics/cocoa/IOSurface.mm:
     38        (WebCore::IOSurface::sinkIntoImage):
     39        * platform/graphics/cocoa/WebGPULayer.mm:
     40        (-[WebGPULayer initWithGPUDevice:]):
     41        * platform/graphics/mac/ComplexTextControllerCoreText.mm:
     42        (WebCore::ComplexTextController::ComplexTextRun::ComplexTextRun):
     43        * platform/graphics/mac/WebGLLayer.mm:
     44        (-[WebGLLayer initWithGraphicsContext3D:]):
     45        * platform/mac/BlacklistUpdater.mm:
     46        * platform/mac/PlatformScreenMac.mm:
     47        (WebCore::screenSupportsExtendedColor):
     48        * platform/mac/ValidationBubbleMac.mm:
     49        (WebCore::ValidationBubble::ValidationBubble):
     50        * platform/mac/WebGLBlacklist.mm:
     51        (WebCore::WebGLBlacklist::create):
     52        * platform/network/cocoa/WebCoreNSURLSession.h:
     53        * platform/network/cocoa/WebCoreNSURLSession.mm:
     54        * platform/network/mac/CertificateInfoMac.mm:
     55        (WebCore::CertificateInfo::containsNonRootSHA1SignedCertificate):
     56        * platform/network/mac/CookieJarMac.mm:
     57        (WebCore::setCookiesFromDOM):
     58        * platform/spi/cf/CFNetworkSPI.h:
     59        * platform/spi/cg/CoreGraphicsSPI.h:
     60        * platform/spi/cocoa/NEFilterSourceSPI.h:
     61        * platform/spi/cocoa/NSURLConnectionSPI.h:
     62        * platform/spi/cocoa/QuartzCoreSPI.h:
     63        * platform/spi/mac/NSScrollingInputFilterSPI.h:
     64        * platform/spi/mac/NSScrollingMomentumCalculatorSPI.h:
     65        * platform/spi/mac/TUCallSPI.h:
     66        * rendering/RenderThemeMac.mm:
     67        (WebCore::RenderThemeMac::levelIndicatorFor):
     68        * svg/SVGToOTFFontConversion.cpp:
     69        (WebCore::SVGToOTFFontConverter::appendKERNTable):
     70        (WebCore::SVGToOTFFontConverter::SVGToOTFFontConverter):
     71
    1722017-06-30  Said Abou-Hallawa  <sabouhallawa@apple.com>
    273

  • trunk/Source/WebCore/Configurations/Base.xcconfig

    r217531 r219050  
    7979
    8080TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
    81 TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
    8281TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
    8382TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;

  • trunk/Source/WebCore/Configurations/DebugRelease.xcconfig

    r218057 r219050  
    3131
    3232MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    33 MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
    3433MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
    3534MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;

  • trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig

    r219012 r219050  
    3333
    3434TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    35 TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101000 = YES;
    3635TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101100 = YES;
    3736
    3837TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    39 TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101000 = YES;
    4038TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101100 = YES;
    4139TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101200 = YES;

  • trunk/Source/WebCore/Configurations/Version.xcconfig

    r218942 r219050  
    3636SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
    3737SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    38 SYSTEM_VERSION_PREFIX_macosx_101000 = 10;
    3938SYSTEM_VERSION_PREFIX_macosx_101100 = 11;
    4039SYSTEM_VERSION_PREFIX_macosx_101200 = 12;

  • trunk/Source/WebCore/PAL/ChangeLog

    r219012 r219050  
     12017-07-01  Dan Bernstein  <mitz@apple.com>
     2
     3        [macOS] Remove code only needed when building for OS X Yosemite
     4        https://bugs.webkit.org/show_bug.cgi?id=174067
     5
     6        Reviewed by Tim Horton.
     7
     8        * Configurations/Base.xcconfig:
     9        * Configurations/DebugRelease.xcconfig:
     10        * Configurations/FeatureDefines.xcconfig:
     11        * Configurations/Version.xcconfig:
     12
    1132017-06-29  Jer Noble  <jer.noble@apple.com>
    214

  • trunk/Source/WebCore/PAL/Configurations/Base.xcconfig

    r217531 r219050  
    7979
    8080TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
    81 TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
    8281TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
    8382TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;

  • trunk/Source/WebCore/PAL/Configurations/DebugRelease.xcconfig

    r218057 r219050  
    3131
    3232MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    33 MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
    3433MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
    3534MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;

  • trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig

    r219012 r219050  
    3333
    3434TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    35 TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101000 = YES;
    3635TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101100 = YES;
    3736
    3837TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    39 TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101000 = YES;
    4038TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101100 = YES;
    4139TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101200 = YES;

  • trunk/Source/WebCore/PAL/Configurations/Version.xcconfig

    r218942 r219050  
    3636SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
    3737SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    38 SYSTEM_VERSION_PREFIX_macosx_101000 = 10;
    3938SYSTEM_VERSION_PREFIX_macosx_101100 = 11;
    4039SYSTEM_VERSION_PREFIX_macosx_101200 = 12;

  • trunk/Source/WebCore/accessibility/AXObjectCache.cpp

    r218910 r219050  
    179179    gAccessibilityEnhancedUserInterfaceEnabled = flag;
    180180#if PLATFORM(MAC)
    181 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
    182181    if (flag)
    183182        enableAccessibility();
    184 #endif
    185183#endif
    186184}

  • trunk/Source/WebCore/html/HTMLCanvasElement.cpp

    r218908 r219050  
    8989#if PLATFORM(IOS)
    9090const unsigned maxCanvasArea = 4096 * 4096;
    91 #elif PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101100
    92 const unsigned maxCanvasArea = 8192 * 8192;
    9391#else
    9492const unsigned maxCanvasArea = 16384 * 16384;

  • trunk/Source/WebCore/page/WheelEventDeltaFilter.cpp

    r209087 r219050  
    2727#include "WheelEventDeltaFilter.h"
    2828
    29 #if HAVE(NSSCROLLING_FILTERS)
    30 #include "WheelEventDeltaFilterMac.h"
    31 #endif
    32 
    3329#include "FloatSize.h"
    3430#include "Logging.h"
    3531#include "TextStream.h"
     32
     33#if PLATFORM(MAC)
     34#include "WheelEventDeltaFilterMac.h"
     35#endif
    3636
    3737namespace WebCore {
    … …  
    4747std::unique_ptr<WheelEventDeltaFilter> WheelEventDeltaFilter::create()
    4848{
    49 #if HAVE(NSSCROLLING_FILTERS)
     49#if PLATFORM(MAC)
    5050    return std::make_unique<WheelEventDeltaFilterMac>();
    5151#else

  • trunk/Source/WebCore/page/mac/WheelEventDeltaFilterMac.h

    r208179 r219050  
    2626#pragma once
    2727
    28 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
     28#if PLATFORM(MAC)
    2929
    3030#include "WheelEventDeltaFilter.h"
    … …  
    5050} // namespace WebCore
    5151
    52 #endif // PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
     52#endif // PLATFORM(MAC)

  • trunk/Source/WebCore/page/mac/WheelEventDeltaFilterMac.mm

    r209087 r219050  
    2626#include "config.h"
    2727
    28 #if HAVE(NSSCROLLING_FILTERS)
     28#if PLATFORM(MAC)
    2929
    3030#include "WheelEventDeltaFilterMac.h"
    … …  
    7070}
    7171
    72 #endif /* HAVE(NSSCROLLING_FILTERS) */
     72#endif /* PLATFORM(MAC) */

  • trunk/Source/WebCore/page/scrolling/ScrollingMomentumCalculator.cpp

    r210560 r219050  
    6868}
    6969
    70 #if !HAVE(NSSCROLLING_FILTERS)
     70#if !PLATFORM(MAC)
    7171
    7272std::unique_ptr<ScrollingMomentumCalculator> ScrollingMomentumCalculator::create(const FloatSize& viewportSize, const FloatSize& contentSize, const FloatPoint& initialOffset, const FloatSize& initialDelta, const FloatSize& initialVelocity)

  • trunk/Source/WebCore/page/scrolling/mac/ScrollingMomentumCalculatorMac.h

    r210560 r219050  
    2929#include <wtf/RetainPtr.h>
    3030
    31 #if HAVE(NSSCROLLING_FILTERS)
    32 
    3331@class _NSScrollingMomentumCalculator;
    3432
    … …  
    5351
    5452} // namespace WebCore
    55 
    56 #endif // HAVE(NSSCROLLING_FILTERS)

  • trunk/Source/WebCore/page/scrolling/mac/ScrollingMomentumCalculatorMac.mm

    r210560 r219050  
    2727#include "ScrollingMomentumCalculatorMac.h"
    2828
    29 #if HAVE(NSSCROLLING_FILTERS)
     29#if PLATFORM(MAC)
    3030
    3131#include "NSScrollingMomentumCalculatorSPI.h"
    … …  
    106106} // namespace WebCore
    107107
    108 #endif // HAVE(NSSCROLLING_FILTERS)
     108#endif // PLATFORM(MAC)

  • trunk/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.mm

    r216917 r219050  
    4848@end
    4949
    50 #if HAVE(MODERN_NE_FILTER_SOURCE)
    5150static inline NSData *replacementDataFromDecisionInfo(NSDictionary *decisionInfo)
    5251{
    … …  
    5453    return decisionInfo[NEFilterSourceOptionsPageData];
    5554}
    56 #endif
    5755
    5856namespace WebCore {
    … …  
    7775    m_queue = adoptOSObject(dispatch_queue_create("WebKit NetworkExtension Filtering", DISPATCH_QUEUE_SERIAL));
    7876    m_semaphore = adoptOSObject(dispatch_semaphore_create(0));
    79 #if HAVE(MODERN_NE_FILTER_SOURCE)
    8077    ASSERT_UNUSED(url, !url);
    8178    m_neFilterSource = adoptNS([allocNEFilterSourceInstance() initWithDecisionQueue:m_queue.get()]);
    … …  
    8683        [m_neFilterSource setSourceAppPid:presentingApplicationPID()];
    8784#endif
    88 #else
    89     ASSERT_ARG(url, url);
    90     m_neFilterSource = adoptNS([allocNEFilterSourceInstance() initWithURL:*url direction:NEFilterSourceDirectionInbound socketIdentifier:0]);
    91 #endif
    9285}
    9386
    9487void NetworkExtensionContentFilter::willSendRequest(ResourceRequest& request, const ResourceResponse& redirectResponse)
    9588{
    96 #if HAVE(MODERN_NE_FILTER_SOURCE)
    9789    ASSERT(!request.isNull());
    9890    if (!request.url().protocolIsInHTTPFamily() || !enabled()) {
    … …  
    131123
    132124    request.setURL(modifiedRequestURL);
    133 #else
    134     UNUSED_PARAM(request);
    135     UNUSED_PARAM(redirectResponse);
    136 #endif
    137125}
    138126
    … …  
    144132    }
    145133
    146 #if !HAVE(MODERN_NE_FILTER_SOURCE)
    147     if (!enabled()) {
    148         m_state = State::Allowed;
    149         return;
    150     }
    151 
    152     initialize(&response.url());
    153 #else
    154134    [m_neFilterSource receivedResponse:response.nsURLResponse() decisionHandler:[this](NEFilterSourceStatus status, NSDictionary *decisionInfo) {
    155135        handleDecision(status, replacementDataFromDecisionInfo(decisionInfo));
    … …  
    160140    // addData(). We should find a way to make this asynchronous.
    161141    dispatch_semaphore_wait(m_semaphore.get(), DISPATCH_TIME_FOREVER);
    162 #endif
    163142}
    164143
    … …  
    167146    RetainPtr<NSData> copiedData { [NSData dataWithBytes:(void*)data length:length] };
    168147
    169 #if HAVE(MODERN_NE_FILTER_SOURCE)
    170148    [m_neFilterSource receivedData:copiedData.get() decisionHandler:[this](NEFilterSourceStatus status, NSDictionary *decisionInfo) {
    171149        handleDecision(status, replacementDataFromDecisionInfo(decisionInfo));
    172150    }];
    173 #else
    174     [m_neFilterSource addData:copiedData.get() withCompletionQueue:m_queue.get() completionHandler:[this](NEFilterSourceStatus status, NSData *replacementData) {
    175         ASSERT(!replacementData);
    176         handleDecision(status, replacementData);
    177     }];
    178 #endif
    179151
    180152    // FIXME: We have to block here since DocumentLoader expects to have a
    … …  
    186158void NetworkExtensionContentFilter::finishedAddingData()
    187159{
    188 #if HAVE(MODERN_NE_FILTER_SOURCE)
    189160    [m_neFilterSource finishedLoadingWithDecisionHandler:[this](NEFilterSourceStatus status, NSDictionary *decisionInfo) {
    190161        handleDecision(status, replacementDataFromDecisionInfo(decisionInfo));
    191162    }];
    192 #else
    193     [m_neFilterSource dataCompleteWithCompletionQueue:m_queue.get() completionHandler:[this](NEFilterSourceStatus status, NSData *replacementData) {
    194         ASSERT(!replacementData);
    195         handleDecision(status, replacementData);
    196     }];
    197 #endif
    198163
    199164    // FIXME: We have to block here since DocumentLoader expects to have a
    … …  
    212177ContentFilterUnblockHandler NetworkExtensionContentFilter::unblockHandler() const
    213178{
    214 #if HAVE(MODERN_NE_FILTER_SOURCE)
    215179    using DecisionHandlerFunction = ContentFilterUnblockHandler::DecisionHandlerFunction;
    216180
    … …  
    224188        }
    225189    };
    226 #else
    227     return { };
    228 #endif
    229190}
    230191#endif

  • trunk/Source/WebCore/platform/graphics/ComplexTextController.h

    r211836 r219050  
    3333#include <wtf/text/WTFString.h>
    3434
    35 #define USE_LAYOUT_SPECIFIC_ADVANCES ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000))
    36 
    3735typedef unsigned short CGGlyph;
    3836

  • trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCAAnimationCocoa.mm

    r216702 r219050  
    330330            springAnimation.stiffness = function.stiffness();
    331331            springAnimation.damping = function.damping();
    332 #if PLATFORM(IOS) || PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
    333332            springAnimation.initialVelocity = function.initialVelocity();
    334 #else
    335             springAnimation.velocity = function.initialVelocity();
    336 #endif
    337333        }
    338334        break;

  • trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp

    r218919 r219050  
    13581358    static NeverDestroyed<AtomicString> songtiSC("Songti SC", AtomicString::ConstructFromLiteral);
    13591359    static NeverDestroyed<AtomicString> songtiTC("Songti TC", AtomicString::ConstructFromLiteral);
    1360 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101100
    1361     static NeverDestroyed<AtomicString> heitiSCReplacement("Heiti SC", AtomicString::ConstructFromLiteral);
    1362     static NeverDestroyed<AtomicString> heitiTCReplacement("Heiti TC", AtomicString::ConstructFromLiteral);
    1363 #else
    13641360    static NeverDestroyed<AtomicString> heitiSCReplacement("PingFang SC", AtomicString::ConstructFromLiteral);
    13651361    static NeverDestroyed<AtomicString> heitiTCReplacement("PingFang TC", AtomicString::ConstructFromLiteral);
    1366 #endif
    13671362
    13681363    switch (familyName.length()) {
    … …  
    13931388            return songtiSC;
    13941389        break;
    1395 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101100
    1396     case 15:
    1397         if (equalLettersIgnoringASCIICase(familyName, "microsoft yahei"))
    1398             return heitiSCReplacement;
    1399         break;
    1400 #endif
    14011390    case 18:
    14021391        if (equalLettersIgnoringASCIICase(familyName, "microsoft jhenghei"))

  • trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm

    r218909 r219050  
    124124#endif
    125125
    126 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101100
    127     // Work around <rdar://problem/19433490>
    128     CGGlyph dummyGlyphs[] = {0, 0};
    129     CGSize dummySize[] = { CGSizeMake(0, 0), CGSizeMake(0, 0) };
    130     CTFontTransformGlyphs(m_platformData.ctFont(), dummyGlyphs, dummySize, 2, kCTFontTransformApplyPositioning | kCTFontTransformApplyShaping);
    131 #endif
    132 
    133126    unsigned unitsPerEm = CTFontGetUnitsPerEm(m_platformData.font());
    134127    float pointSize = m_platformData.size();

  • trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm

    r218615 r219050  
    254254RetainPtr<CGImageRef> WebCore::IOSurface::sinkIntoImage(std::unique_ptr<IOSurface> surface)
    255255{
    256 #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     256#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000) || PLATFORM(MAC)
    257257    return adoptCF(CGIOSurfaceContextCreateImageReference(surface->ensurePlatformContext()));
    258258#else

  • trunk/Source/WebCore/platform/graphics/cocoa/WebGPULayer.mm

    r213541 r219050  
    5151#if PLATFORM(MAC)
    5252    self.contentsScale = _devicePixelRatio;
    53 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
    54     if ([self respondsToSelector:@selector(setColorspace:)])
    55         [self setColorspace:sRGBColorSpaceRef()];
    56 #endif
     53    self.colorspace = sRGBColorSpaceRef();
    5754#endif
    5855    return self;

  • trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm

    r212263 r219050  
    133133        m_glyphs.uncheckedAppend(glyphsPtr[i]);
    134134
    135 #if USE_LAYOUT_SPECIFIC_ADVANCES
    136135    if (CTRunGetStatus(ctRun) & kCTRunStatusHasOrigins) {
    137136        Vector<CGSize> baseAdvances(m_glyphCount);
    … …  
    144143            m_glyphOrigins.uncheckedAppend(glyphOrigins[i]);
    145144        }
    146     } else
    147 #endif
    148     {
     145    } else {
    149146        const CGSize* baseAdvances = CTRunGetAdvancesPtr(ctRun);
    150147        Vector<CGSize> baseAdvancesVector;

  • trunk/Source/WebCore/platform/graphics/mac/WebGLLayer.mm

    r212211 r219050  
    5656#if PLATFORM(MAC)
    5757    self.contentsScale = _devicePixelRatio;
    58 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
    5958    self.colorspace = sRGBColorSpaceRef();
    60 #endif
    6159#endif
    6260    return self;

  • trunk/Source/WebCore/platform/mac/BlacklistUpdater.mm

    r204462 r219050  
    4444static time_t blacklistUpdateTime;
    4545
    46 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
    4746NSString * const blacklistPath = @"/System/Library/CoreServices/XProtect.bundle/Contents/Resources/XProtect.meta.plist";
    48 #else
    49 NSString * const blacklistPath = @"/System/Library/CoreServices/CoreTypes.bundle/Contents/Resources/XProtect.meta.plist";
    50 #endif
    5147
    5248namespace WebCore {

  • trunk/Source/WebCore/platform/mac/PlatformScreenMac.mm

    r203903 r219050  
    137137bool screenSupportsExtendedColor(Widget* widget)
    138138{
    139 #if __MAC_OS_X_VERSION_MIN_REQUIRED < 101100
    140     UNUSED_PARAM(widget);
    141     return false;
    142 #else
    143139    if (!widget)
    144140        return false;
    … …  
    151147    auto profile = adoptCF(ColorSyncProfileCreate(iccData.get(), nullptr));
    152148    return profile && ColorSyncProfileIsWideGamut(profile.get());
    153 #endif
    154149#endif
    155150}

  • trunk/Source/WebCore/platform/mac/ValidationBubbleMac.mm

    r212325 r219050  
    6767    m_fontSize = std::max(settings.minimumFontSize, 13.0);
    6868    [label setFont:[NSFont systemFontOfSize:m_fontSize]];
    69 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
    7069    [label setMaximumNumberOfLines:4];
    71 #endif
    7270    [[label cell] setTruncatesLastVisibleLine:YES];
    7371    [popoverView addSubview:label.get()];

  • trunk/Source/WebCore/platform/mac/WebGLBlacklist.mm

    r204462 r219050  
    201201    CGLGetParameter(ctx, kCGLCPCurrentRendererID, &rendererId);
    202202    GLint supportsSeparateAddressSpace = 0;
    203 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
    204203    CGLGetParameter(ctx, kCGLCPSupportSeparateAddressSpace, &supportsSeparateAddressSpace);
    205 #endif
    206204    CGLDestroyContext(ctx);
    207205    CGLReleasePixelFormat(pix);

  • trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.h

    r215685 r219050  
    2626#ifndef WebCoreNSURLSession_h
    2727#define WebCoreNSURLSession_h
    28 
    29 #if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
    3028
    3129#import <Foundation/NSURLSession.h>
    … …  
    143141NS_ASSUME_NONNULL_END
    144142
    145 #endif // PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
    146 
    147143#endif

  • trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm

    r215263 r219050  
    2727#import "WebCoreNSURLSession.h"
    2828
    29 #if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
    30 
    3129#import "CachedResourceRequest.h"
    3230#import "PlatformMediaResourceLoader.h"
    … …  
    660658}
    661659@end
    662 
    663 #endif // PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100

  • trunk/Source/WebCore/platform/network/mac/CertificateInfoMac.mm

    r200463 r219050  
    8282#endif
    8383
    84 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || PLATFORM(IOS)
    8584    if (m_certificateChain) {
    8685        // Allow only the root certificate (the last in the chain) to be SHA1.
    … …  
    9291        return false;
    9392    }
    94 #else
    95     notImplemented();
    96 #endif
    9793
    9894    return false;

  • trunk/Source/WebCore/platform/network/mac/CookieJarMac.mm

    r214270 r219050  
    188188    NSDictionary *headerFields = [NSDictionary dictionaryWithObject:cookieString forKey:@"Set-Cookie"];
    189189
    190 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
     190#if PLATFORM(MAC)
    191191    NSArray *unfilteredCookies = [NSHTTPCookie _parsedCookiesWithResponseHeaderFields:headerFields forURL:cookieURL];
    192192#else

  • trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h

    r219016 r219050  
    118118@end
    119119
    120 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)
    121120@interface NSURLSessionConfiguration ()
    122121@property (assign) _TimingDataOptions _timingDataOptions;
    … …  
    129128#endif
    130129@end
    131 #endif
    132130
    133131#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
    … …  
    246244WTF_EXTERN_C_BEGIN
    247245
    248 #if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
    249246CFDataRef _CFNetworkCopyATSContext(void);
    250247Boolean _CFNetworkSetATSContext(CFDataRef);
    251 #endif
    252248
    253249#if PLATFORM(COCOA)
    … …  
    255251#endif
    256252
    257 #if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
    258253CFDataRef CFHTTPCookieStorageCreateIdentifyingData(CFAllocatorRef inAllocator, CFHTTPCookieStorageRef inStorage);
    259254CFHTTPCookieStorageRef CFHTTPCookieStorageCreateFromIdentifyingData(CFAllocatorRef inAllocator, CFDataRef inData);
    260255CFArrayRef _CFHTTPParsedCookiesWithResponseHeaderFields(CFAllocatorRef inAllocator, CFDictionaryRef headerFields, CFURLRef inURL);
    261 #endif
    262256
    263257WTF_EXTERN_C_END
    … …  
    266260
    267261@interface NSHTTPCookie ()
    268 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
     262#if PLATFORM(MAC)
    269263+ (NSArray *)_parsedCookiesWithResponseHeaderFields:(NSDictionary *)headerFields forURL:(NSURL *)aURL;
    270264#endif
    … …  
    282276
    283277// FIXME: Move +_setSharedHTTPCookieStorage: into the above section under !USE(APPLE_INTERNAL_SDK) when possible (soon).
    284 #if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
    285278@interface NSHTTPCookieStorage ()
    286279+ (void)_setSharedHTTPCookieStorage:(NSHTTPCookieStorage *)storage;
    287280@end
    288 #endif
    289281
    290282@interface NSURLResponse ()

  • trunk/Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h

    r209397 r219050  
    105105    kCGFontAntialiasingStyleUnfiltered = 0 << 7,
    106106    kCGFontAntialiasingStyleFilterLight = 1 << 7,
    107 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
     107#if PLATFORM(MAC)
    108108    kCGFontAntialiasingStyleUnfilteredCustomDilation = (8 << 7),
    109109#endif

  • trunk/Source/WebCore/platform/spi/cocoa/NEFilterSourceSPI.h

    r216917 r219050  
    2323 * THE POSSIBILITY OF SUCH DAMAGE.
    2424 */
    25 
    26 #define HAVE_MODERN_NE_FILTER_SOURCE (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || PLATFORM(IOS)
    2725
    2826#if USE(APPLE_INTERNAL_SDK)
    … …  
    6058@end
    6159
    62 #if HAVE(MODERN_NE_FILTER_SOURCE)
    63 
    6460#define NEFilterSourceOptionsPageData @"PageData"
    6561#define NEFilterSourceOptionsRedirectURL @"RedirectURL"
    … …  
    8076@end
    8177
    82 #endif
    83 
    8478#endif // !USE(APPLE_INTERNAL_SDK)

  • trunk/Source/WebCore/platform/spi/cocoa/NSURLConnectionSPI.h

    r214946 r219050  
    4040+ (CFRunLoopRef)resourceLoaderRunLoop;
    4141- (void)setDefersCallbacks:(BOOL)defers;
    42 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101100
    43 + (void)_setCollectsTimingData:(BOOL)collect;
    44 + (void)_collectTimingDataWithOptions:(TimingDataCollection)options;
    45 #endif
    4642- (NSDictionary *)_timingData;
    4743@end

  • trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h

    r212776 r219050  
    125125@end
    126126
    127 #if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
    128127typedef enum {
    129128    kCATransactionPhasePreLayout,
    … …  
    135134+ (void)addCommitHandler:(void(^)(void))block forPhase:(CATransactionPhase)phase;
    136135@end
    137 #endif
    138136
    139137@interface CALayerHost : CALayer
    … …  
    142140@end
    143141
    144 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101100
    145 @interface CASpringAnimation : CABasicAnimation
    146 @property CGFloat mass;
    147 @property CGFloat stiffness;
    148 @property CGFloat damping;
    149 @property CGFloat velocity;
    150 @property CGFloat initialVelocity;
    151 @end
    152 #else
    153142@interface CASpringAnimation (Private)
    154143@property CGFloat velocity;
    155144@end
    156 #endif
    157145
    158146#endif // __OBJC__

  • trunk/Source/WebCore/platform/spi/mac/NSScrollingInputFilterSPI.h

    r188860 r219050  
    2424 */
    2525
    26 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
     26#if PLATFORM(MAC)
    2727
    2828#if USE(APPLE_INTERNAL_SDK)
    … …  
    3939#endif /* USE(APPLE_INTERNAL_SDK) */
    4040
    41 #endif /* PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100 */
     41#endif /* PLATFORM(MAC) */

  • trunk/Source/WebCore/platform/spi/mac/NSScrollingMomentumCalculatorSPI.h

    r209087 r219050  
    2424 */
    2525
    26 #if HAVE(NSSCROLLING_FILTERS)
    27 
    2826#if USE(APPLE_INTERNAL_SDK)
    2927
    … …  
    4644
    4745#endif /* USE(APPLE_INTERNAL_SDK) */
    48 
    49 #endif /* HAVE(NSSCROLLING_FILTERS) */

  • trunk/Source/WebCore/platform/spi/mac/TUCallSPI.h

    r212277 r219050  
    2424 */
    2525
    26 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
    27 
    2826#import "SoftLinking.h"
    2927#import <objc/runtime.h>
    … …  
    3836SOFT_LINK_PRIVATE_FRAMEWORK_OPTIONAL(TelephonyUtilities)
    3937SOFT_LINK_CLASS(TelephonyUtilities, TUCall)
    40 
    41 #endif

  • trunk/Source/WebCore/rendering/RenderThemeMac.mm

    r218468 r219050  
    10751075
    10761076    [cell setLevelIndicatorStyle:levelIndicatorStyleFor(style.appearance())];
    1077     // FIXME: Remove the call to setBaseWritingDirection once __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100 is always true.
    1078 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
    1079     [cell setUserInterfaceLayoutDirection: style.isLeftToRightDirection() ? NSUserInterfaceLayoutDirectionLeftToRight : NSUserInterfaceLayoutDirectionRightToLeft];
    1080 #else
    1081     [cell setBaseWritingDirection:style.isLeftToRightDirection() ? NSWritingDirectionLeftToRight : NSWritingDirectionRightToLeft];
    1082 #endif
     1077    [cell setUserInterfaceLayoutDirection:style.isLeftToRightDirection() ? NSUserInterfaceLayoutDirectionLeftToRight : NSUserInterfaceLayoutDirectionRightToLeft];
    10831078    [cell setMinValue:element->min()];
    10841079    [cell setMaxValue:element->max()];

  • trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp

    r216102 r219050  
    11241124    size_t sizeOfVerticalSubtable = appendKERNSubtable<SVGVKernElement>(&SVGVKernElement::buildVerticalKerningPair, 0);
    11251125    ASSERT_UNUSED(sizeOfVerticalSubtable, subtablesOffset + sizeOfHorizontalSubtable + sizeOfVerticalSubtable == m_result.size());
    1126 
    1127 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
    1128     // Work around a bug in Apple's font parser by adding some padding bytes. <rdar://problem/18401901>
    1129     for (int i = 0; i < 6; ++i)
    1130         m_result.append(0);
    1131 #endif
    11321126}
    11331127
    … …  
    14381432
    14391433    m_boundingBox = boundingBox.value_or(FloatRect());
    1440 
    1441 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
    1442     // <rdar://problem/20086223> Cocoa has a bug where glyph bounding boxes are not correctly respected for frustum culling. Work around this by
    1443     // inflating the font's bounding box
    1444     m_boundingBox.extend(FloatPoint(0, 0));
    1445 #endif
    14461434
    14471435    appendLigatureGlyphs();

  • trunk/Source/WebInspectorUI/ChangeLog

    r219041 r219050  
     12017-07-01  Dan Bernstein  <mitz@apple.com>
     2
     3        [macOS] Remove code only needed when building for OS X Yosemite
     4        https://bugs.webkit.org/show_bug.cgi?id=174067
     5
     6        Reviewed by Tim Horton.
     7
     8        * Configurations/Base.xcconfig:
     9        * Configurations/DebugRelease.xcconfig:
     10        * Configurations/Version.xcconfig:
     11
    1122017-06-30  Joseph Pecoraro  <pecoraro@apple.com>
    213

  • trunk/Source/WebInspectorUI/Configurations/Base.xcconfig

    r217531 r219050  
    5757
    5858TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
    59 TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
    6059TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
    6160TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;

  • trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig

    r218057 r219050  
    88
    99MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    10 MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
    1110MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
    1211MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;

  • trunk/Source/WebInspectorUI/Configurations/Version.xcconfig

    r218942 r219050  
    99SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
    1010SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    11 SYSTEM_VERSION_PREFIX_macosx_101000 = 10;
    1211SYSTEM_VERSION_PREFIX_macosx_101100 = 11;
    1312SYSTEM_VERSION_PREFIX_macosx_101200 = 12;

  • trunk/Source/WebKit/mac/ChangeLog

    r219013 r219050  
     12017-07-01  Dan Bernstein  <mitz@apple.com>
     2
     3        [macOS] Remove code only needed when building for OS X Yosemite
     4        https://bugs.webkit.org/show_bug.cgi?id=174067
     5
     6        Reviewed by Tim Horton.
     7
     8        * Configurations/Base.xcconfig:
     9        * Configurations/DebugRelease.xcconfig:
     10        * Configurations/FeatureDefines.xcconfig:
     11        * Configurations/Version.xcconfig:
     12        * Plugins/WebBasePluginPackage.mm:
     13        (-[WebBasePluginPackage getPluginInfoFromPLists]):
     14        * WebCoreSupport/PopupMenuMac.mm:
     15        (PopupMenuMac::show):
     16        * WebCoreSupport/WebInspectorClient.mm:
     17        (WebInspectorFrontendClient::startWindowDrag):
     18        (-[WebInspectorWindowController window]):
     19        * WebView/WebView.mm:
     20        (-[WebView _animationControllerForDictionaryLookupPopupInfo:]):
     21
    1222017-06-30  Daniel Bates  <dabates@apple.com>
    223

  • trunk/Source/WebKit/mac/Configurations/Base.xcconfig

    r217531 r219050  
    8080
    8181TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
    82 TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
    8382TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
    8483TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;

  • trunk/Source/WebKit/mac/Configurations/DebugRelease.xcconfig

    r218057 r219050  
    3131
    3232MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    33 MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
    3433MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
    3534MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
    … …  
    4342WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphonesimulator*] = WebKitSystemInterfaceIOSSimulator$(WK_TARGET_IOS_VERSION_MAJOR);
    4443WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=macosx*] = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    45 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000 = WebKitSystemInterfaceYosemite;
    4644WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101100 = WebKitSystemInterfaceElCapitan;
    4745WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101200 = WebKitSystemInterfaceOSX10.12;

  • trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig

    r219012 r219050  
    3333
    3434TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    35 TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101000 = YES;
    3635TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101100 = YES;
    3736
    3837TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    39 TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101000 = YES;
    4038TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101100 = YES;
    4139TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101200 = YES;

  • trunk/Source/WebKit/mac/Configurations/Version.xcconfig

    r218942 r219050  
    3636SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
    3737SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    38 SYSTEM_VERSION_PREFIX_macosx_101000 = 10;
    3938SYSTEM_VERSION_PREFIX_macosx_101100 = 11;
    4039SYSTEM_VERSION_PREFIX_macosx_101200 = 12;

  • trunk/Source/WebKit/mac/Plugins/WebBasePluginPackage.mm

    r206004 r219050  
    143143        return NO;
    144144   
    145     NSDictionary *MIMETypes = nil;
    146 
    147 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
    148     NSString *pListFilename = [self _objectForInfoDictionaryKey:WebPluginMIMETypesFilenameKey];
    149    
    150     // Check if the MIME types are claimed in a plist in the user's preferences directory.
    151     if (pListFilename) {
    152         NSString *pListPath = [NSString stringWithFormat:@"%@/Library/Preferences/%@", NSHomeDirectory(), pListFilename];
    153         NSDictionary *pList = [self pListForPath:pListPath createFile:NO];
    154         if (pList) {
    155             // If the plist isn't localized, have the plug-in recreate it in the preferred language.
    156             NSString *localizationName = [pList objectForKey:WebPluginLocalizationNameKey];
    157             if (![localizationName isEqualToString:preferredBundleLocalizationName()])
    158                 pList = [self pListForPath:pListPath createFile:YES];
    159             MIMETypes = [pList objectForKey:WebPluginMIMETypesKey];
    160         } else
    161             // Plist doesn't exist, ask the plug-in to create it.
    162             MIMETypes = [[self pListForPath:pListPath createFile:YES] objectForKey:WebPluginMIMETypesKey];
    163     }
    164 #endif
    165 
    166     if (!MIMETypes) {
    167         MIMETypes = [self _objectForInfoDictionaryKey:WebPluginMIMETypesKey];
    168         if (!MIMETypes)
    169             return NO;
    170     }
     145    NSDictionary *MIMETypes = [self _objectForInfoDictionaryKey:WebPluginMIMETypesKey];
     146    if (!MIMETypes)
     147        return NO;
    171148
    172149    NSEnumerator *keyEnumerator = [MIMETypes keyEnumerator];

  • trunk/Source/WebKit/mac/WebCoreSupport/PopupMenuMac.mm

    r215830 r219050  
    150150
    151151    NSMenu *menu = [m_popup menu];
    152 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
    153152    [menu setUserInterfaceLayoutDirection:textDirection == LTR ? NSUserInterfaceLayoutDirectionLeftToRight : NSUserInterfaceLayoutDirectionRightToLeft];
    154 #endif
    155153
    156154    NSPoint location;

  • trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm

    r214442 r219050  
    219219void WebInspectorFrontendClient::startWindowDrag()
    220220{
    221 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
    222221    [[m_frontendWindowController window] performWindowDragWithEvent:[NSApp currentEvent]];
    223 #endif
    224222}
    225223
    … …  
    474472    [window setCollectionBehavior:([window collectionBehavior] | NSWindowCollectionBehaviorFullScreenPrimary)];
    475473
    476 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
    477474    CGFloat approximatelyHalfScreenSize = (window.screen.frame.size.width / 2) - 4;
    478475    CGFloat minimumFullScreenWidth = std::max<CGFloat>(636, approximatelyHalfScreenSize);
    479476    [window setMinFullScreenContentSize:NSMakeSize(minimumFullScreenWidth, minimumWindowHeight)];
    480477    [window setCollectionBehavior:([window collectionBehavior] | NSWindowCollectionBehaviorFullScreenAllowsTiling)];
    481 #endif
    482478
    483479    window.titlebarAppearsTransparent = YES;

  • trunk/Source/WebKit/mac/WebView/WebView.mm

    r219012 r219050  
    93839383
    93849384#if PLATFORM(MAC)
    9385 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
    93869385- (WebImmediateActionController *)_immediateActionController
    93879386{
    … …  
    94029401    });
    94039402}
    9404 #endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
    94059403
    94069404- (NSEvent *)_pressureEvent

  • trunk/Source/WebKit2/ChangeLog

    r219049 r219050  
     12017-07-01  Dan Bernstein  <mitz@apple.com>
     2
     3        [macOS] Remove code only needed when building for OS X Yosemite
     4        https://bugs.webkit.org/show_bug.cgi?id=174067
     5
     6        Reviewed by Tim Horton.
     7
     8        * Configurations/Base.xcconfig:
     9        * Configurations/BaseTarget.xcconfig:
     10        * Configurations/BaseXPCService.xcconfig:
     11        * Configurations/DebugRelease.xcconfig:
     12        * Configurations/FeatureDefines.xcconfig:
     13        * Configurations/NetworkService.xcconfig:
     14        * Configurations/PluginService.32.xcconfig:
     15        * Configurations/PluginService.64.xcconfig:
     16        * Configurations/Version.xcconfig:
     17        * Configurations/WebContentService.xcconfig:
     18        * Configurations/WebKit.xcconfig:
     19        * DatabaseProcess/mac/com.apple.WebKit.Databases.sb.in:
     20        * NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist: Removed.
     21        * NetworkProcess/NetworkProcessCreationParameters.cpp:
     22        (WebKit::NetworkProcessCreationParameters::encode):
     23        (WebKit::NetworkProcessCreationParameters::decode):
     24        * NetworkProcess/NetworkProcessCreationParameters.h:
     25        * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
     26        (WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
     27        * NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in:
     28        * Platform/IPC/Connection.h:
     29        * Platform/IPC/mac/ConnectionMac.mm:
     30        (IPC::Connection::platformInvalidate):
     31        (IPC::Connection::platformInitialize):
     32        (IPC::Connection::open):
     33        (IPC::Connection::exceptionSourceEventHandler): Deleted.
     34        (IPC::Connection::setShouldCloseConnectionOnMachExceptions): Deleted.
     35        * Platform/mac/LayerHostingContext.h:
     36        * Platform/mac/LayerHostingContext.mm:
     37        (WebKit::LayerHostingContext::createFencePort):
     38        * PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist: Removed.
     39        * PluginProcess/mac/PluginControllerProxyMac.mm:
     40        (WebKit::PluginControllerProxy::updateLayerHostingContext):
     41        * PluginProcess/mac/PluginProcessShim.mm:
     42        * PluginProcess/mac/com.apple.WebKit.plugin-common.sb.in:
     43        * Shared/ChildProcess.h:
     44        * Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm:
     45        (WebKit::getPluginInfoFromPropertyLists):
     46        (WebKit::NetscapePluginModule::getPluginInfo):
     47        (WebKit::contentsOfPropertyListAtURL): Deleted.
     48        (WebKit::getMIMETypesFromPluginBundle): Deleted.
     49        * Shared/Plugins/PluginProcessCreationParameters.cpp:
     50        (WebKit::PluginProcessCreationParameters::encode):
     51        (WebKit::PluginProcessCreationParameters::decode):
     52        * Shared/Plugins/PluginProcessCreationParameters.h:
     53        * Shared/WebProcessCreationParameters.cpp:
     54        (WebKit::WebProcessCreationParameters::encode):
     55        (WebKit::WebProcessCreationParameters::decode):
     56        * Shared/WebProcessCreationParameters.h:
     57        * Shared/mac/ChildProcessMac.mm:
     58        (WebKit::ChildProcess::setSharedHTTPCookieStorage):
     59        * UIProcess/API/C/WKPage.cpp:
     60        (WKPageSetPageUIClient):
     61        (fixUpBotchedPageUIClient): Deleted.
     62        * UIProcess/ChildProcessProxy.cpp:
     63        (WebKit::ChildProcessProxy::didFinishLaunching):
     64        * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
     65        (WebKit::WebProcessPool::platformInitializeWebProcess):
     66        (WebKit::WebProcessPool::platformInitializeNetworkProcess):
     67        (WebKit::WebProcessPool::resetHSTSHostsAddedAfterDate):
     68        * UIProcess/Cocoa/WebViewImpl.h:
     69        * UIProcess/Cocoa/WebViewImpl.mm:
     70        (WebKit::WebViewImpl::updateLayer):
     71        (WebKit::WebViewImpl::startWindowDrag):
     72        * UIProcess/DrawingAreaProxy.h:
     73        (WebKit::DrawingAreaProxy::waitForPossibleGeometryUpdate): Deleted.
     74        * UIProcess/Plugins/PluginProcessProxy.cpp:
     75        (WebKit::PluginProcessProxy::didFinishLaunching):
     76        * UIProcess/Plugins/PluginProcessProxy.h:
     77        * UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
     78        (WebKit::PluginProcessProxy::platformInitializePluginProcess):
     79        (WebKit::PluginProcessProxy::createPropertyListFile): Deleted.
     80        * UIProcess/WebPageProxy.cpp:
     81        (WebKit::WebPageProxy::setTopContentInset):
     82        * UIProcess/mac/PageClientImpl.mm:
     83        (WebKit::PageClientImpl::rootViewToWindow):
     84        (WebKit::PageClientImpl::startWindowDrag):
     85        * UIProcess/mac/RemoteWebInspectorProxyMac.mm:
     86        (WebKit::RemoteWebInspectorProxy::platformStartWindowDrag):
     87        * UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h:
     88        * UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm:
     89        (WebKit::TiledCoreAnimationDrawingAreaProxy::createFence):
     90        (WebKit::TiledCoreAnimationDrawingAreaProxy::waitForPossibleGeometryUpdate): Deleted.
     91        * UIProcess/mac/WebInspectorProxyMac.mm:
     92        (WebKit::WebInspectorProxy::createFrontendWindow):
     93        (WebKit::WebInspectorProxy::platformStartWindowDrag):
     94        * UIProcess/mac/WebPopupMenuProxyMac.mm:
     95        (WebKit::WebPopupMenuProxyMac::showPopupMenu):
     96        * WebKit2.xcodeproj/project.pbxproj:
     97        * WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist: Removed.
     98        * WebProcess/WebPage/WebPage.cpp:
     99        * WebProcess/WebPage/WebPage.h:
     100        * WebProcess/WebPage/WebPage.messages.in:
     101        * WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm:
     102        (WebKit::addAnimationToLayer):
     103        * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
     104        (WebKit::RemoteLayerTreeDrawingArea::flushLayers):
     105        * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
     106        (WebKit::TiledCoreAnimationDrawingArea::flushLayers):
     107        (WebKit::TiledCoreAnimationDrawingArea::updateGeometry):
     108        * WebProcess/cocoa/WebProcessCocoa.mm:
     109        (WebKit::WebProcess::platformInitializeWebProcess):
     110        * WebProcess/com.apple.WebProcess.sb.in:
     111
    11122017-07-01  Chris Dumez  <cdumez@apple.com>
    2113

  • trunk/Source/WebKit2/Configurations/Base.xcconfig

    r217531 r219050  
    7979
    8080TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
    81 TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
    8281TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
    8382TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;

  • trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig

    r215247 r219050  
    9393WK_MANUAL_SANDBOXING_DEFINES_YES = ENABLE_MANUAL_SANDBOXING;
    9494
    95 WK_DONT_LINK_SHIM = $(WK_DONT_LINK_SHIM_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    96 WK_DONT_LINK_SHIM_101000 = YES;
    97 
    98 WK_LINK_SHIM[sdk=macosx*] = $(WK_NOT_$(WK_DONT_LINK_SHIM));
    99 
    10095WK_EMPTY_ = YES;
    10196WK_NOT_ = YES;

  • trunk/Source/WebKit2/Configurations/BaseXPCService.xcconfig

    r217809 r219050  
    6464CODE_SIGN_ENTITLEMENTS_IOS_MANUAL_SANDBOXING_YES = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2/$(WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE)-no-sandbox.entitlements;
    6565
    66 WK_XPC_SERVICE_INFOPLIST_SUFFIX[sdk=macosx*] = $(WK_XPC_SERVICE_INFOPLIST_SUFFIX_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    67 WK_XPC_SERVICE_INFOPLIST_SUFFIX_101000 = -10.9-10.10;
    68 
    6966WK_XPC_SERVICE_INSERT_LIBRARIES_DIR = $(WK_XPC_SERVICE_INSERT_LIBRARIES_DIR_$(WK_RELOCATABLE_FRAMEWORKS));
    7067WK_XPC_SERVICE_INSERT_LIBRARIES_DIR_ = $(WK_XPC_SERVICE_INSERT_LIBRARIES_DIR_NO);

  • trunk/Source/WebKit2/Configurations/DebugRelease.xcconfig

    r218057 r219050  
    3131
    3232MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    33 MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
    3433MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
    3534MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
    … …  
    4342WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphonesimulator*] = WebKitSystemInterfaceIOSSimulator$(WK_TARGET_IOS_VERSION_MAJOR);
    4443WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=macosx*] = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    45 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000 = WebKitSystemInterfaceYosemite;
    4644WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101100 = WebKitSystemInterfaceElCapitan;
    4745WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101200 = WebKitSystemInterfaceOSX10.12;

  • trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig

    r219012 r219050  
    3333
    3434TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    35 TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101000 = YES;
    3635TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101100 = YES;
    3736
    3837TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    39 TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101000 = YES;
    4038TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101100 = YES;
    4139TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101200 = YES;

  • trunk/Source/WebKit2/Configurations/NetworkService.xcconfig

    r209288 r219050  
    2929PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_NAME);
    3030INFOPLIST_FILE[sdk=iphone*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist;
    31 INFOPLIST_FILE[sdk=macosx*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX$(WK_XPC_SERVICE_INFOPLIST_SUFFIX).plist;
     31INFOPLIST_FILE[sdk=macosx*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist;
    3232
    33 OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(OTHER_LDFLAGS_SHIM_$(WK_LINK_SHIM)) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
    34 OTHER_LDFLAGS_SHIM_YES = $(BUILT_PRODUCTS_DIR)/SecItemShim.dylib;
     33OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
     34OTHER_LDFLAGS[sdk=macosx*] = $(inherited) $(BUILT_PRODUCTS_DIR)/SecItemShim.dylib;

  • trunk/Source/WebKit2/Configurations/PluginService.32.xcconfig

    r209288 r219050  
    2828PRODUCT_NAME = com.apple.WebKit.Plugin.32;
    2929PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_NAME);
    30 INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64$(WK_XPC_SERVICE_INFOPLIST_SUFFIX).Info.plist;
     30INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist;
    3131
    3232OTHER_LDFLAGS = $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
    33 OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit $(OTHER_LDFLAGS_SHIM_$(WK_LINK_SHIM));
    34 OTHER_LDFLAGS_SHIM_YES = $(BUILT_PRODUCTS_DIR)/PluginProcessShim.dylib;
     33OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit $(BUILT_PRODUCTS_DIR)/PluginProcessShim.dylib;
    3534
    3635CODE_SIGN_ENTITLEMENTS = Configurations/PluginService.entitlements;

  • trunk/Source/WebKit2/Configurations/PluginService.64.xcconfig

    r209288 r219050  
    2828PRODUCT_NAME = com.apple.WebKit.Plugin.64;
    2929PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_NAME);
    30 INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64$(WK_XPC_SERVICE_INFOPLIST_SUFFIX).Info.plist;
     30INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist;
    3131
    3232OTHER_LDFLAGS = $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
    33 OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit $(OTHER_LDFLAGS_SHIM_$(WK_LINK_SHIM));
    34 OTHER_LDFLAGS_SHIM_YES = $(BUILT_PRODUCTS_DIR)/PluginProcessShim.dylib;
     33OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit $(BUILT_PRODUCTS_DIR)/PluginProcessShim.dylib;
    3534
    3635CODE_SIGN_ENTITLEMENTS = Configurations/PluginService.entitlements;

  • trunk/Source/WebKit2/Configurations/Version.xcconfig

    r218942 r219050  
    3636SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
    3737SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    38 SYSTEM_VERSION_PREFIX_macosx_101000 = 10;
    3938SYSTEM_VERSION_PREFIX_macosx_101100 = 11;
    4039SYSTEM_VERSION_PREFIX_macosx_101200 = 12;

  • trunk/Source/WebKit2/Configurations/WebContentService.xcconfig

    r209288 r219050  
    3333PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_NAME);
    3434INFOPLIST_FILE[sdk=iphone*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist;
    35 INFOPLIST_FILE[sdk=macosx*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX$(WK_XPC_SERVICE_INFOPLIST_SUFFIX).plist;
     35INFOPLIST_FILE[sdk=macosx*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist;
    3636
    3737OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH_$(WK_WEBCONTENT_SERVICE_NEEDS_VERSIONED_FRAMEWORK_PATH_LDFLAG)) $(OTHER_LDFLAGS_PLATFORM) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
    38 OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit $(OTHER_LDFLAGS_SHIM_$(WK_LINK_SHIM));
    39 OTHER_LDFLAGS_SHIM_YES = $(BUILT_PRODUCTS_DIR)/WebProcessShim.dylib;
     38OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit $(BUILT_PRODUCTS_DIR)/WebProcessShim.dylib;
    4039
    4140WK_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)));

  • trunk/Source/WebKit2/Configurations/WebKit.xcconfig

    r217720 r219050  
    7676
    7777WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED[sdk=macosx*] = $(WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    78 WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED_macosx_101000 = YES;
    7978WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED_macosx_101100 = YES;
    8079WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED_macosx_101200 = YES;

  • trunk/Source/WebKit2/DatabaseProcess/mac/com.apple.WebKit.Databases.sb.in

    r216941 r219050  
    3333(allow process-info-setcontrol (target self))
    3434
    35 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
    3635(deny sysctl*)
    3736(allow sysctl-read
    … …  
    4443
    4544(deny iokit-get-properties)
    46 #endif
    4745
    4846#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
    … …  
    112110    (global-name "com.apple.analyticsd")
    113111#endif
    114 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
    115112    (global-name "com.apple.lsd.mapdb")
    116 #endif
    117113)
    118114

  • trunk/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.cpp

    r217871 r219050  
    5555#endif
    5656#endif
    57 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
     57#if PLATFORM(MAC)
    5858    encoder << uiProcessCookieStorageIdentifier;
    5959#endif
    … …  
    8181    encoder << httpProxy;
    8282    encoder << httpsProxy;
    83 #if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     83#if PLATFORM(COCOA)
    8484    IPC::encode(encoder, networkATSContext.get());
    8585#endif
    … …  
    127127#endif
    128128#endif
    129 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
     129#if PLATFORM(MAC)
    130130    if (!decoder.decode(result.uiProcessCookieStorageIdentifier))
    131131        return false;
    … …  
    172172    if (!decoder.decode(result.httpsProxy))
    173173        return false;
    174 #if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     174#if PLATFORM(COCOA)
    175175    if (!IPC::decode(decoder, result.networkATSContext))
    176176        return false;

  • trunk/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.h

    r217871 r219050  
    6464#endif
    6565#endif
    66 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
     66#if PLATFORM(MAC)
    6767    Vector<uint8_t> uiProcessCookieStorageIdentifier;
    6868#endif
    … …  
    9292    String httpProxy;
    9393    String httpsProxy;
    94 #if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     94#if PLATFORM(COCOA)
    9595    RetainPtr<CFDataRef> networkATSContext;
    9696#endif

  • trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm

    r218024 r219050  
    7676    m_diskCacheDirectory = parameters.diskCacheDirectory;
    7777
    78 #if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
    7978    _CFNetworkSetATSContext(parameters.networkATSContext.get());
    80 #endif
    8179
    8280    SessionTracker::setIdentifierBase(parameters.uiProcessBundleIdentifier);
    … …  
    9492    initializeNetworkSettings();
    9593
    96 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
     94#if PLATFORM(MAC)
    9795    setSharedHTTPCookieStorage(parameters.uiProcessCookieStorageIdentifier);
    9896#endif

  • trunk/Source/WebKit2/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in

    r217871 r219050  
    3333(allow process-info-setcontrol (target self))
    3434
    35 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
    3635(deny sysctl*)
    3736(allow sysctl-read
    … …  
    4443
    4544(deny iokit-get-properties)
    46 #endif
    4745
    4846#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
    … …  
    153151    (global-name "com.apple.cookied")
    154152    (global-name "com.apple.cfnetwork.AuthBrokerAgent")
    155 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
    156153    (global-name "com.apple.lsd.mapdb")
    157154    (global-name "com.apple.nesessionmanager.flow-divert-token")
    158 #endif
    159155)
    160156

  • trunk/Source/WebKit2/Platform/IPC/Connection.h

    r218457 r219050  
    144144    Client& client() const { return m_client; }
    145145
    146 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
    147     void setShouldCloseConnectionOnMachExceptions();
    148 #endif
    149 
    150146    void setOnlySendMessagesAsDispatchWhenWaitingForSyncReplyWhenProcessingSuchAMessage(bool);
    151147    void setShouldExitOnSyncMessageSendFailure(bool shouldExitOnSyncMessageSendFailure);
    … …  
    333329
    334330    std::unique_ptr<MachMessage> m_pendingOutgoingMachMessage;
    335 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
    336     void exceptionSourceEventHandler();
    337 
    338     // If setShouldCloseConnectionOnMachExceptions has been called, this has
    339     // the exception port that exceptions from the other end will be sent on.
    340     mach_port_t m_exceptionPort;
    341     dispatch_source_t m_exceptionPortDataAvailableSource;
    342 #endif
    343331
    344332    OSObjectPtr<xpc_connection_t> m_xpcConnection;

  • trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm

    r215173 r219050  
    145145    m_receiveSource = nullptr;
    146146    m_receivePort = MACH_PORT_NULL;
    147 
    148 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
    149     if (m_exceptionPort) {
    150         dispatch_source_cancel(m_exceptionPortDataAvailableSource);
    151         dispatch_release(m_exceptionPortDataAvailableSource);
    152         m_exceptionPortDataAvailableSource = 0;
    153         m_exceptionPort = MACH_PORT_NULL;
    154     }
    155 #endif
    156147}
    157148   
    … …  
    164155void Connection::platformInitialize(Identifier identifier)
    165156{
    166 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
    167     m_exceptionPort = MACH_PORT_NULL;
    168     m_exceptionPortDataAvailableSource = nullptr;
    169 #endif
    170 
    171157    if (m_isServer) {
    172158        m_receivePort = identifier.port;
    … …  
    226212    });
    227213
    228 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
    229     if (m_exceptionPort) {
    230         m_exceptionPortDataAvailableSource = dispatch_source_create(DISPATCH_SOURCE_TYPE_MACH_RECV, m_exceptionPort, 0, m_connectionQueue->dispatchQueue());
    231         dispatch_source_set_event_handler(m_exceptionPortDataAvailableSource, [connection] {
    232             connection->exceptionSourceEventHandler();
    233         });
    234         dispatch_source_set_cancel_handler(m_exceptionPortDataAvailableSource, [connection, exceptionPort = m_exceptionPort] {
    235             mach_port_mod_refs(mach_task_self(), exceptionPort, MACH_PORT_RIGHT_RECEIVE, -1);
    236         });
    237 
    238         auto encoder = std::make_unique<Encoder>("IPC", "SetExceptionPort", 0);
    239         encoder->encode(MachPort(m_exceptionPort, MACH_MSG_TYPE_MAKE_SEND));
    240 
    241         sendMessage(WTFMove(encoder), { });
    242     }
    243 #endif
    244 
    245214    ref();
    246215    dispatch_async(m_connectionQueue->dispatchQueue(), ^{
    … …  
    249218        if (m_sendSource)
    250219            dispatch_resume(m_sendSource);
    251 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
    252         if (m_exceptionPortDataAvailableSource)
    253             dispatch_resume(m_exceptionPortDataAvailableSource);
    254 #endif
    255220
    256221        deref();
    … …  
    593558}   
    594559
    595 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
    596 void Connection::exceptionSourceEventHandler()
    597 {
    598     ReceiveBuffer buffer;
    599 
    600     mach_msg_header_t* header = readFromMachPort(m_exceptionPort, buffer);
    601     if (!header)
    602         return;
    603 
    604     // We've read the exception message. Now send it on to the real exception port.
    605 
    606     // The remote port should have a send once right.
    607     ASSERT(MACH_MSGH_BITS_REMOTE(header->msgh_bits) == MACH_MSG_TYPE_MOVE_SEND_ONCE);
    608 
    609     // Now get the real exception port.
    610     mach_port_t exceptionPort = machExceptionPort();
    611 
    612     // First, get the complex bit from the source message.
    613     mach_msg_bits_t messageBits = header->msgh_bits & MACH_MSGH_BITS_COMPLEX;
    614     messageBits |= MACH_MSGH_BITS(MACH_MSG_TYPE_COPY_SEND, MACH_MSG_TYPE_MOVE_SEND_ONCE);
    615 
    616     header->msgh_bits = messageBits;
    617     header->msgh_local_port = header->msgh_remote_port;
    618     header->msgh_remote_port = exceptionPort;
    619 
    620     // Now send along the message.
    621     kern_return_t kr = mach_msg(header, MACH_SEND_MSG, header->msgh_size, 0, MACH_PORT_NULL, MACH_MSG_TIMEOUT_NONE, MACH_PORT_NULL);
    622     if (kr != KERN_SUCCESS)
    623         LOG_ERROR("Failed to send message to real exception port. %s (%x)", mach_error_string(kr), kr);
    624 
    625     connectionDidClose();
    626 }
    627 
    628 void Connection::setShouldCloseConnectionOnMachExceptions()
    629 {
    630     ASSERT(m_exceptionPort == MACH_PORT_NULL);
    631 
    632     if (mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &m_exceptionPort) != KERN_SUCCESS)
    633         ASSERT_NOT_REACHED();
    634 
    635     if (mach_port_insert_right(mach_task_self(), m_exceptionPort, m_exceptionPort, MACH_MSG_TYPE_MAKE_SEND) != KERN_SUCCESS)
    636         ASSERT_NOT_REACHED();
    637 }
    638 #endif
    639 
    640560IPC::Connection::Identifier Connection::identifier() const
    641561{

  • trunk/Source/WebKit2/Platform/mac/LayerHostingContext.h

    r187587 r219050  
    6363    CGColorSpaceRef colorSpace() const;
    6464
    65 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
     65#if PLATFORM(MAC)
    6666    void setColorMatchUntaggedContent(bool);
    6767    bool colorMatchUntaggedContent() const;

  • trunk/Source/WebKit2/Platform/mac/LayerHostingContext.mm

    r212211 r219050  
    103103}
    104104
    105 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
     105#if PLATFORM(MAC)
    106106void LayerHostingContext::setColorMatchUntaggedContent(bool colorMatchUntaggedContent)
    107107{
    … …  
    115115#endif
    116116
    117 #if HAVE(COREANIMATION_FENCES)
    118117void LayerHostingContext::setFencePort(mach_port_t fencePort)
    119118{
    … …  
    125124    return MachSendRight::adopt([m_context createFencePort]);
    126125}
    127 #else
    128 NO_RETURN_DUE_TO_ASSERT void LayerHostingContext::setFencePort(mach_port_t fencePort)
    129 {
    130     ASSERT_NOT_REACHED();
    131 }
    132 
    133 NO_RETURN_DUE_TO_ASSERT MachSendRight LayerHostingContext::createFencePort()
    134 {
    135     ASSERT_NOT_REACHED();
    136 #if ASSERT_DISABLED
    137     return MachSendRight();
    138 #endif
    139 }
    140 #endif
    141126
    142127} // namespace WebKit

  • trunk/Source/WebKit2/PluginProcess/mac/PluginControllerProxyMac.mm

    r217520 r219050  
    136136    }
    137137
    138 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
    139138    m_layerHostingContext->setColorSpace(sRGBColorSpaceRef());
    140139    m_layerHostingContext->setColorMatchUntaggedContent(true);
    141 #endif
    142140
    143141    m_layerHostingContext->setRootLayer(platformLayer);

  • trunk/Source/WebKit2/PluginProcess/mac/PluginProcessShim.mm

    r203001 r219050  
    113113}
    114114
    115 #if __MAC_OS_X_VERSION_MIN_REQUIRED < 101100
    116 SUPPRESS_ASAN
    117 #endif
    118115static 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)
    119116{

  • trunk/Source/WebKit2/PluginProcess/mac/com.apple.WebKit.plugin-common.sb.in

    r218749 r219050  
    3333(allow process-info-setcontrol (target self))
    3434
    35 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
    3635(deny sysctl*)
    3736(allow sysctl-read
    … …  
    123122    (iokit-property "touch-size-id")
    124123)
    125 #endif
    126124
    127125#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
    … …  
    352350    (global-name "com.apple.analyticsd")
    353351#endif
    354 #if __MAC_OS_X_VERSION_MIN_REQUIRED < 101100
    355     (global-name "com.apple.audio.VDCAssistant")
    356 #endif
    357352    (global-name "com.apple.audio.audiohald")
    358353    (global-name "com.apple.audio.coreaudiod")
    … …  
    362357    (global-name "com.apple.coreservices.launchservicesd")
    363358    (global-name "com.apple.fonts")
    364 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
    365359    (global-name "com.apple.lsd.mapdb")
    366 #endif
    367360    (global-name "com.apple.ocspd")
    368361    (global-name "com.apple.pasteboard.1")

  • trunk/Source/WebKit2/Shared/ChildProcess.h

    r215173 r219050  
    8989    virtual void initializeConnection(IPC::Connection*);
    9090
    91 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
     91#if PLATFORM(MAC)
    9292    static void setSharedHTTPCookieStorage(const Vector<uint8_t>& identifier);
    9393#endif

  • trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm

    r211223 r219050  
    7979}
    8080
    81 #if __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
    82 static RetainPtr<CFDictionaryRef> contentsOfPropertyListAtURL(CFURLRef propertyListURL)
    83 {
    84     RetainPtr<NSData> propertyListData = adoptNS([[NSData alloc] initWithContentsOfURL:(NSURL *)propertyListURL]);
    85     if (!propertyListData)
    86         return 0;
    87 
    88     RetainPtr<CFPropertyListRef> propertyList = adoptCF(CFPropertyListCreateWithData(kCFAllocatorDefault, (CFDataRef)propertyListData.get(), kCFPropertyListImmutable, 0, 0));
    89     if (!propertyList)
    90         return 0;
    91 
    92     if (CFGetTypeID(propertyList.get()) != CFDictionaryGetTypeID())
    93         return 0;
    94 
    95     return static_cast<CFDictionaryRef>(propertyList.get());
    96 }
    97 #endif
    98 
    99 static RetainPtr<CFDictionaryRef> getMIMETypesFromPluginBundle(CFBundleRef bundle, const PluginModuleInfo& plugin)
    100 {
    101 #if __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
    102     CFStringRef propertyListFilename = static_cast<CFStringRef>(CFBundleGetValueForInfoDictionaryKey(bundle, CFSTR("WebPluginMIMETypesFilename")));
    103     if (propertyListFilename) {
    104         RetainPtr<CFStringRef> propertyListPath = adoptCF(CFStringCreateWithFormat(kCFAllocatorDefault, 0, CFSTR("%@/Library/Preferences/%@"), NSHomeDirectory(), propertyListFilename));
    105         RetainPtr<CFURLRef> propertyListURL = adoptCF(CFURLCreateWithFileSystemPath(kCFAllocatorDefault, propertyListPath.get(), kCFURLPOSIXPathStyle, FALSE));
    106 
    107         RetainPtr<CFDictionaryRef> propertyList = contentsOfPropertyListAtURL(propertyListURL.get());
    108 
    109         if (!propertyList && PluginProcessProxy::createPropertyListFile(plugin))
    110             propertyList = contentsOfPropertyListAtURL(propertyListURL.get());
    111 
    112         if (!propertyList)
    113             return 0;
    114        
    115         return static_cast<CFDictionaryRef>(CFDictionaryGetValue(propertyList.get(), CFSTR("WebPluginMIMETypes")));
    116     }
    117 #endif
    118    
    119     return static_cast<CFDictionaryRef>(CFBundleGetValueForInfoDictionaryKey(bundle, CFSTR("WebPluginMIMETypes")));
    120 }
    121 
    12281static bool getPluginInfoFromPropertyLists(CFBundleRef bundle, PluginModuleInfo& plugin)
    12382{
    124     RetainPtr<CFDictionaryRef> mimeTypes = getMIMETypesFromPluginBundle(bundle, plugin);
     83    RetainPtr<CFDictionaryRef> mimeTypes = static_cast<CFDictionaryRef>(CFBundleGetValueForInfoDictionaryKey(bundle, CFSTR("WebPluginMIMETypes")));
    12584    if (!mimeTypes || CFGetTypeID(mimeTypes.get()) != CFDictionaryGetTypeID())
    12685        return false;
    … …  
    210169   
    211170    // Try to initialize the bundle.
    212 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
    213171    RetainPtr<CFBundleRef> bundle = adoptCF(_CFBundleCreateUnique(kCFAllocatorDefault, bundleURL.get()));
    214 #else
    215     RetainPtr<CFBundleRef> bundle = adoptCF(CFBundleCreate(kCFAllocatorDefault, bundleURL.get()));
    216 #endif
    217 
    218172    if (!bundle)
    219173        return false;

  • trunk/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp

    r204668 r219050  
    4848#if PLATFORM(COCOA)
    4949    encoder << acceleratedCompositingPort;
    50 #if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
    5150    IPC::encode(encoder, networkATSContext.get());
    52 #endif
    5351#endif
    5452#if OS(LINUX)
    … …  
    7068    if (!decoder.decode(result.acceleratedCompositingPort))
    7169        return false;
    72 #if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
    7370    if (!IPC::decode(decoder, result.networkATSContext))
    7471        return false;
    75 #endif
    7672#endif
    7773#if OS(LINUX)

  • trunk/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.h

    r215173 r219050  
    5858#if PLATFORM(COCOA)
    5959    WebCore::MachSendRight acceleratedCompositingPort;
    60 #if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
    6160    RetainPtr<CFDataRef> networkATSContext;
    62 #endif
    6361#endif
    6462#if OS(LINUX)

  • trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp

    r216903 r219050  
    5858    encoder << javaScriptConfigurationDirectory;
    5959    encoder << javaScriptConfigurationDirectoryExtensionHandle;
    60 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
     60#if PLATFORM(MAC)
    6161    encoder << uiProcessCookieStorageIdentifier;
    6262#endif
    … …  
    130130#endif
    131131
    132 #if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     132#if PLATFORM(COCOA)
    133133    IPC::encode(encoder, networkATSContext.get());
    134134#endif
    … …  
    175175    if (!decoder.decode(parameters.javaScriptConfigurationDirectoryExtensionHandle))
    176176        return false;
    177 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
     177#if PLATFORM(MAC)
    178178    if (!decoder.decode(parameters.uiProcessCookieStorageIdentifier))
    179179        return false;
    … …  
    304304#endif
    305305
    306 #if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     306#if PLATFORM(COCOA)
    307307    if (!IPC::decode(decoder, parameters.networkATSContext))
    308308        return false;

  • trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h

    r216903 r219050  
    7979    String javaScriptConfigurationDirectory;
    8080    SandboxExtension::Handle javaScriptConfigurationDirectoryExtensionHandle;
    81 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
     81#if PLATFORM(MAC)
    8282    Vector<uint8_t> uiProcessCookieStorageIdentifier;
    8383#endif
    … …  
    162162#endif
    163163
    164 #if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     164#if PLATFORM(COCOA)
    165165    RetainPtr<CFDataRef> networkATSContext;
    166166#endif

  • trunk/Source/WebKit2/Shared/mac/ChildProcessMac.mm

    r212211 r219050  
    178178}
    179179
    180 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
    181180void ChildProcess::setSharedHTTPCookieStorage(const Vector<uint8_t>& identifier)
    182181{
    … …  
    185184    [NSHTTPCookieStorage _setSharedHTTPCookieStorage:adoptNS([[NSHTTPCookieStorage alloc] _initWithCFHTTPCookieStorage:uiProcessCookieStorage.get()]).get()];
    186185}
    187 #endif
    188 
    189186
    190187#if USE(APPKIT)

  • trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp

    r219013 r219050  
    14051405}
    14061406
    1407 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
    1408 static void fixUpBotchedPageUIClient(WKPageRef pageRef, const WKPageUIClientBase& wkClient)
    1409 {
    1410     struct BotchedWKPageUIClientV4 {
    1411         WKPageUIClientBase                                                  base;
    1412 
    1413         // Version 0.
    1414         WKPageCreateNewPageCallback_deprecatedForUseWithV0                  createNewPage_deprecatedForUseWithV0;
    1415         WKPageUIClientCallback                                              showPage;
    1416         WKPageUIClientCallback                                              close;
    1417         WKPageTakeFocusCallback                                             takeFocus;
    1418         WKPageFocusCallback                                                 focus;
    1419         WKPageUnfocusCallback                                               unfocus;
    1420         WKPageRunJavaScriptAlertCallback_deprecatedForUseWithV0             runJavaScriptAlert_deprecatedForUseWithV0;
    1421         WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV0           runJavaScriptConfirm_deprecatedForUseWithV0;
    1422         WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV0            runJavaScriptPrompt_deprecatedForUseWithV0;
    1423         WKPageSetStatusTextCallback                                         setStatusText;
    1424         WKPageMouseDidMoveOverElementCallback_deprecatedForUseWithV0        mouseDidMoveOverElement_deprecatedForUseWithV0;
    1425         WKPageMissingPluginButtonClickedCallback_deprecatedForUseWithV0     missingPluginButtonClicked_deprecatedForUseWithV0;
    1426         WKPageDidNotHandleKeyEventCallback                                  didNotHandleKeyEvent;
    1427         WKPageDidNotHandleWheelEventCallback                                didNotHandleWheelEvent;
    1428         WKPageGetToolbarsAreVisibleCallback                                 toolbarsAreVisible;
    1429         WKPageSetToolbarsAreVisibleCallback                                 setToolbarsAreVisible;
    1430         WKPageGetMenuBarIsVisibleCallback                                   menuBarIsVisible;
    1431         WKPageSetMenuBarIsVisibleCallback                                   setMenuBarIsVisible;
    1432         WKPageGetStatusBarIsVisibleCallback                                 statusBarIsVisible;
    1433         WKPageSetStatusBarIsVisibleCallback                                 setStatusBarIsVisible;
    1434         WKPageGetIsResizableCallback                                        isResizable;
    1435         WKPageSetIsResizableCallback                                        setIsResizable;
    1436         WKPageGetWindowFrameCallback                                        getWindowFrame;
    1437         WKPageSetWindowFrameCallback                                        setWindowFrame;
    1438         WKPageRunBeforeUnloadConfirmPanelCallback_deprecatedForUseWithV6    runBeforeUnloadConfirmPanel;
    1439         WKPageUIClientCallback                                              didDraw;
    1440         WKPageUIClientCallback                                              pageDidScroll;
    1441         WKPageExceededDatabaseQuotaCallback                                 exceededDatabaseQuota;
    1442         WKPageRunOpenPanelCallback                                          runOpenPanel;
    1443         WKPageDecidePolicyForGeolocationPermissionRequestCallback           decidePolicyForGeolocationPermissionRequest;
    1444         WKPageHeaderHeightCallback                                          headerHeight;
    1445         WKPageFooterHeightCallback                                          footerHeight;
    1446         WKPageDrawHeaderCallback                                            drawHeader;
    1447         WKPageDrawFooterCallback                                            drawFooter;
    1448         WKPagePrintFrameCallback                                            printFrame;
    1449         WKPageUIClientCallback                                              runModal;
    1450         void*                                                               unused1; // Used to be didCompleteRubberBandForMainFrame
    1451         WKPageSaveDataToFileInDownloadsFolderCallback                       saveDataToFileInDownloadsFolder;
    1452         void*                                                               shouldInterruptJavaScript_unavailable;
    1453 
    1454         // Version 1.
    1455         WKPageCreateNewPageCallback_deprecatedForUseWithV1                  createNewPage;
    1456         WKPageMouseDidMoveOverElementCallback                               mouseDidMoveOverElement;
    1457         WKPageDecidePolicyForNotificationPermissionRequestCallback          decidePolicyForNotificationPermissionRequest;
    1458         WKPageUnavailablePluginButtonClickedCallback_deprecatedForUseWithV1 unavailablePluginButtonClicked_deprecatedForUseWithV1;
    1459 
    1460         // Version 2.
    1461         WKPageShowColorPickerCallback                                       showColorPicker;
    1462         WKPageHideColorPickerCallback                                       hideColorPicker;
    1463         WKPageUnavailablePluginButtonClickedCallback                        unavailablePluginButtonClicked;
    1464 
    1465         // Version 3.
    1466         WKPagePinnedStateDidChangeCallback                                  pinnedStateDidChange;
    1467 
    1468         // Version 4.
    1469         WKPageRunJavaScriptAlertCallback_deprecatedForUseWithV5             runJavaScriptAlert;
    1470         WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV5           runJavaScriptConfirm;
    1471         WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV5            runJavaScriptPrompt;
    1472     };
    1473 
    1474     const auto& botchedPageUIClient = reinterpret_cast<const BotchedWKPageUIClientV4&>(wkClient);
    1475 
    1476     WKPageUIClientV5 fixedPageUIClient = {
    1477         { 5, botchedPageUIClient.base.clientInfo },
    1478         botchedPageUIClient.createNewPage_deprecatedForUseWithV0,
    1479         botchedPageUIClient.showPage,
    1480         botchedPageUIClient.close,
    1481         botchedPageUIClient.takeFocus,
    1482         botchedPageUIClient.focus,
    1483         botchedPageUIClient.unfocus,
    1484         botchedPageUIClient.runJavaScriptAlert_deprecatedForUseWithV0,
    1485         botchedPageUIClient.runJavaScriptConfirm_deprecatedForUseWithV0,
    1486         botchedPageUIClient.runJavaScriptPrompt_deprecatedForUseWithV0,
    1487         botchedPageUIClient.setStatusText,
    1488         botchedPageUIClient.mouseDidMoveOverElement_deprecatedForUseWithV0,
    1489         botchedPageUIClient.missingPluginButtonClicked_deprecatedForUseWithV0,
    1490         botchedPageUIClient.didNotHandleKeyEvent,
    1491         botchedPageUIClient.didNotHandleWheelEvent,
    1492         botchedPageUIClient.toolbarsAreVisible,
    1493         botchedPageUIClient.setToolbarsAreVisible,
    1494         botchedPageUIClient.menuBarIsVisible,
    1495         botchedPageUIClient.setMenuBarIsVisible,
    1496         botchedPageUIClient.statusBarIsVisible,
    1497         botchedPageUIClient.setStatusBarIsVisible,
    1498         botchedPageUIClient.isResizable,
    1499         botchedPageUIClient.setIsResizable,
    1500         botchedPageUIClient.getWindowFrame,
    1501         botchedPageUIClient.setWindowFrame,
    1502         botchedPageUIClient.runBeforeUnloadConfirmPanel,
    1503         botchedPageUIClient.didDraw,
    1504         botchedPageUIClient.pageDidScroll,
    1505         botchedPageUIClient.exceededDatabaseQuota,
    1506         botchedPageUIClient.runOpenPanel,
    1507         botchedPageUIClient.decidePolicyForGeolocationPermissionRequest,
    1508         botchedPageUIClient.headerHeight,
    1509         botchedPageUIClient.footerHeight,
    1510         botchedPageUIClient.drawHeader,
    1511         botchedPageUIClient.drawFooter,
    1512         botchedPageUIClient.printFrame,
    1513         botchedPageUIClient.runModal,
    1514         botchedPageUIClient.unused1,
    1515         botchedPageUIClient.saveDataToFileInDownloadsFolder,
    1516         botchedPageUIClient.shouldInterruptJavaScript_unavailable,
    1517         botchedPageUIClient.createNewPage,
    1518         botchedPageUIClient.mouseDidMoveOverElement,
    1519         botchedPageUIClient.decidePolicyForNotificationPermissionRequest,
    1520         botchedPageUIClient.unavailablePluginButtonClicked_deprecatedForUseWithV1,
    1521         botchedPageUIClient.showColorPicker,
    1522         botchedPageUIClient.hideColorPicker,
    1523         botchedPageUIClient.unavailablePluginButtonClicked,
    1524         botchedPageUIClient.pinnedStateDidChange,
    1525         nullptr,
    1526         nullptr,
    1527         nullptr,
    1528         nullptr,
    1529         nullptr,
    1530         nullptr,
    1531         botchedPageUIClient.runJavaScriptAlert,
    1532         botchedPageUIClient.runJavaScriptConfirm,
    1533         botchedPageUIClient.runJavaScriptPrompt,
    1534         nullptr,
    1535     };
    1536 
    1537     WKPageSetPageUIClient(pageRef, &fixedPageUIClient.base);
    1538 }
    1539 #endif
    1540 
    15411407namespace WebKit {
    15421408
    … …  
    16901556void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient)
    16911557{
    1692 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
    1693     if (wkClient && wkClient->version == 4) {
    1694         fixUpBotchedPageUIClient(pageRef, *wkClient);
    1695         return;
    1696     }
    1697 #endif
    1698 
    16991558    class UIClient : public API::Client<WKPageUIClientBase>, public API::UIClient {
    17001559    public:

  • trunk/Source/WebKit2/UIProcess/ChildProcessProxy.cpp

    r216497 r219050  
    170170
    171171    m_connection = IPC::Connection::createServerConnection(connectionIdentifier, *this);
    172 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
    173     m_connection->setShouldCloseConnectionOnMachExceptions();
    174 #endif
    175172
    176173    connectionWillOpen(*m_connection);

  • trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm

    r218916 r219050  
    237237        }, data.leakRef());
    238238    }
    239 #if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
    240239    parameters.networkATSContext = adoptCF(_CFNetworkCopyATSContext());
    241 #endif
    242 
    243 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
     240
     241#if PLATFORM(MAC)
    244242    RetainPtr<CFDataRef> cookieStorageData = adoptCF(CFHTTPCookieStorageCreateIdentifyingData(kCFAllocatorDefault, [[NSHTTPCookieStorage sharedHTTPCookieStorage] _cookieStorage]));
    245243    ASSERT(parameters.uiProcessCookieStorageIdentifier.isEmpty());
    … …  
    281279    parameters.httpProxy = [defaults stringForKey:WebKit2HTTPProxyDefaultsKey];
    282280    parameters.httpsProxy = [defaults stringForKey:WebKit2HTTPSProxyDefaultsKey];
    283 #if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
    284281    parameters.networkATSContext = adoptCF(_CFNetworkCopyATSContext());
    285 #endif
    286282
    287283#if ENABLE(NETWORK_CACHE)
    … …  
    299295    parameters.loadThrottleLatency = Seconds { [defaults integerForKey:WebKitNetworkLoadThrottleLatencyMillisecondsDefaultsKey] / 1000. };
    300296
    301 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
     297#if PLATFORM(MAC)
    302298    RetainPtr<CFDataRef> cookieStorageData = adoptCF(CFHTTPCookieStorageCreateIdentifyingData(kCFAllocatorDefault, [[NSHTTPCookieStorage sharedHTTPCookieStorage] _cookieStorage]));
    303299    ASSERT(parameters.uiProcessCookieStorageIdentifier.isEmpty());
    … …  
    600596    NSDate *startDate = [NSDate dateWithTimeIntervalSince1970:startDateIntervalSince1970];
    601597    _CFNetworkResetHSTSHostsSinceDate(nullptr, (__bridge CFDateRef)startDate);
    602 #if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
    603598    _CFNetworkResetHSTSHostsSinceDate(privateBrowsingSession(), (__bridge CFDateRef)startDate);
    604 #endif
    605599}
    606600

  • trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h

    r218457 r219050  
    403403#endif
    404404
    405 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
    406405    void startWindowDrag();
    407 #endif
    408406
    409407    void dragImageForView(NSView *, NSImage *, CGPoint clientPoint, bool linkDrag);

  • trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm

    r218457 r219050  
    16081608    if (frameSizeUpdatesDisabled())
    16091609        return;
    1610 
    1611     if (DrawingAreaProxy* drawingArea = m_page->drawingArea())
    1612         drawingArea->waitForPossibleGeometryUpdate();
    16131610}
    16141611
    … …  
    37683765#endif // ENABLE(DRAG_SUPPORT)
    37693766
    3770 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
    37713767void WebViewImpl::startWindowDrag()
    37723768{
    37733769    [m_view.window performWindowDragWithEvent:m_lastMouseDownEvent.get()];
    37743770}
    3775 #endif
    37763771
    37773772void WebViewImpl::dragImageForView(NSView *view, NSImage *image, CGPoint clientPoint, bool)

  • trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h

    r218457 r219050  
    7272    // The timeout we use when waiting for a DidUpdateGeometry message.
    7373    static constexpr Seconds didUpdateBackingStoreStateTimeout() { return Seconds::fromMilliseconds(500); }
    74 
    75     virtual void waitForPossibleGeometryUpdate(Seconds = didUpdateBackingStoreStateTimeout()) { }
    7674
    7775    virtual void colorSpaceDidChange() { }

  • trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp

    r218457 r219050  
    219219
    220220    m_connection = IPC::Connection::createServerConnection(connectionIdentifier, *this);
    221 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
    222     m_connection->setShouldCloseConnectionOnMachExceptions();
    223 #endif
    224221
    225222    m_connection->open();

  • trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h

    r218457 r219050  
    8787#if PLATFORM(COCOA)
    8888    void setProcessSuppressionEnabled(bool);
    89 
    90 #if __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
    91     // Creates a property list in ~/Library/Preferences that contains all the MIME types supported by the plug-in.
    92     static bool createPropertyListFile(const PluginModuleInfo&);
    93 #endif
    9489
    9590#endif

  • trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm

    r215132 r219050  
    6060namespace WebKit {
    6161   
    62 #if __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
    63 bool PluginProcessProxy::createPropertyListFile(const PluginModuleInfo& plugin)
    64 {
    65     CString pluginPathString = fileSystemRepresentation(plugin.path);
    66 
    67     posix_spawnattr_t attr;
    68     posix_spawnattr_init(&attr);
    69 
    70     cpu_type_t cpuTypes[] = { plugin.pluginArchitecture };   
    71     size_t outCount = 0;
    72     posix_spawnattr_setbinpref_np(&attr, 1, cpuTypes, &outCount);
    73 
    74     posix_spawnattr_setflags(&attr, POSIX_SPAWN_CLOEXEC_DEFAULT);
    75 
    76     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 };
    77 
    78     pid_t pid;
    79     int result = posix_spawn(&pid, args[0], 0, &attr, const_cast<char* const*>(args), nullptr);
    80     posix_spawnattr_destroy(&attr);
    81 
    82     if (result)
    83         return false;
    84     int status;
    85     if (waitpid(pid, &status, 0) < 0)
    86         return false;
    87 
    88     if (!WIFEXITED(status))
    89         return false;
    90 
    91     if (WEXITSTATUS(status) != EXIT_SUCCESS)
    92         return false;
    93 
    94     return true;
    95 }
    96 #endif
    97 
    9862void PluginProcessProxy::platformGetLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions, const PluginProcessAttributes& pluginProcessAttributes)
    9963{
    … …  
    12185    parameters.acceleratedCompositingPort = MachSendRight::create([CARemoteLayerServer sharedServer].serverPort);
    12286#endif
    123 #if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
    12487    parameters.networkATSContext = adoptCF(_CFNetworkCopyATSContext());
    125 #endif
    12688}
    12789

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

    r219013 r219050  
    12951295    if (!isValid())
    12961296        return;
    1297 #if HAVE(COREANIMATION_FENCES)
     1297#if PLATFORM(COCOA)
    12981298    MachSendRight fence = m_drawingArea->createFence();
    12991299

  • trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm

    r217566 r219050  
    417417}
    418418
    419 #if PLATFORM(MAC)
    420419IntRect PageClientImpl::rootViewToWindow(const WebCore::IntRect& rect)
    421420{
    … …  
    424423    return enclosingIntRect(tempRect);
    425424}
    426 #endif
    427425
    428426void PageClientImpl::doneWithKeyEvent(const NativeWebKeyboardEvent& event, bool eventWasHandled)
    … …  
    842840void PageClientImpl::startWindowDrag()
    843841{
    844 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
    845842    m_impl->startWindowDrag();
    846 #endif
    847843}
    848844

  • trunk/Source/WebKit2/UIProcess/mac/RemoteWebInspectorProxyMac.mm

    r214442 r219050  
    222222void RemoteWebInspectorProxy::platformStartWindowDrag()
    223223{
    224 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
    225224    m_webView->_page->startWindowDrag();
     225}
     226
     227void RemoteWebInspectorProxy::platformOpenInNewTab(const String& url)
     228{
     229    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:url]];
     230}
     231
     232} // namespace WebKit
     233
    226234#endif
    227 }
    228 
    229 void RemoteWebInspectorProxy::platformOpenInNewTab(const String& url)
    230 {
    231     [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:url]];
    232 }
    233 
    234 } // namespace WebKit
    235 
    236 #endif

  • trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h

    r218457 r219050  
    4141    void deviceScaleFactorDidChange() override;
    4242    void sizeDidChange() override;
    43     void waitForPossibleGeometryUpdate(Seconds timeout = didUpdateBackingStoreStateTimeout()) override;
    4443    void colorSpaceDidChange() override;
    4544    void minimumLayoutSizeDidChange() override;

  • trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm

    r218457 r219050  
    7272}
    7373
    74 void TiledCoreAnimationDrawingAreaProxy::waitForPossibleGeometryUpdate(Seconds timeout)
    75 {
    76 #if !HAVE(COREANIMATION_FENCES)
    77     if (!m_isWaitingForDidUpdateGeometry)
    78         return;
    79 
    80     if (m_webPageProxy.process().state() != WebProcessProxy::State::Running)
    81         return;
    82 
    83     m_webPageProxy.process().connection()->waitForAndDispatchImmediately<Messages::DrawingAreaProxy::DidUpdateGeometry>(m_webPageProxy.pageID(), timeout, IPC::WaitForOption::InterruptWaitingIfSyncMessageArrives);
    84 #endif
    85 }
    86 
    8774void TiledCoreAnimationDrawingAreaProxy::colorSpaceDidChange()
    8875{
    … …  
    154141MachSendRight TiledCoreAnimationDrawingAreaProxy::createFence()
    155142{
    156 #if HAVE(COREANIMATION_FENCES)
    157143    if (!m_webPageProxy.isValid())
    158144        return MachSendRight();
    … …  
    190176
    191177    return fencePort;
    192 #else
    193     return MachSendRight();
    194 #endif
    195178}
    196179

  • trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm

    r215173 r219050  
    230230    [window setCollectionBehavior:([window collectionBehavior] | NSWindowCollectionBehaviorFullScreenPrimary)];
    231231
    232 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
    233232    CGFloat approximatelyHalfScreenSize = ([window screen].frame.size.width / 2) - 4;
    234233    CGFloat minimumFullScreenWidth = std::max<CGFloat>(636, approximatelyHalfScreenSize);
    235234    [window setMinFullScreenContentSize:NSMakeSize(minimumFullScreenWidth, minimumWindowHeight)];
    236235    [window setCollectionBehavior:([window collectionBehavior] | NSWindowCollectionBehaviorFullScreenAllowsTiling)];
    237 #endif
    238236
    239237    [window setTitlebarAppearsTransparent:YES];
    … …  
    688686void WebInspectorProxy::platformStartWindowDrag()
    689687{
    690 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
    691688    m_inspectorView->_page->startWindowDrag();
    692 #endif
    693689}
    694690

  • trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm

    r215830 r219050  
    113113
    114114    NSMenu *menu = [m_popup menu];
    115 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
    116115    [menu setUserInterfaceLayoutDirection:textDirection == LTR ? NSUserInterfaceLayoutDirectionLeftToRight : NSUserInterfaceLayoutDirectionRightToLeft];
    117 #endif
    118116
    119117    // These values were borrowed from AppKit to match their placement of the menu.

  • trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

    r219049 r219050  
    24712471                1A67CD2D1CBC513F00BFE3EA /* WKOpenPanelParametersInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKOpenPanelParametersInternal.h; sourceTree = "<group>"; };
    24722472                1A698F171E4910220064E881 /* ChildProcessCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ChildProcessCocoa.mm; sourceTree = "<group>"; };
    2473                 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>"; };
    2474                 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; };
    24752473                1A6D86BF1DF75265007745E8 /* MachMessage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MachMessage.cpp; sourceTree = "<group>"; };
    24762474                1A6D86C01DF75265007745E8 /* MachMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MachMessage.h; sourceTree = "<group>"; };
    … …  
    24912489                1A7C0DF41B7D1F1000A9B848 /* WKWindowFeaturesRef.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKWindowFeaturesRef.cpp; sourceTree = "<group>"; };
    24922490                1A7C0DF51B7D1F1000A9B848 /* WKWindowFeaturesRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWindowFeaturesRef.h; sourceTree = "<group>"; };
    2493                 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>"; };
    24942491                1A7E377418E4A33A003D0FFF /* WKScriptMessageHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKScriptMessageHandler.h; sourceTree = "<group>"; };
    24952492                1A7E377618E4A4FE003D0FFF /* WKScriptMessage.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKScriptMessage.mm; sourceTree = "<group>"; };
    … …  
    74507447                        children = (
    74517448                                26659AA0185FAAED004303DD /* Info-iOS.plist */,
    7452                                 1A6D141F1B0167D500785FF0 /* Info-OSX-10.9-10.10.plist */,
    74537449                                BC8283A316B4BD9100A278FE /* Info-OSX.plist */,
    74547450                        );
    … …  
    74697465                        isa = PBXGroup;
    74707466                        children = (
    7471                                 1A6D14211B01681600785FF0 /* PluginService.32-64-10.9-10.10.Info.plist */,
    74727467                                BCFCA89516DE96CB00074069 /* PluginService.32-64.Info.plist */,
    74737468                        );
    … …  
    75527547                        children = (
    75537548                                375FB4731883415600BE34D4 /* Info-iOS.plist */,
    7554                                 1A7DA54D1AFD8B380018239D /* Info-OSX-10.9-10.10.plist */,
    75557549                                BCACC44016B24CAA00B6E092 /* Info-OSX.plist */,
    75567550                        );

  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

    r219012 r219050  
    25762576}
    25772577
    2578 #if HAVE(COREANIMATION_FENCES)
     2578#if PLATFORM(COCOA)
    25792579void WebPage::setTopContentInsetFenced(float contentInset, IPC::Attachment fencePort)
    25802580{

  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h

    r218985 r219050  
    10991099    void setDrawsBackground(bool);
    11001100
    1101 #if HAVE(COREANIMATION_FENCES)
     1101#if PLATFORM(COCOA)
    11021102    void setTopContentInsetFenced(float, IPC::Attachment);
    11031103#endif

  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in

    r218985 r219050  
    2828    SetDrawsBackground(bool drawsBackground)
    2929
    30 #if HAVE(COREANIMATION_FENCES)
     30#if PLATFORM(COCOA)
    3131    SetTopContentInsetFenced(float contentInset, IPC::Attachment fencePort)
    3232#endif

  • trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm

    r216810 r219050  
    781781                [springAnimation setStiffness:function.stiffness()];
    782782                [springAnimation setDamping:function.damping()];
    783 #if PLATFORM(IOS) || PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
    784783                [springAnimation setInitialVelocity:function.initialVelocity()];
    785 #else
    786                 [springAnimation setVelocity:function.initialVelocity()];
    787 #endif
    788784            }
    789785        }

  • trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm

    r218985 r219050  
    347347        visibleRect.intersect(m_scrolledViewExposedRect.value());
    348348
    349 #if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
    350349    RefPtr<WebPage> retainedPage = &m_webPage;
    351350    [CATransaction addCommitHandler:[retainedPage] {
    … …  
    355354        }
    356355    } forPhase:kCATransactionPhasePostCommit];
    357 #endif
    358356
    359357    m_webPage.mainFrameView()->flushCompositingStateIncludingSubframes();

  • trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm

    r218985 r219050  
    429429
    430430        RefPtr<WebPage> retainedPage = &m_webPage;
    431 #if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
    432431        [CATransaction addCommitHandler:[retainedPage] {
    433432            if (Page* corePage = retainedPage->corePage()) {
    … …  
    438437                drawingArea->sendPendingNewlyReachedLayoutMilestones();
    439438        } forPhase:kCATransactionPhasePostCommit];
    440 #else
    441         dispatch_async(dispatch_get_main_queue(), [retainedPage] {
    442             if (auto drawingArea = static_cast<TiledCoreAnimationDrawingArea*>(retainedPage->drawingArea()))
    443                 drawingArea->sendPendingNewlyReachedLayoutMilestones();
    444         });
    445 #endif
    446439
    447440        bool returnValue = m_webPage.mainFrameView()->flushCompositingStateIncludingSubframes();
    … …  
    568561    [CATransaction commit];
    569562
    570     if (flushSynchronously) {
     563    if (flushSynchronously)
    571564        [CATransaction flush];
    572 #if !HAVE(COREANIMATION_FENCES)
    573         // We can't synchronize here if we're using fences or we'll blow the fence every time (and we don't need to).
    574         [CATransaction synchronize];
    575 #endif
    576     }
    577565
    578566    m_webPage.send(Messages::DrawingAreaProxy::DidUpdateGeometry());
    … …  
    580568    m_inUpdateGeometry = false;
    581569
    582 #if HAVE(COREANIMATION_FENCES)
    583570    m_layerHostingContext->setFencePort(fencePort.sendRight());
    584 #endif
    585571}
    586572

  • trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm

    r217153 r219050  
    138138    }
    139139
    140 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
     140#if PLATFORM(MAC)
    141141    setSharedHTTPCookieStorage(parameters.uiProcessCookieStorageIdentifier);
    142142#endif
    … …  
    164164    method_setImplementation(methodToPatch, (IMP)NSApplicationAccessibilityFocusedUIElement);
    165165#endif
    166 #if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
    167166    _CFNetworkSetATSContext(parameters.networkATSContext.get());
    168 #endif
    169167
    170168#if TARGET_OS_IPHONE

  • trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in

    r218858 r219050  
    3636#endif
    3737
    38 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
    3938(deny sysctl*)
    4039(allow sysctl-read
    … …  
    185184    (iokit-property "touch-size-id")
    186185)
    187 #endif
    188186
    189187#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
    … …  
    390388       (global-name "com.apple.SystemConfiguration.PPPController")
    391389       (global-name "com.apple.audio.SystemSoundServer-OSX")
    392 #if __MAC_OS_X_VERSION_MIN_REQUIRED < 101100
    393        (global-name "com.apple.audio.VDCAssistant")
    394 #endif
    395390#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
    396391       (global-name "com.apple.analyticsd")
    … …  
    409404       (global-name "com.apple.mediaremoted.xpc")
    410405#endif
    411 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
    412406       (global-name "com.apple.lsd.mapdb")
    413407       (global-name "com.apple.nesessionmanager.flow-divert-token")
    414 #endif
    415408       (global-name "com.apple.speech.speechsynthesisd")
    416409       (global-name "com.apple.speech.synthesis.console")

  • trunk/Source/bmalloc/ChangeLog

    r219009 r219050  
     12017-07-01  Dan Bernstein  <mitz@apple.com>
     2
     3        [macOS] Remove code only needed when building for OS X Yosemite
     4        https://bugs.webkit.org/show_bug.cgi?id=174067
     5
     6        Reviewed by Tim Horton.
     7
     8        * Configurations/Base.xcconfig:
     9        * Configurations/DebugRelease.xcconfig:
     10
    1112017-06-30  Ryosuke Niwa  <rniwa@webkit.org>
    212

  • trunk/Source/bmalloc/Configurations/Base.xcconfig

    r217531 r219050  
    8787
    8888TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
    89 TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
    9089TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
    9190TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;

  • trunk/Source/bmalloc/Configurations/DebugRelease.xcconfig

    r218057 r219050  
    3030
    3131MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    32 MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
    3332MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
    3433MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;

  • trunk/Tools/ChangeLog

    r219049 r219050  
     12017-07-01  Dan Bernstein  <mitz@apple.com>
     2
     3        [macOS] Remove code only needed when building for OS X Yosemite
     4        https://bugs.webkit.org/show_bug.cgi?id=174067
     5
     6        Reviewed by Tim Horton.
     7
     8        * DumpRenderTree/mac/Configurations/Base.xcconfig:
     9        * DumpRenderTree/mac/Configurations/DebugRelease.xcconfig:
     10        * DumpRenderTree/mac/DumpRenderTree.mm:
     11        (setDefaultsToConsistentValuesForTesting):
     12        * DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm:
     13        (-[DumpRenderTreeDraggingInfo resetSpringLoading]):
     14        * MiniBrowser/Configurations/Base.xcconfig:
     15        * MiniBrowser/Configurations/DebugRelease.xcconfig:
     16        * TestWebKitAPI/Configurations/Base.xcconfig:
     17        * TestWebKitAPI/Configurations/DebugRelease.xcconfig:
     18        * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
     19        * TestWebKitAPI/Tests/WebCore/ComplexTextController.cpp:
     20        (TestWebKitAPI::TEST_F):
     21        * TestWebKitAPI/Tests/WebCore/cocoa/WebCoreNSURLSession.mm:
     22        * TestWebKitAPI/Tests/mac/DragAndDropPasteboardTests.mm:
     23        * TestWebKitAPI/Tests/mac/FullscreenZoomInitialFrame.mm:
     24        (TestWebKitAPI::TEST_F):
     25        * TestWebKitAPI/Tests/mac/StringTruncator.mm:
     26        (TestWebKitAPI::TEST):
     27        * WebKitTestRunner/Configurations/Base.xcconfig:
     28        * WebKitTestRunner/Configurations/DebugRelease.xcconfig:
     29        * WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm:
     30        (WTR::InjectedBundle::platformInitialize):
     31        * WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.mm:
     32        (-[WebKitTestRunnerDraggingInfo resetSpringLoading]):
     33
    1342017-07-01  Chris Dumez  <cdumez@apple.com>
    235

  • trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig

    r215386 r219050  
    8383
    8484TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
    85 TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
    8685TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
    8786TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;

  • trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig

    r218057 r219050  
    3131
    3232MACOSX_DEPLOYMENT_TARGET[sdk=macosx*] = $(MACOSX_DEPLOYMENT_TARGET_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    33 MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
    3433MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
    3534MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
    … …  
    4039WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphonesimulator*] = WebKitSystemInterfaceIOSSimulator$(WK_TARGET_IOS_VERSION_MAJOR);
    4140WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=macosx*] = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    42 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000 = WebKitSystemInterfaceYosemite;
    4341WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101100 = WebKitSystemInterfaceElCapitan;
    4442WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101200 = WebKitSystemInterfaceOSX10.12;

  • trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm

    r218816 r219050  
    10241024        @"AppleShowScrollBars": @"Always",
    10251025        @"NSButtonAnimationsEnabled": @NO, // Ideally, we should find a way to test animations, but for now, make sure that the dumped snapshot matches actual state.
    1026 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100 && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200
     1026#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200
    10271027        @"AppleSystemFontOSSubversion": @(10),
    10281028#endif
    … …  
    10441044        WebKitLocalCacheDefaultsKey: [libraryPath stringByAppendingPathComponent:@"LocalCache"],
    10451045        WebKitResourceLoadStatisticsDirectoryDefaultsKey: [libraryPath stringByAppendingPathComponent:@"LocalStorage"],
    1046 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100 && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200
     1046#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200
    10471047        // This needs to also be added to argument domain because of <rdar://problem/20210002>.
    10481048        @"AppleSystemFontOSSubversion": @(10),

  • trunk/Tools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm

    r190070 r219050  
    143143}
    144144
    145 #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101100
    146145-(NSSpringLoadingHighlight)springLoadingHighlight
    147146{
    … …  
    152151{
    153152}
    154 #endif
    155153
    156154@end

  • trunk/Tools/MiniBrowser/Configurations/Base.xcconfig

    r215316 r219050  
    6161
    6262TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
    63 TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
    6463TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
    6564TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;

  • trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig

    r218057 r219050  
    3131
    3232MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
    33 MACOSX_DEPLOYMENT_TARGET_101000 = 10.10;
    3433MACOSX_DEPLOYMENT_TARGET_101100 = 10.11;
    3534MACOSX_DEPLOYMENT_TARGET_101200 = 10.12;

  • trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig

    r215386 r219050  
    7474
    7575TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
    76 TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
    7776TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
    7877TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;

  • trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig

    r218057 r219050  
    3131
    3232MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
    33 MACOSX_DEPLOYMENT_TARGET_101000 = 10.10;
    3433MACOSX_DEPLOYMENT_TARGET_101100 = 10.11;
    3534MACOSX_DEPLOYMENT_TARGET_101200 = 10.12;

  • trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig

    r219012 r219050  
    3333
    3434TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    35 TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101000 = YES;
    3635TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101100 = YES;
    3736
    3837TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    39 TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101000 = YES;
    4038TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101100 = YES;
    4139TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101200 = YES;

  • trunk/Tools/TestWebKitAPI/Tests/WebCore/ComplexTextController.cpp

    r215117 r219050  
    5454    auto spaceWidth = font.primaryFont().spaceWidth();
    5555
    56 #if USE_LAYOUT_SPECIFIC_ADVANCES
    5756    Vector<FloatSize> advances = { FloatSize(), FloatSize(21.640625, 0.0), FloatSize(42.3046875, 0.0), FloatSize(55.8984375, 0.0), FloatSize(22.34375, 0.0) };
    5857    Vector<FloatPoint> origins = { FloatPoint(-15.15625, 18.046875), FloatPoint(), FloatPoint(), FloatPoint(), FloatPoint() };
    59 #else
    60     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) };
    61     Vector<FloatPoint> origins = { };
    62 #endif
    6358
    6459    FloatSize initialAdvance = FloatSize(-15.15625, 18.046875);
    … …  
    105100    font.update();
    106101
    107 #if USE_LAYOUT_SPECIFIC_ADVANCES
    108102    Vector<FloatSize> advances = { FloatSize(), FloatSize(21.640625, 0.0), FloatSize(42.3046875, 0.0), FloatSize(55.8984375, 0.0), FloatSize(22.34375, 0.0) };
    109103    Vector<FloatPoint> origins = { FloatPoint(-15.15625, 18.046875), FloatPoint(), FloatPoint(), FloatPoint(), FloatPoint() };
    110 #else
    111     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) };
    112     Vector<FloatPoint> origins = { };
    113 #endif
    114104
    115105    FloatSize initialAdvance = FloatSize(-15.15625, 18.046875);
    … …  
    155145    auto spaceWidth = font.primaryFont().spaceWidth();
    156146
    157 #if USE_LAYOUT_SPECIFIC_ADVANCES
    158147    Vector<FloatSize> advances = { FloatSize(76.347656, 0.000000), FloatSize(0.000000, 0.000000) };
    159148    Vector<FloatPoint> origins = { FloatPoint(), FloatPoint(-23.281250, -8.398438) };
    160 #else
    161     Vector<FloatSize> advances = { FloatSize(53.066406, -8.398438), FloatSize(23.281250, 8.398438) };
    162     Vector<FloatPoint> origins = { };
    163 #endif
    164149
    165150    FloatSize initialAdvance = FloatSize(28.144531, 0);
    … …  
    202187    font.update();
    203188
    204 #if USE_LAYOUT_SPECIFIC_ADVANCES
    205189    Vector<FloatSize> advances = { FloatSize(76.347656, 0.000000), FloatSize(0.000000, 0.000000) };
    206190    Vector<FloatPoint> origins = { FloatPoint(), FloatPoint(-23.281250, -8.398438) };
    207 #else
    208     Vector<FloatSize> advances = { FloatSize(53.066406, -8.398438), FloatSize(23.281250, 8.398438) };
    209     Vector<FloatPoint> origins = { };
    210 #endif
    211191
    212192    FloatSize initialAdvance = FloatSize(28.144531, 0);
    … …  
    365345
    366346    Vector<FloatSize> advances = { FloatSize(1, 0), FloatSize(2, 0), FloatSize(4, 0), FloatSize(8, 0), FloatSize(16, 0) };
    367 #if USE_LAYOUT_SPECIFIC_ADVANCES
    368347    Vector<FloatPoint> origins = { FloatPoint(), FloatPoint(), FloatPoint(), FloatPoint(), FloatPoint() };
    369 #else
    370     Vector<FloatPoint> origins = { };
    371 #endif
    372348
    373349    FloatSize initialAdvance = FloatSize();

  • trunk/Tools/TestWebKitAPI/Tests/WebCore/cocoa/WebCoreNSURLSession.mm

    r212994 r219050  
    2626#import "config.h"
    2727
    28 #if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
     28#if !PLATFORM(IOS)
    2929
    3030#import "PlatformUtilities.h"

  • trunk/Tools/TestWebKitAPI/Tests/mac/DragAndDropPasteboardTests.mm

    r211906 r219050  
    190190}
    191191
    192 #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101100
    193 
    194192- (NSSpringLoadingHighlight)springLoadingHighlight
    195193{
    … …  
    200198{
    201199}
    202 
    203 #endif
    204200
    205201@end

  • trunk/Tools/TestWebKitAPI/Tests/mac/FullscreenZoomInitialFrame.mm

    r218815 r219050  
    190190}
    191191
    192 #if __MAC_OS_X_VERSION_MIN_REQUIRED > 101000
    193192// FIXME:<rdar://problem/20504403>
    194193TEST_F(FullscreenZoomInitialFrame, DISABLED_WebKit2)
    195 #else
    196 TEST_F(FullscreenZoomInitialFrame, WebKit2)
    197 #endif
    198194{
    199195    runWebKit2Test();

  • trunk/Tools/TestWebKitAPI/Tests/mac/StringTruncator.mm

    r200070 r219050  
    3636        EXPECT_EQ(nil, [WebStringTruncator centerTruncateString:@"abcdefghijklmnopqrstuvwxyz" toWidth:100 withFont:nil]);
    3737        EXPECT_STREQ([[WebStringTruncator centerTruncateString:@"abcdefghijklmnopqrstuvwxyz" toWidth:100 withFont:[NSFont fontWithName:@"Helvetica" size:12]] UTF8String], "abcdefg…tuvwxyz");
    38 #if __MAC_OS_X_VERSION_MIN_REQUIRED > 101000
    3938        EXPECT_STREQ([[WebStringTruncator centerTruncateString:@"abcdefghijklmnopqrstuvwxyz" toWidth:100] UTF8String], "abcdef…uvwxyz");
    40 #else
    41         EXPECT_STREQ([[WebStringTruncator centerTruncateString:@"abcdefghijklmnopqrstuvwxyz" toWidth:100] UTF8String], "abcdef…vwxyz");
    42 #endif
    4339        EXPECT_EQ(nil, [WebStringTruncator rightTruncateString:@"abcdefghijklmnopqrstuvwxyz" toWidth:100 withFont:nil]);
    4440        EXPECT_STREQ([[WebStringTruncator rightTruncateString:@"abcdefghijklmnopqrstuvwxyz" toWidth:100 withFont:[NSFont fontWithName:@"Helvetica" size:12]] UTF8String], "abcdefghijklmno…");

  • trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig

    r215386 r219050  
    5757
    5858TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
    59 TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
    6059TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
    6160TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;

  • trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig

    r218057 r219050  
    3131
    3232MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
    33 MACOSX_DEPLOYMENT_TARGET_101000 = 10.10;
    3433MACOSX_DEPLOYMENT_TARGET_101100 = 10.11;
    3534MACOSX_DEPLOYMENT_TARGET_101200 = 10.12;
    … …  
    4039WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphonesimulator*] = WebKitSystemInterfaceIOSSimulator$(WK_TARGET_IOS_VERSION_MAJOR);
    4140WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=macosx*] = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    42 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000 = WebKitSystemInterfaceYosemite;
    4341WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101100 = WebKitSystemInterfaceElCapitan;
    4442WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101200 = WebKitSystemInterfaceOSX10.12;

  • trunk/Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm

    r209192 r219050  
    7777            @"hellolfworld": @"hello\nworld"
    7878        },
    79 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100 && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200
     79#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101200
    8080        @"AppleSystemFontOSSubversion": @(10),
    8181#endif

  • trunk/Tools/WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.mm

    r190070 r219050  
    147147}
    148148
    149 #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101100
    150149-(NSSpringLoadingHighlight)springLoadingHighlight
    151150{
    … …  
    156155{
    157156}
    158 #endif
    159157
    160158@end
Note: See TracChangeset for help on using the changeset viewer.