<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[194318] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/194318">194318</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2015-12-19 22:27:04 -0800 (Sat, 19 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] WebKit contains dead source code for OS X Mavericks and earlier
https://bugs.webkit.org/show_bug.cgi?id=152462
Reviewed by Alexey Proskuryakov.
Source/bmalloc:
* Configurations/DebugRelease.xcconfig: Removed definition of MACOSX_DEPLOYMENT_TARGET for
OS X 10.9.
Source/JavaScriptCore:
- Removed build setting definitions for OS X 10.9 and earlier, and simplified defintions
that became uniform across all OS X versions as a result:
* Configurations/DebugRelease.xcconfig:
* Configurations/FeatureDefines.xcconfig:
* Configurations/Version.xcconfig:
* API/JSBase.h: Removed check against __MAC_OS_X_VERSION_MIN_REQUIRED that was always true.
Source/ThirdParty/ANGLE:
* Configurations/DebugRelease.xcconfig: Removed definitions of MACOSX_DEPLOYMENT_TARGET for
OS X 10.8 and 10.9.
Source/WebCore:
- Removed build setting definitions for OS X 10.9 and earlier, and simplified defintions
that became uniform across all OS X versions as a result:
* Configurations/DebugRelease.xcconfig:
* Configurations/FeatureDefines.xcconfig:
* Configurations/Version.xcconfig:
- Removed support for animating default buttons:
* rendering/RenderButton.cpp:
(WebCore::RenderButton::RenderButton): Removed m_default initialization.
(WebCore::RenderButton::styleDidChange): Removed checking for animating default button and
starting the animation timer.
(WebCore::RenderButton::timerFired): Deleted.
* rendering/RenderButton.h: Removed m_timer and m_default member variables
* rendering/RenderTheme.h:
(WebCore::RenderTheme::defaultButtonHasAnimation): Deleted.
* rendering/RenderThemeMac.h: Deleted override.
* rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::defaultButtonHasAnimation): Deleted.
- Simplified expressions involving __MAC_OS_X_VERSION_MIN_REQUIRED and removed code that was
never getting compiled:
* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
* editing/mac/DictionaryLookup.h:
* editing/mac/DictionaryLookup.mm:
* html/canvas/WebGLDrawBuffers.cpp:
* loader/DocumentLoader.cpp:
* loader/cache/CachedFont.cpp:
* loader/cocoa/DiskCacheMonitorCocoa.h:
* page/cocoa/SettingsCocoa.mm:
* platform/Scrollbar.cpp:
* platform/cocoa/MemoryPressureHandlerCocoa.mm:
* platform/cocoa/NetworkExtensionContentFilter.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
* platform/graphics/cg/ImageSourceCG.cpp:
* platform/graphics/cocoa/FontCacheCoreText.cpp:
* platform/graphics/cocoa/FontCascadeCocoa.mm:
* platform/graphics/mac/GraphicsContext3DMac.mm:
* platform/mac/NSScrollerImpDetails.h:
* platform/mac/ScrollAnimatorMac.mm:
* platform/mac/ScrollViewMac.mm:
* platform/mac/ScrollbarThemeMac.mm:
* platform/mac/ThemeMac.mm:
* platform/mac/WebCoreFullScreenPlaceholderView.h:
* platform/mac/WebCoreFullScreenPlaceholderView.mm:
* platform/network/cf/CookieJarCFNet.cpp:
* platform/network/cf/ResourceRequest.h:
* platform/spi/cf/CFNetworkSPI.h:
* platform/spi/cocoa/CoreTextSPI.h:
* platform/spi/cocoa/NSButtonCellSPI.h:
* platform/spi/cocoa/NSColorSPI.h:
* platform/spi/cocoa/QuartzCoreSPI.h:
* platform/spi/mac/LookupSPI.h:
* platform/spi/mac/NSFontSPI.h:
* platform/spi/mac/NSImmediateActionGestureRecognizerSPI.h:
* platform/spi/mac/NSPopoverSPI.h:
* platform/spi/mac/NSSharingServicePickerSPI.h:
* platform/spi/mac/NSSharingServiceSPI.h:
* platform/spi/mac/TUCallSPI.h:
* platform/sql/SQLiteDatabase.cpp:
Source/WebInspectorUI:
- Removed build setting definitions for OS X 10.9 and earlier, and simplified defintions
that became uniform across all OS X versions as a result:
* Configurations/Base.xcconfig:
* Configurations/DebugRelease.xcconfig:
* Configurations/Version.xcconfig:
* Scripts/copy-user-interface-resources.pl: Removed code to delete Images/Legacy.
* UserInterface/Images/Legacy: Removed this empty directory.
Source/WebKit/mac:
- Removed build setting definitions for OS X 10.9 and earlier, and simplified defintions
that became uniform across all OS X versions as a result:
* Configurations/DebugRelease.xcconfig:
* Configurations/FeatureDefines.xcconfig:
* Configurations/Version.xcconfig:
* Configurations/WebKitLegacy.xcconfig:
- Simplified expressions involving __MAC_OS_X_VERSION_MIN_REQUIRED and removed code that was
never getting compiled:
* WebCoreSupport/WebInspectorClient.mm:
* WebView/WebDynamicScrollBarsView.mm:
* WebView/WebHTMLView.mm:
* WebView/WebImmediateActionController.h:
* WebView/WebImmediateActionController.mm:
* WebView/WebView.mm:
* WebView/WebViewData.h:
* WebView/WebViewData.mm:
* WebView/WebViewInternal.h:
Source/WebKit2:
- Removed build setting definitions for OS X 10.9 and earlier, and simplified defintions
that became uniform across all OS X versions as a result:
* Configurations/BaseTarget.xcconfig:
* Configurations/BaseXPCService.xcconfig:
* Configurations/DebugRelease.xcconfig:
* Configurations/FeatureDefines.xcconfig:
* Configurations/Version.xcconfig:
* Configurations/WebKit.xcconfig:
- Removed the definition of BUNDLE_LOCALIZATION_KEY:
* Configurations/WebContentService.Development.xcconfig:
* Configurations/WebContentService.xcconfig:
- Added CFBundleFollowParentLocalization set to true:
* WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info-OSX.plist:
* WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info-iOS.plist:
* WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist:
* WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist:
* WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist:
* WebKit2.xcodeproj/project.pbxproj: Removed the “Add CFBundle Localization Info.plist Key”
script build phases from the Web Content Service targets.
- Simplified expressions involving __MAC_OS_X_VERSION_MIN_REQUIRED and removed code that was
never getting compiled:
* DatabaseProcess/mac/com.apple.WebKit.Databases.sb.in:
* NetworkProcess/cocoa/NetworkProcessCocoa.mm:
* NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in:
* Platform/IPC/mac/ConnectionMac.mm:
* Platform/IPC/mac/ImportanceAssertion.h:
* Platform/mac/MenuUtilities.h:
* Platform/mac/MenuUtilities.mm:
* Platform/mac/StringUtilities.h:
* Platform/mac/StringUtilities.mm:
* Shared/API/Cocoa/WKFoundation.h:
* Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm:
* UIProcess/API/Cocoa/WKViewPrivate.h:
* UIProcess/API/Cocoa/WKWebView.mm:
* UIProcess/API/Cocoa/WKWebViewPrivate.h:
* UIProcess/API/mac/WKView.mm:
* UIProcess/Cocoa/WebProcessPoolCocoa.mm:
* UIProcess/Cocoa/WebViewImpl.h:
* UIProcess/Cocoa/WebViewImpl.mm:
* UIProcess/Launcher/mac/ProcessLauncherMac.mm:
* UIProcess/mac/PageClientImpl.mm:
* UIProcess/mac/WKImmediateActionController.h:
* UIProcess/mac/WKImmediateActionController.mm:
* UIProcess/mac/WebInspectorProxyMac.mm:
* WebProcess/WebPage/FindController.cpp:
* WebProcess/WebPage/WebPage.cpp:
* WebProcess/com.apple.WebProcess.sb.in:
* config.h:
Source/WTF:
* Configurations/DebugRelease.xcconfig: Removed definition of MACOSX_DEPLOYMENT_TARGET for
OS X 10.9.
- Simplified expressions involving __MAC_OS_X_VERSION_MIN_REQUIRED and removed code that was
never getting compiled:
* wtf/FeatureDefines.h:
* wtf/MainThread.h:
* wtf/OSObjectPtr.h:
* wtf/Platform.h:
* wtf/mac/DeprecatedSymbolsUsedBySafari.mm:
* wtf/spi/darwin/XPCSPI.h:
Tools:
- Removed definitions of MACOSX_DEPLOYMENT_TARGET and WEBKIT_SYSTEM_INTERFACE_LIBRARY for
OS X 10.9:
* DumpRenderTree/mac/Configurations/DebugRelease.xcconfig:
* LayoutTestRelay/Configurations/DebugRelease.xcconfig:
* MiniBrowser/Configurations/DebugRelease.xcconfig:
* TestWebKitAPI/Configurations/DebugRelease.xcconfig:
* WebKitTestRunner/Configurations/DebugRelease.xcconfig:
- Simplified expressions involving __MAC_OS_X_VERSION_MIN_REQUIRED and removed code that was
never getting compiled:
* DumpRenderTree/mac/TextInputController.m:
* MiniBrowser/mac/BrowserWindowController.m:
* TestWebKitAPI/Tests/mac/AttributedString.mm:
* WebKitTestRunner/mac/EventSenderProxy.mm:
WebKitLibraries:
* libWebKitSystemInterfaceMavericks.a: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreAPIJSBaseh">trunk/Source/JavaScriptCore/API/JSBase.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreConfigurationsDebugReleasexcconfig">trunk/Source/JavaScriptCore/Configurations/DebugRelease.xcconfig</a></li>
<li><a href="#trunkSourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig">trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceJavaScriptCoreConfigurationsVersionxcconfig">trunk/Source/JavaScriptCore/Configurations/Version.xcconfig</a></li>
<li><a href="#trunkSourceThirdPartyANGLEChangeLog">trunk/Source/ThirdParty/ANGLE/ChangeLog</a></li>
<li><a href="#trunkSourceThirdPartyANGLEConfigurationsDebugReleasexcconfig">trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFConfigurationsDebugReleasexcconfig">trunk/Source/WTF/Configurations/DebugRelease.xcconfig</a></li>
<li><a href="#trunkSourceWTFwtfFeatureDefinesh">trunk/Source/WTF/wtf/FeatureDefines.h</a></li>
<li><a href="#trunkSourceWTFwtfMainThreadh">trunk/Source/WTF/wtf/MainThread.h</a></li>
<li><a href="#trunkSourceWTFwtfOSObjectPtrh">trunk/Source/WTF/wtf/OSObjectPtr.h</a></li>
<li><a href="#trunkSourceWTFwtfPlatformh">trunk/Source/WTF/wtf/Platform.h</a></li>
<li><a href="#trunkSourceWTFwtfmacDeprecatedSymbolsUsedBySafarimm">trunk/Source/WTF/wtf/mac/DeprecatedSymbolsUsedBySafari.mm</a></li>
<li><a href="#trunkSourceWTFwtfspidarwinXPCSPIh">trunk/Source/WTF/wtf/spi/darwin/XPCSPI.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreConfigurationsDebugReleasexcconfig">trunk/Source/WebCore/Configurations/DebugRelease.xcconfig</a></li>
<li><a href="#trunkSourceWebCoreConfigurationsFeatureDefinesxcconfig">trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebCoreConfigurationsVersionxcconfig">trunk/Source/WebCore/Configurations/Version.xcconfig</a></li>
<li><a href="#trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm">trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm</a></li>
<li><a href="#trunkSourceWebCoreeditingmacDictionaryLookuph">trunk/Source/WebCore/editing/mac/DictionaryLookup.h</a></li>
<li><a href="#trunkSourceWebCoreeditingmacDictionaryLookupmm">trunk/Source/WebCore/editing/mac/DictionaryLookup.mm</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLDrawBufferscpp">trunk/Source/WebCore/html/canvas/WebGLDrawBuffers.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentLoadercpp">trunk/Source/WebCore/loader/DocumentLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedFontcpp">trunk/Source/WebCore/loader/cache/CachedFont.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercocoaDiskCacheMonitorCocoah">trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.h</a></li>
<li><a href="#trunkSourceWebCorepagecocoaSettingsCocoamm">trunk/Source/WebCore/page/cocoa/SettingsCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollbarcpp">trunk/Source/WebCore/platform/Scrollbar.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaMemoryPressureHandlerCocoamm">trunk/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaNetworkExtensionContentFilterh">trunk/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgImageSourceCGcpp">trunk/Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaFontCacheCoreTextcpp">trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaFontCascadeCocoamm">trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacGraphicsContext3DMacmm">trunk/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacNSScrollerImpDetailsh">trunk/Source/WebCore/platform/mac/NSScrollerImpDetails.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacScrollAnimatorMacmm">trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacScrollViewMacmm">trunk/Source/WebCore/platform/mac/ScrollViewMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacScrollbarThemeMacmm">trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacThemeMacmm">trunk/Source/WebCore/platform/mac/ThemeMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacWebCoreFullScreenPlaceholderViewh">trunk/Source/WebCore/platform/mac/WebCoreFullScreenPlaceholderView.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacWebCoreFullScreenPlaceholderViewmm">trunk/Source/WebCore/platform/mac/WebCoreFullScreenPlaceholderView.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfCookieJarCFNetcpp">trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfResourceRequesth">trunk/Source/WebCore/platform/network/cf/ResourceRequest.h</a></li>
<li><a href="#trunkSourceWebCoreplatformspicfCFNetworkSPIh">trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h</a></li>
<li><a href="#trunkSourceWebCoreplatformspicocoaCoreTextSPIh">trunk/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h</a></li>
<li><a href="#trunkSourceWebCoreplatformspicocoaNSButtonCellSPIh">trunk/Source/WebCore/platform/spi/cocoa/NSButtonCellSPI.h</a></li>
<li><a href="#trunkSourceWebCoreplatformspicocoaNSColorSPIh">trunk/Source/WebCore/platform/spi/cocoa/NSColorSPI.h</a></li>
<li><a href="#trunkSourceWebCoreplatformspicocoaQuartzCoreSPIh">trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h</a></li>
<li><a href="#trunkSourceWebCoreplatformspimacLookupSPIh">trunk/Source/WebCore/platform/spi/mac/LookupSPI.h</a></li>
<li><a href="#trunkSourceWebCoreplatformspimacNSFontSPIh">trunk/Source/WebCore/platform/spi/mac/NSFontSPI.h</a></li>
<li><a href="#trunkSourceWebCoreplatformspimacNSImmediateActionGestureRecognizerSPIh">trunk/Source/WebCore/platform/spi/mac/NSImmediateActionGestureRecognizerSPI.h</a></li>
<li><a href="#trunkSourceWebCoreplatformspimacNSPopoverSPIh">trunk/Source/WebCore/platform/spi/mac/NSPopoverSPI.h</a></li>
<li><a href="#trunkSourceWebCoreplatformspimacNSSharingServicePickerSPIh">trunk/Source/WebCore/platform/spi/mac/NSSharingServicePickerSPI.h</a></li>
<li><a href="#trunkSourceWebCoreplatformspimacNSSharingServiceSPIh">trunk/Source/WebCore/platform/spi/mac/NSSharingServiceSPI.h</a></li>
<li><a href="#trunkSourceWebCoreplatformspimacTUCallSPIh">trunk/Source/WebCore/platform/spi/mac/TUCallSPI.h</a></li>
<li><a href="#trunkSourceWebCoreplatformsqlSQLiteDatabasecpp">trunk/Source/WebCore/platform/sql/SQLiteDatabase.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderButtoncpp">trunk/Source/WebCore/rendering/RenderButton.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderButtonh">trunk/Source/WebCore/rendering/RenderButton.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeh">trunk/Source/WebCore/rendering/RenderTheme.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeMach">trunk/Source/WebCore/rendering/RenderThemeMac.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeMacmm">trunk/Source/WebCore/rendering/RenderThemeMac.mm</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIConfigurationsBasexcconfig">trunk/Source/WebInspectorUI/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkSourceWebInspectorUIConfigurationsDebugReleasexcconfig">trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig</a></li>
<li><a href="#trunkSourceWebInspectorUIConfigurationsVersionxcconfig">trunk/Source/WebInspectorUI/Configurations/Version.xcconfig</a></li>
<li><a href="#trunkSourceWebInspectorUIScriptscopyuserinterfaceresourcespl">trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacConfigurationsDebugReleasexcconfig">trunk/Source/WebKit/mac/Configurations/DebugRelease.xcconfig</a></li>
<li><a href="#trunkSourceWebKitmacConfigurationsFeatureDefinesxcconfig">trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebKitmacConfigurationsVersionxcconfig">trunk/Source/WebKit/mac/Configurations/Version.xcconfig</a></li>
<li><a href="#trunkSourceWebKitmacConfigurationsWebKitLegacyxcconfig">trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebInspectorClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebDynamicScrollBarsViewmm">trunk/Source/WebKit/mac/WebView/WebDynamicScrollBarsView.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLViewmm">trunk/Source/WebKit/mac/WebView/WebHTMLView.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebImmediateActionControllerh">trunk/Source/WebKit/mac/WebView/WebImmediateActionController.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebImmediateActionControllermm">trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewDatah">trunk/Source/WebKit/mac/WebView/WebViewData.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewDatamm">trunk/Source/WebKit/mac/WebView/WebViewData.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewInternalh">trunk/Source/WebKit/mac/WebView/WebViewInternal.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsBaseTargetxcconfig">trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsBaseXPCServicexcconfig">trunk/Source/WebKit2/Configurations/BaseXPCService.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsDebugReleasexcconfig">trunk/Source/WebKit2/Configurations/DebugRelease.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsFeatureDefinesxcconfig">trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsVersionxcconfig">trunk/Source/WebKit2/Configurations/Version.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsWebContentServiceDevelopmentxcconfig">trunk/Source/WebKit2/Configurations/WebContentService.Development.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsWebContentServicexcconfig">trunk/Source/WebKit2/Configurations/WebContentService.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsWebKitxcconfig">trunk/Source/WebKit2/Configurations/WebKit.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessmaccomappleWebKitDatabasessbin">trunk/Source/WebKit2/DatabaseProcess/mac/com.apple.WebKit.Databases.sb.in</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscocoaNetworkProcessCocoamm">trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessmaccomappleWebKitNetworkProcesssbin">trunk/Source/WebKit2/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCmacConnectionMacmm">trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCmacImportanceAssertionh">trunk/Source/WebKit2/Platform/IPC/mac/ImportanceAssertion.h</a></li>
<li><a href="#trunkSourceWebKit2PlatformmacMenuUtilitiesh">trunk/Source/WebKit2/Platform/mac/MenuUtilities.h</a></li>
<li><a href="#trunkSourceWebKit2PlatformmacMenuUtilitiesmm">trunk/Source/WebKit2/Platform/mac/MenuUtilities.mm</a></li>
<li><a href="#trunkSourceWebKit2PlatformmacStringUtilitiesh">trunk/Source/WebKit2/Platform/mac/StringUtilities.h</a></li>
<li><a href="#trunkSourceWebKit2PlatformmacStringUtilitiesmm">trunk/Source/WebKit2/Platform/mac/StringUtilities.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedAPICocoaWKFoundationh">trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h</a></li>
<li><a href="#trunkSourceWebKit2SharedEntryPointUtilitiesmacXPCServiceXPCServiceMainDevelopmentmm">trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKViewPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKViewmm">trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebProcessPoolCocoamm">trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebViewImplh">trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebViewImplmm">trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessLaunchermacProcessLauncherMacmm">trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacPageClientImplmm">trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWKImmediateActionControllerh">trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWKImmediateActionControllermm">trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebInspectorProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2WebProcessEntryPointmacXPCServiceWebContentServiceInfoOSX1091010plist">trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist</a></li>
<li><a href="#trunkSourceWebKit2WebProcessEntryPointmacXPCServiceWebContentServiceInfoOSXplist">trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist</a></li>
<li><a href="#trunkSourceWebKit2WebProcessEntryPointmacXPCServiceWebContentServiceInfoiOSplist">trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist</a></li>
<li><a href="#trunkSourceWebKit2WebProcessEntryPointmacXPCServiceWebContentServiceDevelopmentInfoOSXplist">trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info-OSX.plist</a></li>
<li><a href="#trunkSourceWebKit2WebProcessEntryPointmacXPCServiceWebContentServiceDevelopmentInfoiOSplist">trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info-iOS.plist</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageFindControllercpp">trunk/Source/WebKit2/WebProcess/WebPage/FindController.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcesscomappleWebProcesssbin">trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in</a></li>
<li><a href="#trunkSourceWebKit2configh">trunk/Source/WebKit2/config.h</a></li>
<li><a href="#trunkSourcebmallocChangeLog">trunk/Source/bmalloc/ChangeLog</a></li>
<li><a href="#trunkSourcebmallocConfigurationsDebugReleasexcconfig">trunk/Source/bmalloc/Configurations/DebugRelease.xcconfig</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreemacConfigurationsDebugReleasexcconfig">trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig</a></li>
<li><a href="#trunkToolsDumpRenderTreemacTextInputControllerm">trunk/Tools/DumpRenderTree/mac/TextInputController.m</a></li>
<li><a href="#trunkToolsLayoutTestRelayConfigurationsDebugReleasexcconfig">trunk/Tools/LayoutTestRelay/Configurations/DebugRelease.xcconfig</a></li>
<li><a href="#trunkToolsMiniBrowserConfigurationsDebugReleasexcconfig">trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig</a></li>
<li><a href="#trunkToolsMiniBrowsermacBrowserWindowControllerm">trunk/Tools/MiniBrowser/mac/BrowserWindowController.m</a></li>
<li><a href="#trunkToolsTestWebKitAPIConfigurationsDebugReleasexcconfig">trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsmacAttributedStringmm">trunk/Tools/TestWebKitAPI/Tests/mac/AttributedString.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnerConfigurationsDebugReleasexcconfig">trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig</a></li>
<li><a href="#trunkToolsWebKitTestRunnermacEventSenderProxymm">trunk/Tools/WebKitTestRunner/mac/EventSenderProxy.mm</a></li>
<li><a href="#trunkWebKitLibrariesChangeLog">trunk/WebKitLibraries/ChangeLog</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkWebKitLibrarieslibWebKitSystemInterfaceMavericksa">trunk/WebKitLibraries/libWebKitSystemInterfaceMavericks.a</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreAPIJSBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/JSBase.h (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/JSBase.h 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/JavaScriptCore/API/JSBase.h 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx">
</span><span class="cx"> /* Enable the Objective-C API for platforms with a modern runtime. */
</span><span class="cx"> #if !defined(JSC_OBJC_API_ENABLED)
</span><del>-#define JSC_OBJC_API_ENABLED (defined(__clang__) && defined(__APPLE__) && !defined(BUILDING_GTK__) && ((defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090 && !defined(__i386__)) || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)))
</del><ins>+#define JSC_OBJC_API_ENABLED (defined(__clang__) && defined(__APPLE__) && !defined(BUILDING_GTK__) && ((defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && !defined(__i386__)) || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)))
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #endif /* JSBase_h */
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-12-19 Dan Bernstein <mitz@apple.com>
+
+ [Mac] WebKit contains dead source code for OS X Mavericks and earlier
+ https://bugs.webkit.org/show_bug.cgi?id=152462
+
+ Reviewed by Alexey Proskuryakov.
+
+ - Removed build setting definitions for OS X 10.9 and earlier, and simplified defintions
+ that became uniform across all OS X versions as a result:
+
+ * Configurations/DebugRelease.xcconfig:
+ * Configurations/FeatureDefines.xcconfig:
+ * Configurations/Version.xcconfig:
+
+ * API/JSBase.h: Removed check against __MAC_OS_X_VERSION_MIN_REQUIRED that was always true.
+
</ins><span class="cx"> 2015-12-19 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> [JSC] Streamline Tmp indexing inside the register allocator
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreConfigurationsDebugReleasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Configurations/DebugRelease.xcconfig (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Configurations/DebugRelease.xcconfig 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/JavaScriptCore/Configurations/DebugRelease.xcconfig 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx"> ONLY_ACTIVE_ARCH = YES;
</span><span class="cx">
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><del>-MACOSX_DEPLOYMENT_TARGET_macosx_1090 = 10.9;
</del><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -35,12 +35,7 @@
</span><span class="cx"> ENABLE_ACCELERATED_2D_CANVAS = ;
</span><span class="cx"> ENABLE_ACCELERATED_OVERFLOW_SCROLLING[sdk=iphone*] = ENABLE_ACCELERATED_OVERFLOW_SCROLLING;
</span><span class="cx"> ENABLE_ATTACHMENT_ELEMENT = ENABLE_ATTACHMENT_ELEMENT;
</span><del>-ENABLE_AVF_CAPTIONS[sdk=iphone*] = ENABLE_AVF_CAPTIONS;
-ENABLE_AVF_CAPTIONS[sdk=macosx*] = $(ENABLE_AVF_CAPTIONS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_AVF_CAPTIONS_macosx_1090 = ;
-ENABLE_AVF_CAPTIONS_macosx_101000 = ENABLE_AVF_CAPTIONS;
-ENABLE_AVF_CAPTIONS_macosx_101100 = ENABLE_AVF_CAPTIONS;
-ENABLE_AVF_CAPTIONS_macosx_101200 = ENABLE_AVF_CAPTIONS;
</del><ins>+ENABLE_AVF_CAPTIONS = ENABLE_AVF_CAPTIONS;
</ins><span class="cx"> ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
</span><span class="cx"> ENABLE_CANVAS_PATH = ENABLE_CANVAS_PATH;
</span><span class="cx"> ENABLE_CANVAS_PROXY = ;
</span><span class="lines">@@ -76,12 +71,7 @@
</span><span class="cx"> ENABLE_ENCRYPTED_MEDIA[sdk=macosx*] = ENABLE_ENCRYPTED_MEDIA;
</span><span class="cx"> ENABLE_ENCRYPTED_MEDIA_V2[sdk=macosx*] = ENABLE_ENCRYPTED_MEDIA_V2;
</span><span class="cx"> ENABLE_FETCH_API = ENABLE_FETCH_API;
</span><del>-ENABLE_FILTERS_LEVEL_2[sdk=iphone*] = ENABLE_FILTERS_LEVEL_2;
-ENABLE_FILTERS_LEVEL_2[sdk=macosx*] = $(ENABLE_FILTERS_LEVEL_2_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_FILTERS_LEVEL_2_macosx_1090 = ;
-ENABLE_FILTERS_LEVEL_2_macosx_101000 = ENABLE_FILTERS_LEVEL_2;
-ENABLE_FILTERS_LEVEL_2_macosx_101100 = ENABLE_FILTERS_LEVEL_2;
-ENABLE_FILTERS_LEVEL_2_macosx_101200 = ENABLE_FILTERS_LEVEL_2;
</del><ins>+ENABLE_FILTERS_LEVEL_2 = ENABLE_FILTERS_LEVEL_2;
</ins><span class="cx"> ENABLE_FONT_LOAD_EVENTS = ;
</span><span class="cx"> ENABLE_FULLSCREEN_API[sdk=macosx*] = ENABLE_FULLSCREEN_API;
</span><span class="cx"> ENABLE_GAMEPAD[sdk=macosx*] = ENABLE_GAMEPAD;
</span><span class="lines">@@ -89,11 +79,7 @@
</span><span class="cx"> ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
</span><span class="cx"> ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING[sdk=macosx*] = ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING;
</span><span class="cx"> ENABLE_ICONDATABASE[sdk=macosx*] = ENABLE_ICONDATABASE;
</span><del>-ENABLE_SERVICE_CONTROLS[sdk=macosx*] = $(ENABLE_SERVICE_CONTROLS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_SERVICE_CONTROLS_macosx_1090 = ;
-ENABLE_SERVICE_CONTROLS_macosx_101000 = ENABLE_SERVICE_CONTROLS;
-ENABLE_SERVICE_CONTROLS_macosx_101100 = ENABLE_SERVICE_CONTROLS;
-ENABLE_SERVICE_CONTROLS_macosx_101200 = ENABLE_SERVICE_CONTROLS;
</del><ins>+ENABLE_SERVICE_CONTROLS[sdk=macosx*] = ENABLE_SERVICE_CONTROLS;
</ins><span class="cx"> ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
</span><span class="cx"> ENABLE_INDEXED_DATABASE_IN_WORKERS = ;
</span><span class="cx"> ENABLE_INDIE_UI = ENABLE_INDIE_UI;
</span><span class="lines">@@ -106,16 +92,10 @@
</span><span class="cx"> ENABLE_INPUT_TYPE_TIME[sdk=iphone*] = ENABLE_INPUT_TYPE_TIME;
</span><span class="cx"> ENABLE_INPUT_TYPE_WEEK[sdk=iphone*] = ENABLE_INPUT_TYPE_WEEK;
</span><span class="cx">
</span><del>-ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS[sdk=iphone*] = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
-ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS[sdk=macosx*] = $(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR))
-ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_1090 = ;
-ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_101000 = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
-ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_101100 = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
-ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_101200 = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
</del><ins>+ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
</ins><span class="cx">
</span><span class="cx"> ENABLE_WIRELESS_PLAYBACK_TARGET[sdk=iphone*] = ENABLE_WIRELESS_PLAYBACK_TARGET;
</span><span class="cx"> ENABLE_WIRELESS_PLAYBACK_TARGET[sdk=macosx*] = $(ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR))
</span><del>-ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_1090 = ;
</del><span class="cx"> ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_101000 = ;
</span><span class="cx"> ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_101100 = ENABLE_WIRELESS_PLAYBACK_TARGET;
</span><span class="cx"> ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_101200 = ENABLE_WIRELESS_PLAYBACK_TARGET;
</span><span class="lines">@@ -128,7 +108,6 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_MAC_GESTURE_EVENTS = ;
</span><span class="cx"> ENABLE_MAC_GESTURE_EVENTS[sdk=macosx*] = $(ENABLE_MAC_GESTURE_EVENTS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
</span><del>-ENABLE_MAC_GESTURE_EVENTS_macosx_1090_WITH_INTERNAL_SDK_YES = ;
</del><span class="cx"> ENABLE_MAC_GESTURE_EVENTS_macosx_101000_WITH_INTERNAL_SDK_YES = ;
</span><span class="cx"> ENABLE_MAC_GESTURE_EVENTS_macosx_101100_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
</span><span class="cx"> ENABLE_MAC_GESTURE_EVENTS_macosx_101200_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
</span><span class="lines">@@ -148,11 +127,7 @@
</span><span class="cx"> ENABLE_MEDIA_CONTROLS_SCRIPT = ENABLE_MEDIA_CONTROLS_SCRIPT;
</span><span class="cx"> ENABLE_MEDIA_SESSION = ;
</span><span class="cx">
</span><del>-ENABLE_MEDIA_SOURCE[sdk=macosx*] = $(ENABLE_MEDIA_SOURCE_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_MEDIA_SOURCE_macosx_1090 = ;
-ENABLE_MEDIA_SOURCE_macosx_101000 = ENABLE_MEDIA_SOURCE;
-ENABLE_MEDIA_SOURCE_macosx_101100 = ENABLE_MEDIA_SOURCE;
-ENABLE_MEDIA_SOURCE_macosx_101200 = ENABLE_MEDIA_SOURCE;
</del><ins>+ENABLE_MEDIA_SOURCE[sdk=macosx*] = ENABLE_MEDIA_SOURCE;
</ins><span class="cx">
</span><span class="cx"> ENABLE_MEDIA_STATISTICS = ;
</span><span class="cx"> ENABLE_MEDIA_STREAM = ENABLE_MEDIA_STREAM;
</span><span class="lines">@@ -170,12 +145,7 @@
</span><span class="cx"> ENABLE_QUOTA = ;
</span><span class="cx"> ENABLE_REQUEST_ANIMATION_FRAME = ENABLE_REQUEST_ANIMATION_FRAME;
</span><span class="cx"> ENABLE_REQUEST_AUTOCOMPLETE = ;
</span><del>-ENABLE_REMOTE_INSPECTOR[sdk=iphone*] = ENABLE_REMOTE_INSPECTOR;
-ENABLE_REMOTE_INSPECTOR[sdk=macosx*] = $(ENABLE_REMOTE_INSPECTOR_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_REMOTE_INSPECTOR_macosx_1090 = ;
-ENABLE_REMOTE_INSPECTOR_macosx_101000 = ENABLE_REMOTE_INSPECTOR;
-ENABLE_REMOTE_INSPECTOR_macosx_101100 = ENABLE_REMOTE_INSPECTOR;
-ENABLE_REMOTE_INSPECTOR_macosx_101200 = ENABLE_REMOTE_INSPECTOR;
</del><ins>+ENABLE_REMOTE_INSPECTOR = ENABLE_REMOTE_INSPECTOR;
</ins><span class="cx"> ENABLE_RESOLUTION_MEDIA_QUERY = ;
</span><span class="cx"> ENABLE_RUBBER_BANDING[sdk=macosx*] = ENABLE_RUBBER_BANDING;
</span><span class="cx"> ENABLE_CSS_SCROLL_SNAP = ENABLE_CSS_SCROLL_SNAP;
</span><span class="lines">@@ -185,12 +155,7 @@
</span><span class="cx"> ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
</span><span class="cx"> ENABLE_SVG_OTF_CONVERTER = ENABLE_SVG_OTF_CONVERTER;
</span><span class="cx">
</span><del>-ENABLE_TELEPHONE_NUMBER_DETECTION[sdk=iphone*] = ENABLE_TELEPHONE_NUMBER_DETECTION;
-ENABLE_TELEPHONE_NUMBER_DETECTION[sdk=macosx*] = $(ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_1090 = ;
-ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_101000 = ENABLE_TELEPHONE_NUMBER_DETECTION;
-ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_101100 = ENABLE_TELEPHONE_NUMBER_DETECTION;
-ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_101200 = ENABLE_TELEPHONE_NUMBER_DETECTION;
</del><ins>+ENABLE_TELEPHONE_NUMBER_DETECTION = ENABLE_TELEPHONE_NUMBER_DETECTION;
</ins><span class="cx">
</span><span class="cx"> ENABLE_TEMPLATE_ELEMENT = ENABLE_TEMPLATE_ELEMENT;
</span><span class="cx"> ENABLE_TEXT_AUTOSIZING = ;
</span><span class="lines">@@ -219,12 +184,7 @@
</span><span class="cx"> ENABLE_WEB_REPLAY_macosx_Release = ENABLE_WEB_REPLAY;
</span><span class="cx"> ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
</span><span class="cx">
</span><del>-ENABLE_WEB_TIMING[sdk=iphone*] = ENABLE_WEB_TIMING;
-ENABLE_WEB_TIMING[sdk=macosx*] = $(ENABLE_WEB_TIMING_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_WEB_TIMING_macosx_1090 = ;
-ENABLE_WEB_TIMING_macosx_101000 = ENABLE_WEB_TIMING;
-ENABLE_WEB_TIMING_macosx_101100 = ENABLE_WEB_TIMING;
-ENABLE_WEB_TIMING_macosx_101200 = ENABLE_WEB_TIMING;
</del><ins>+ENABLE_WEB_TIMING = ENABLE_WEB_TIMING;
</ins><span class="cx">
</span><span class="cx"> ENABLE_XSLT = ENABLE_XSLT;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreConfigurationsVersionxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Configurations/Version.xcconfig (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Configurations/Version.xcconfig 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/JavaScriptCore/Configurations/Version.xcconfig 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -35,7 +35,6 @@
</span><span class="cx"> // The system version prefix is based on the current system version.
</span><span class="cx"> SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
</span><span class="cx"> SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><del>-SYSTEM_VERSION_PREFIX_macosx_1090 = 9;
</del><span class="cx"> SYSTEM_VERSION_PREFIX_macosx_101000 = 10;
</span><span class="cx"> SYSTEM_VERSION_PREFIX_macosx_101100 = 11;
</span><span class="cx"> SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-12-19 Dan Bernstein <mitz@apple.com>
+
+ [Mac] WebKit contains dead source code for OS X Mavericks and earlier
+ https://bugs.webkit.org/show_bug.cgi?id=152462
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/DebugRelease.xcconfig: Removed definitions of MACOSX_DEPLOYMENT_TARGET for
+ OS X 10.8 and 10.9.
+
</ins><span class="cx"> 2015-12-03 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove Objective-C GC support
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEConfigurationsDebugReleasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -5,8 +5,6 @@
</span><span class="cx"> ONLY_ACTIVE_ARCH = YES;
</span><span class="cx">
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><del>-MACOSX_DEPLOYMENT_TARGET_macosx_1080 = 10.8;
-MACOSX_DEPLOYMENT_TARGET_macosx_1090 = 10.9;
</del><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WTF/ChangeLog 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-12-19 Dan Bernstein <mitz@apple.com>
+
+ [Mac] WebKit contains dead source code for OS X Mavericks and earlier
+ https://bugs.webkit.org/show_bug.cgi?id=152462
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/DebugRelease.xcconfig: Removed definition of MACOSX_DEPLOYMENT_TARGET for
+ OS X 10.9.
+
+ - Simplified expressions involving __MAC_OS_X_VERSION_MIN_REQUIRED and removed code that was
+ never getting compiled:
+
+ * wtf/FeatureDefines.h:
+ * wtf/MainThread.h:
+ * wtf/OSObjectPtr.h:
+ * wtf/Platform.h:
+ * wtf/mac/DeprecatedSymbolsUsedBySafari.mm:
+ * wtf/spi/darwin/XPCSPI.h:
+
</ins><span class="cx"> 2015-12-17 Sukolsak Sakshuwong <sukolsak@gmail.com>
</span><span class="cx">
</span><span class="cx"> [INTL] Implement Collator Compare Functions
</span></span></pre></div>
<a id="trunkSourceWTFConfigurationsDebugReleasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/Configurations/DebugRelease.xcconfig (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/Configurations/DebugRelease.xcconfig 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WTF/Configurations/DebugRelease.xcconfig 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> ONLY_ACTIVE_ARCH = YES;
</span><span class="cx">
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><del>-MACOSX_DEPLOYMENT_TARGET_macosx_1090 = 10.9;
</del><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
</span></span></pre></div>
<a id="trunkSourceWTFwtfFeatureDefinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/FeatureDefines.h (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/FeatureDefines.h 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WTF/wtf/FeatureDefines.h 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -200,7 +200,6 @@
</span><span class="cx"> #define ENABLE_FULLSCREEN_API 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> #if !defined(ENABLE_REMOTE_INSPECTOR)
</span><span class="cx"> #define ENABLE_REMOTE_INSPECTOR 1
</span><span class="cx"> #endif
</span><span class="lines">@@ -208,7 +207,6 @@
</span><span class="cx"> #if !defined(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx"> #define ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS 1
</span><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if !defined(ENABLE_SMOOTH_SCROLLING)
</span><span class="cx"> #define ENABLE_SMOOTH_SCROLLING 1
</span></span></pre></div>
<a id="trunkSourceWTFwtfMainThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/MainThread.h (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/MainThread.h 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WTF/wtf/MainThread.h 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -84,17 +84,8 @@
</span><span class="cx"> void initializeMainThreadToProcessMainThreadPlatform();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED == 1090
-WTF_EXPORT_PRIVATE void callOnMainThread(void (*function)(void*), void* context);
-WTF_EXPORT_PRIVATE void cancelCallOnMainThread(void (*function)(void*), void* context);
-#endif
-
</del><span class="cx"> } // namespace WTF
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED == 1090
-using WTF::cancelCallOnMainThread;
-#endif
-
</del><span class="cx"> using WTF::callOnMainThread;
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> using WTF::callOnWebThreadOrDispatchAsyncOnMainThread;
</span></span></pre></div>
<a id="trunkSourceWTFwtfOSObjectPtrh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/OSObjectPtr.h (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/OSObjectPtr.h 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WTF/wtf/OSObjectPtr.h 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -30,25 +30,6 @@
</span><span class="cx"> #include <wtf/Assertions.h>
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101000
-
-#if __has_include(<os/object_private.h>)
-#include <os/object_private.h>
-#endif
-
-#if OS_OBJECT_USE_OBJC
-@class OS_object;
-typedef OS_object *_os_object_t;
-#else
-typedef struct _os_object_s *_os_object_t;
-#endif
-
-extern "C" _os_object_t _os_object_retain(_os_object_t object);
-extern "C" void _os_object_release(_os_object_t object);
-
-#endif
-
-
</del><span class="cx"> namespace WTF {
</span><span class="cx">
</span><span class="cx"> template<typename T> class OSObjectPtr;
</span><span class="lines">@@ -57,29 +38,13 @@
</span><span class="cx"> template<typename T>
</span><span class="cx"> static inline void retainOSObject(T ptr)
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000 || PLATFORM(IOS)
</del><span class="cx"> os_retain(ptr);
</span><del>-#else
-#if OS_OBJECT_USE_OBJC_RETAIN_RELEASE
- [ptr retain];
-#else
- _os_object_retain((_os_object_t)ptr);
-#endif
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T>
</span><span class="cx"> static inline void releaseOSObject(T ptr)
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000 || PLATFORM(IOS)
</del><span class="cx"> os_release(ptr);
</span><del>-#else
-#if OS_OBJECT_USE_OBJC_RETAIN_RELEASE
- [ptr release];
-#else
- _os_object_release((_os_object_t)ptr);
-#endif
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T> class OSObjectPtr {
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Platform.h (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Platform.h 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WTF/wtf/Platform.h 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -1000,11 +1000,11 @@
</span><span class="cx"> #define HAVE_AVFOUNDATION_VIDEO_OUTPUT 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) || (PLATFORM(MAC) || (OS(WINDOWS) && USE(CG)) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080)
</del><ins>+#if PLATFORM(IOS) || PLATFORM(MAC) || (OS(WINDOWS) && USE(CG))
</ins><span class="cx"> #define HAVE_AVFOUNDATION_MEDIA_SELECTION_GROUP 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) || ((PLATFORM(MAC) || (OS(WINDOWS) && USE(CG))) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
</del><ins>+#if PLATFORM(IOS) || PLATFORM(MAC) || (OS(WINDOWS) && USE(CG))
</ins><span class="cx"> #define HAVE_AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT 1
</span><span class="cx"> #define HAVE_MEDIA_ACCESSIBILITY_FRAMEWORK 1
</span><span class="cx"> #endif
</span><span class="lines">@@ -1034,13 +1034,13 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #ifndef HAVE_QOS_CLASSES
</span><del>-#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #define HAVE_QOS_CLASSES 1
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #ifndef HAVE_VOUCHERS
</span><del>-#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #define HAVE_VOUCHERS 1
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="lines">@@ -1064,7 +1064,7 @@
</span><span class="cx"> #define USE_MARKER_REMOVAL_UPON_EDITING 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> #define USE_INSERTION_UNDO_GROUPING 1
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfmacDeprecatedSymbolsUsedBySafarimm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/mac/DeprecatedSymbolsUsedBySafari.mm (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/mac/DeprecatedSymbolsUsedBySafari.mm 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WTF/wtf/mac/DeprecatedSymbolsUsedBySafari.mm 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -39,29 +39,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED == 1090
-WTF_EXPORT_PRIVATE void callOnMainThread(const Function<void ()>&);
-WTF_EXPORT_PRIVATE void lockAtomicallyInitializedStaticMutex();
-WTF_EXPORT_PRIVATE void unlockAtomicallyInitializedStaticMutex();
-
-void callOnMainThread(const Function<void ()>& function)
-{
- callOnMainThread(std::function<void ()>(function));
-}
-
-static StaticLock atomicallyInitializedStaticMutex;
-
-void lockAtomicallyInitializedStaticMutex()
-{
- atomicallyInitializedStaticMutex.lock();
-}
-
-void unlockAtomicallyInitializedStaticMutex()
-{
- atomicallyInitializedStaticMutex.unlock();
-}
-#endif
-
</del><span class="cx"> #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 100000)
</span><span class="cx"> WTF_EXPORT_PRIVATE void callOnMainThread(void (*function)(void*), void* context);
</span><span class="cx"> WTF_EXPORT_PRIVATE void cancelCallOnMainThread(void (*function)(void*), void* context);
</span></span></pre></div>
<a id="trunkSourceWTFwtfspidarwinXPCSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/spi/darwin/XPCSPI.h (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/spi/darwin/XPCSPI.h 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WTF/wtf/spi/darwin/XPCSPI.h 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -79,17 +79,9 @@
</span><span class="cx"> #include <xpc/private.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MAX_ALLOWED >= 1090
-#define CONST_ON_IOS_AND_ON_OR_AFTER_MAC_OS_X_VERSION_1090 const
-#else
-#define CONST_ON_IOS_AND_ON_OR_AFTER_MAC_OS_X_VERSION_1090
-#endif
</del><ins>+EXTERN_C const struct _xpc_dictionary_s _xpc_error_connection_invalid;
+EXTERN_C const struct _xpc_dictionary_s _xpc_error_termination_imminent;
</ins><span class="cx">
</span><del>-EXTERN_C CONST_ON_IOS_AND_ON_OR_AFTER_MAC_OS_X_VERSION_1090 struct _xpc_dictionary_s _xpc_error_connection_invalid;
-EXTERN_C CONST_ON_IOS_AND_ON_OR_AFTER_MAC_OS_X_VERSION_1090 struct _xpc_dictionary_s _xpc_error_termination_imminent;
-
-#undef CONST_ON_IOS_AND_ON_OR_AFTER_MAC_OS_X_VERSION_1090
-
</del><span class="cx"> EXTERN_C const struct _xpc_type_s _xpc_type_array;
</span><span class="cx"> EXTERN_C const struct _xpc_type_s _xpc_type_bool;
</span><span class="cx"> EXTERN_C const struct _xpc_type_s _xpc_type_dictionary;
</span><span class="lines">@@ -140,11 +132,9 @@
</span><span class="cx"> EXTERN_C mach_port_t xpc_dictionary_copy_mach_send(xpc_object_t, const char*);
</span><span class="cx"> EXTERN_C void xpc_dictionary_set_mach_send(xpc_object_t, const char*, mach_port_t);
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> EXTERN_C void xpc_connection_set_bootstrap(xpc_connection_t, xpc_object_t bootstrap);
</span><span class="cx"> EXTERN_C xpc_object_t xpc_copy_bootstrap(void);
</span><span class="cx"> EXTERN_C void xpc_connection_set_oneshot_instance(xpc_connection_t, uuid_t instance);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if OS_OBJECT_USE_OBJC_RETAIN_RELEASE
</span><span class="cx"> #if !defined(xpc_retain)
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebCore/ChangeLog 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -1,3 +1,73 @@
</span><ins>+2015-12-19 Dan Bernstein <mitz@apple.com>
+
+ [Mac] WebKit contains dead source code for OS X Mavericks and earlier
+ https://bugs.webkit.org/show_bug.cgi?id=152462
+
+ Reviewed by Alexey Proskuryakov.
+
+ - Removed build setting definitions for OS X 10.9 and earlier, and simplified defintions
+ that became uniform across all OS X versions as a result:
+
+ * Configurations/DebugRelease.xcconfig:
+ * Configurations/FeatureDefines.xcconfig:
+ * Configurations/Version.xcconfig:
+
+ - Removed support for animating default buttons:
+
+ * rendering/RenderButton.cpp:
+ (WebCore::RenderButton::RenderButton): Removed m_default initialization.
+ (WebCore::RenderButton::styleDidChange): Removed checking for animating default button and
+ starting the animation timer.
+ (WebCore::RenderButton::timerFired): Deleted.
+ * rendering/RenderButton.h: Removed m_timer and m_default member variables
+ * rendering/RenderTheme.h:
+ (WebCore::RenderTheme::defaultButtonHasAnimation): Deleted.
+ * rendering/RenderThemeMac.h: Deleted override.
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::defaultButtonHasAnimation): Deleted.
+
+ - Simplified expressions involving __MAC_OS_X_VERSION_MIN_REQUIRED and removed code that was
+ never getting compiled:
+
+ * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+ * editing/mac/DictionaryLookup.h:
+ * editing/mac/DictionaryLookup.mm:
+ * html/canvas/WebGLDrawBuffers.cpp:
+ * loader/DocumentLoader.cpp:
+ * loader/cache/CachedFont.cpp:
+ * loader/cocoa/DiskCacheMonitorCocoa.h:
+ * page/cocoa/SettingsCocoa.mm:
+ * platform/Scrollbar.cpp:
+ * platform/cocoa/MemoryPressureHandlerCocoa.mm:
+ * platform/cocoa/NetworkExtensionContentFilter.h:
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ * platform/graphics/cg/ImageSourceCG.cpp:
+ * platform/graphics/cocoa/FontCacheCoreText.cpp:
+ * platform/graphics/cocoa/FontCascadeCocoa.mm:
+ * platform/graphics/mac/GraphicsContext3DMac.mm:
+ * platform/mac/NSScrollerImpDetails.h:
+ * platform/mac/ScrollAnimatorMac.mm:
+ * platform/mac/ScrollViewMac.mm:
+ * platform/mac/ScrollbarThemeMac.mm:
+ * platform/mac/ThemeMac.mm:
+ * platform/mac/WebCoreFullScreenPlaceholderView.h:
+ * platform/mac/WebCoreFullScreenPlaceholderView.mm:
+ * platform/network/cf/CookieJarCFNet.cpp:
+ * platform/network/cf/ResourceRequest.h:
+ * platform/spi/cf/CFNetworkSPI.h:
+ * platform/spi/cocoa/CoreTextSPI.h:
+ * platform/spi/cocoa/NSButtonCellSPI.h:
+ * platform/spi/cocoa/NSColorSPI.h:
+ * platform/spi/cocoa/QuartzCoreSPI.h:
+ * platform/spi/mac/LookupSPI.h:
+ * platform/spi/mac/NSFontSPI.h:
+ * platform/spi/mac/NSImmediateActionGestureRecognizerSPI.h:
+ * platform/spi/mac/NSPopoverSPI.h:
+ * platform/spi/mac/NSSharingServicePickerSPI.h:
+ * platform/spi/mac/NSSharingServiceSPI.h:
+ * platform/spi/mac/TUCallSPI.h:
+ * platform/sql/SQLiteDatabase.cpp:
+
</ins><span class="cx"> 2015-12-18 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Cache redirects as separate entries
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsDebugReleasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/DebugRelease.xcconfig (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/DebugRelease.xcconfig 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebCore/Configurations/DebugRelease.xcconfig 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx"> ONLY_ACTIVE_ARCH = YES;
</span><span class="cx">
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><del>-MACOSX_DEPLOYMENT_TARGET_macosx_1090 = 10.9;
</del><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -35,12 +35,7 @@
</span><span class="cx"> ENABLE_ACCELERATED_2D_CANVAS = ;
</span><span class="cx"> ENABLE_ACCELERATED_OVERFLOW_SCROLLING[sdk=iphone*] = ENABLE_ACCELERATED_OVERFLOW_SCROLLING;
</span><span class="cx"> ENABLE_ATTACHMENT_ELEMENT = ENABLE_ATTACHMENT_ELEMENT;
</span><del>-ENABLE_AVF_CAPTIONS[sdk=iphone*] = ENABLE_AVF_CAPTIONS;
-ENABLE_AVF_CAPTIONS[sdk=macosx*] = $(ENABLE_AVF_CAPTIONS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_AVF_CAPTIONS_macosx_1090 = ;
-ENABLE_AVF_CAPTIONS_macosx_101000 = ENABLE_AVF_CAPTIONS;
-ENABLE_AVF_CAPTIONS_macosx_101100 = ENABLE_AVF_CAPTIONS;
-ENABLE_AVF_CAPTIONS_macosx_101200 = ENABLE_AVF_CAPTIONS;
</del><ins>+ENABLE_AVF_CAPTIONS = ENABLE_AVF_CAPTIONS;
</ins><span class="cx"> ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
</span><span class="cx"> ENABLE_CANVAS_PATH = ENABLE_CANVAS_PATH;
</span><span class="cx"> ENABLE_CANVAS_PROXY = ;
</span><span class="lines">@@ -76,12 +71,7 @@
</span><span class="cx"> ENABLE_ENCRYPTED_MEDIA[sdk=macosx*] = ENABLE_ENCRYPTED_MEDIA;
</span><span class="cx"> ENABLE_ENCRYPTED_MEDIA_V2[sdk=macosx*] = ENABLE_ENCRYPTED_MEDIA_V2;
</span><span class="cx"> ENABLE_FETCH_API = ENABLE_FETCH_API;
</span><del>-ENABLE_FILTERS_LEVEL_2[sdk=iphone*] = ENABLE_FILTERS_LEVEL_2;
-ENABLE_FILTERS_LEVEL_2[sdk=macosx*] = $(ENABLE_FILTERS_LEVEL_2_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_FILTERS_LEVEL_2_macosx_1090 = ;
-ENABLE_FILTERS_LEVEL_2_macosx_101000 = ENABLE_FILTERS_LEVEL_2;
-ENABLE_FILTERS_LEVEL_2_macosx_101100 = ENABLE_FILTERS_LEVEL_2;
-ENABLE_FILTERS_LEVEL_2_macosx_101200 = ENABLE_FILTERS_LEVEL_2;
</del><ins>+ENABLE_FILTERS_LEVEL_2 = ENABLE_FILTERS_LEVEL_2;
</ins><span class="cx"> ENABLE_FONT_LOAD_EVENTS = ;
</span><span class="cx"> ENABLE_FULLSCREEN_API[sdk=macosx*] = ENABLE_FULLSCREEN_API;
</span><span class="cx"> ENABLE_GAMEPAD[sdk=macosx*] = ENABLE_GAMEPAD;
</span><span class="lines">@@ -89,11 +79,7 @@
</span><span class="cx"> ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
</span><span class="cx"> ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING[sdk=macosx*] = ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING;
</span><span class="cx"> ENABLE_ICONDATABASE[sdk=macosx*] = ENABLE_ICONDATABASE;
</span><del>-ENABLE_SERVICE_CONTROLS[sdk=macosx*] = $(ENABLE_SERVICE_CONTROLS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_SERVICE_CONTROLS_macosx_1090 = ;
-ENABLE_SERVICE_CONTROLS_macosx_101000 = ENABLE_SERVICE_CONTROLS;
-ENABLE_SERVICE_CONTROLS_macosx_101100 = ENABLE_SERVICE_CONTROLS;
-ENABLE_SERVICE_CONTROLS_macosx_101200 = ENABLE_SERVICE_CONTROLS;
</del><ins>+ENABLE_SERVICE_CONTROLS[sdk=macosx*] = ENABLE_SERVICE_CONTROLS;
</ins><span class="cx"> ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
</span><span class="cx"> ENABLE_INDEXED_DATABASE_IN_WORKERS = ;
</span><span class="cx"> ENABLE_INDIE_UI = ENABLE_INDIE_UI;
</span><span class="lines">@@ -106,16 +92,10 @@
</span><span class="cx"> ENABLE_INPUT_TYPE_TIME[sdk=iphone*] = ENABLE_INPUT_TYPE_TIME;
</span><span class="cx"> ENABLE_INPUT_TYPE_WEEK[sdk=iphone*] = ENABLE_INPUT_TYPE_WEEK;
</span><span class="cx">
</span><del>-ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS[sdk=iphone*] = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
-ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS[sdk=macosx*] = $(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR))
-ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_1090 = ;
-ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_101000 = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
-ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_101100 = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
-ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_101200 = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
</del><ins>+ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
</ins><span class="cx">
</span><span class="cx"> ENABLE_WIRELESS_PLAYBACK_TARGET[sdk=iphone*] = ENABLE_WIRELESS_PLAYBACK_TARGET;
</span><span class="cx"> ENABLE_WIRELESS_PLAYBACK_TARGET[sdk=macosx*] = $(ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR))
</span><del>-ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_1090 = ;
</del><span class="cx"> ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_101000 = ;
</span><span class="cx"> ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_101100 = ENABLE_WIRELESS_PLAYBACK_TARGET;
</span><span class="cx"> ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_101200 = ENABLE_WIRELESS_PLAYBACK_TARGET;
</span><span class="lines">@@ -128,7 +108,6 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_MAC_GESTURE_EVENTS = ;
</span><span class="cx"> ENABLE_MAC_GESTURE_EVENTS[sdk=macosx*] = $(ENABLE_MAC_GESTURE_EVENTS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
</span><del>-ENABLE_MAC_GESTURE_EVENTS_macosx_1090_WITH_INTERNAL_SDK_YES = ;
</del><span class="cx"> ENABLE_MAC_GESTURE_EVENTS_macosx_101000_WITH_INTERNAL_SDK_YES = ;
</span><span class="cx"> ENABLE_MAC_GESTURE_EVENTS_macosx_101100_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
</span><span class="cx"> ENABLE_MAC_GESTURE_EVENTS_macosx_101200_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
</span><span class="lines">@@ -148,11 +127,7 @@
</span><span class="cx"> ENABLE_MEDIA_CONTROLS_SCRIPT = ENABLE_MEDIA_CONTROLS_SCRIPT;
</span><span class="cx"> ENABLE_MEDIA_SESSION = ;
</span><span class="cx">
</span><del>-ENABLE_MEDIA_SOURCE[sdk=macosx*] = $(ENABLE_MEDIA_SOURCE_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_MEDIA_SOURCE_macosx_1090 = ;
-ENABLE_MEDIA_SOURCE_macosx_101000 = ENABLE_MEDIA_SOURCE;
-ENABLE_MEDIA_SOURCE_macosx_101100 = ENABLE_MEDIA_SOURCE;
-ENABLE_MEDIA_SOURCE_macosx_101200 = ENABLE_MEDIA_SOURCE;
</del><ins>+ENABLE_MEDIA_SOURCE[sdk=macosx*] = ENABLE_MEDIA_SOURCE;
</ins><span class="cx">
</span><span class="cx"> ENABLE_MEDIA_STATISTICS = ;
</span><span class="cx"> ENABLE_MEDIA_STREAM = ENABLE_MEDIA_STREAM;
</span><span class="lines">@@ -170,12 +145,7 @@
</span><span class="cx"> ENABLE_QUOTA = ;
</span><span class="cx"> ENABLE_REQUEST_ANIMATION_FRAME = ENABLE_REQUEST_ANIMATION_FRAME;
</span><span class="cx"> ENABLE_REQUEST_AUTOCOMPLETE = ;
</span><del>-ENABLE_REMOTE_INSPECTOR[sdk=iphone*] = ENABLE_REMOTE_INSPECTOR;
-ENABLE_REMOTE_INSPECTOR[sdk=macosx*] = $(ENABLE_REMOTE_INSPECTOR_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_REMOTE_INSPECTOR_macosx_1090 = ;
-ENABLE_REMOTE_INSPECTOR_macosx_101000 = ENABLE_REMOTE_INSPECTOR;
-ENABLE_REMOTE_INSPECTOR_macosx_101100 = ENABLE_REMOTE_INSPECTOR;
-ENABLE_REMOTE_INSPECTOR_macosx_101200 = ENABLE_REMOTE_INSPECTOR;
</del><ins>+ENABLE_REMOTE_INSPECTOR = ENABLE_REMOTE_INSPECTOR;
</ins><span class="cx"> ENABLE_RESOLUTION_MEDIA_QUERY = ;
</span><span class="cx"> ENABLE_RUBBER_BANDING[sdk=macosx*] = ENABLE_RUBBER_BANDING;
</span><span class="cx"> ENABLE_CSS_SCROLL_SNAP = ENABLE_CSS_SCROLL_SNAP;
</span><span class="lines">@@ -185,12 +155,7 @@
</span><span class="cx"> ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
</span><span class="cx"> ENABLE_SVG_OTF_CONVERTER = ENABLE_SVG_OTF_CONVERTER;
</span><span class="cx">
</span><del>-ENABLE_TELEPHONE_NUMBER_DETECTION[sdk=iphone*] = ENABLE_TELEPHONE_NUMBER_DETECTION;
-ENABLE_TELEPHONE_NUMBER_DETECTION[sdk=macosx*] = $(ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_1090 = ;
-ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_101000 = ENABLE_TELEPHONE_NUMBER_DETECTION;
-ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_101100 = ENABLE_TELEPHONE_NUMBER_DETECTION;
-ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_101200 = ENABLE_TELEPHONE_NUMBER_DETECTION;
</del><ins>+ENABLE_TELEPHONE_NUMBER_DETECTION = ENABLE_TELEPHONE_NUMBER_DETECTION;
</ins><span class="cx">
</span><span class="cx"> ENABLE_TEMPLATE_ELEMENT = ENABLE_TEMPLATE_ELEMENT;
</span><span class="cx"> ENABLE_TEXT_AUTOSIZING = ;
</span><span class="lines">@@ -219,12 +184,7 @@
</span><span class="cx"> ENABLE_WEB_REPLAY_macosx_Release = ENABLE_WEB_REPLAY;
</span><span class="cx"> ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
</span><span class="cx">
</span><del>-ENABLE_WEB_TIMING[sdk=iphone*] = ENABLE_WEB_TIMING;
-ENABLE_WEB_TIMING[sdk=macosx*] = $(ENABLE_WEB_TIMING_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_WEB_TIMING_macosx_1090 = ;
-ENABLE_WEB_TIMING_macosx_101000 = ENABLE_WEB_TIMING;
-ENABLE_WEB_TIMING_macosx_101100 = ENABLE_WEB_TIMING;
-ENABLE_WEB_TIMING_macosx_101200 = ENABLE_WEB_TIMING;
</del><ins>+ENABLE_WEB_TIMING = ENABLE_WEB_TIMING;
</ins><span class="cx">
</span><span class="cx"> ENABLE_XSLT = ENABLE_XSLT;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsVersionxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/Version.xcconfig (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/Version.xcconfig 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebCore/Configurations/Version.xcconfig 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -35,7 +35,6 @@
</span><span class="cx"> // The system version prefix is based on the current system version.
</span><span class="cx"> SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
</span><span class="cx"> SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><del>-SYSTEM_VERSION_PREFIX_macosx_1090 = 9;
</del><span class="cx"> SYSTEM_VERSION_PREFIX_macosx_101000 = 10;
</span><span class="cx"> SYSTEM_VERSION_PREFIX_macosx_101100 = 11;
</span><span class="cx"> SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -3467,7 +3467,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)accessibilitySetValue:(id)value forAttribute:(NSString*)attributeName
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> // In case anything we do by changing values causes an alert or other modal
</span><span class="cx"> // behaviors, we need to return now, so that VoiceOver doesn't hang indefinitely.
</span><span class="cx"> dispatch_async(dispatch_get_main_queue(), ^{
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingmacDictionaryLookuph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/mac/DictionaryLookup.h (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/mac/DictionaryLookup.h 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebCore/editing/mac/DictionaryLookup.h 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> OBJC_CLASS PDFSelection;
</span><span class="cx">
</span><span class="cx"> // This file is included in Internals.cpp, so we can't use ObjC outright.
</span><del>-#if defined(__OBJC__) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><ins>+#if defined(__OBJC__)
</ins><span class="cx"> #include "NSImmediateActionGestureRecognizerSPI.h"
</span><span class="cx"> #define PlatformAnimationController id<NSImmediateActionAnimationController>
</span><span class="cx"> #else
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingmacDictionaryLookupmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/mac/DictionaryLookup.mm (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/mac/DictionaryLookup.mm 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebCore/editing/mac/DictionaryLookup.mm 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -223,13 +223,9 @@
</span><span class="cx"> if ([getLULookupDefinitionModuleClass() respondsToSelector:@selector(showDefinitionForTerm:relativeToRect:ofView:options:)]) {
</span><span class="cx"> FloatRect firstTextRectInViewCoordinates = textIndicator.get().textRectsInBoundingRectCoordinates()[0];
</span><span class="cx"> firstTextRectInViewCoordinates.moveBy(textIndicator.get().textBoundingRectInRootViewCoordinates().location());
</span><del>- if (createAnimationController) {
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><ins>+ if (createAnimationController)
</ins><span class="cx"> return [getLULookupDefinitionModuleClass() lookupAnimationControllerForTerm:dictionaryPopupInfo.attributedString.get() relativeToRect:firstTextRectInViewCoordinates ofView:view options:mutableOptions.get()];
</span><del>-#else
- return nil;
-#endif
- }
</del><ins>+
</ins><span class="cx"> [getLULookupDefinitionModuleClass() showDefinitionForTerm:dictionaryPopupInfo.attributedString.get() relativeToRect:firstTextRectInViewCoordinates ofView:view options:mutableOptions.get()];
</span><span class="cx"> return nil;
</span><span class="cx"> }
</span><span class="lines">@@ -241,13 +237,8 @@
</span><span class="cx"> textBaselineOrigin = [view convertPoint:textBaselineOrigin toView:nil];
</span><span class="cx"> textBaselineOrigin = [view.window convertRectToScreen:NSMakeRect(textBaselineOrigin.x, textBaselineOrigin.y, 0, 0)].origin;
</span><span class="cx">
</span><del>- if (createAnimationController) {
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><ins>+ if (createAnimationController)
</ins><span class="cx"> return [getLULookupDefinitionModuleClass() lookupAnimationControllerForTerm:dictionaryPopupInfo.attributedString.get() atLocation:textBaselineOrigin options:mutableOptions.get()];
</span><del>-#else
- return nil;
-#endif
- }
</del><span class="cx">
</span><span class="cx"> [getLULookupDefinitionModuleClass() showDefinitionForTerm:dictionaryPopupInfo.attributedString.get() atLocation:textBaselineOrigin options:mutableOptions.get()];
</span><span class="cx"> return nil;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLDrawBufferscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLDrawBuffers.cpp (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLDrawBuffers.cpp 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebCore/html/canvas/WebGLDrawBuffers.cpp 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -46,15 +46,6 @@
</span><span class="cx"> return WebGLExtension::WebGLDrawBuffersName;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101000)
-
-bool WebGLDrawBuffers::supported(WebGLRenderingContextBase*)
-{
- return false;
-}
-
-#else
-
</del><span class="cx"> bool WebGLDrawBuffers::supported(WebGLRenderingContextBase* context)
</span><span class="cx"> {
</span><span class="cx"> Extensions3D* extensions = context->graphicsContext3D()->getExtensions();
</span><span class="lines">@@ -62,8 +53,6 @@
</span><span class="cx"> && satisfiesWebGLRequirements(context);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif
-
</del><span class="cx"> void WebGLDrawBuffers::drawBuffersWEBGL(const Vector<GC3Denum>& buffers)
</span><span class="cx"> {
</span><span class="cx"> if (m_context->isContextLost())
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -97,7 +97,6 @@
</span><span class="cx"> loader->setDefersLoading(defers);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> static bool areAllLoadersPageCacheAcceptable(const ResourceLoaderMap& loaders)
</span><span class="cx"> {
</span><span class="cx"> Vector<RefPtr<ResourceLoader>> loadersCopy;
</span><span class="lines">@@ -117,7 +116,6 @@
</span><span class="cx"> }
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> DocumentLoader::DocumentLoader(const ResourceRequest& req, const SubstituteData& substituteData)
</span><span class="cx"> : m_deferMainResourceDataLoad(true)
</span><span class="lines">@@ -287,11 +285,8 @@
</span><span class="cx"> // loading but there are subresource loads during cancellation. This must be done before the
</span><span class="cx"> // frame->stopLoading() call, which may evict the CachedResources, which we rely on to check
</span><span class="cx"> // the type of the resource loads.
</span><del>-#if !PLATFORM(MAC) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
- // Disabled on Mavericks because it seems to cause issues (rdar://problem/22521514).
</del><span class="cx"> if (loading && m_committed && !mainResourceLoader() && !m_subresourceLoaders.isEmpty())
</span><span class="cx"> m_subresourceLoadersArePageCacheAcceptable = areAllLoadersPageCacheAcceptable(m_subresourceLoaders);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> if (m_committed) {
</span><span class="cx"> // Attempt to stop the frame if the document loader is loading, or if it is done loading but
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedFontcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedFont.cpp (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedFont.cpp 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebCore/loader/cache/CachedFont.cpp 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> if (!m_fontCustomPlatformData && !errorOccurred() && !isLoading() && data) {
</span><span class="cx"> RefPtr<SharedBuffer> buffer(data);
</span><span class="cx">
</span><del>-#if (!PLATFORM(MAC) || __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090) && !PLATFORM(IOS)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx"> if (isWOFF(buffer.get())) {
</span><span class="cx"> Vector<char> convertedFont;
</span><span class="cx"> if (!convertWOFFToSfnt(buffer.get(), convertedFont))
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercocoaDiskCacheMonitorCocoah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.h (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.h 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.h 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -55,19 +55,6 @@
</span><span class="cx"> SessionID m_sessionID;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 1090
-
-inline void DiskCacheMonitor::monitorFileBackingStoreCreation(const ResourceRequest&, SessionID, CFCachedURLResponseRef)
-{
-}
-
-inline PassRefPtr<SharedBuffer> DiskCacheMonitor::tryGetFileBackedSharedBufferFromCFURLCachedResponse(CFCachedURLResponseRef)
-{
- return nullptr;
-}
-
-#endif
-
</del><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif // DiskCacheMonitorCocoa_h
</span></span></pre></div>
<a id="trunkSourceWebCorepagecocoaSettingsCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/cocoa/SettingsCocoa.mm (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/cocoa/SettingsCocoa.mm 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebCore/page/cocoa/SettingsCocoa.mm 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -41,20 +41,12 @@
</span><span class="cx">
</span><span class="cx"> static inline const char* sansSerifTraditionalHanFontFamily()
</span><span class="cx"> {
</span><del>-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || PLATFORM(IOS)
</del><span class="cx"> return "PingFang TC";
</span><del>-#else
- return "Heiti TC";
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline const char* sansSerifSimplifiedHanFontFamily()
</span><span class="cx"> {
</span><del>-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || PLATFORM(IOS)
</del><span class="cx"> return "PingFang SC";
</span><del>-#else
- return "Heiti SC";
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollbarcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Scrollbar.cpp (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Scrollbar.cpp 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebCore/platform/Scrollbar.cpp 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -478,7 +478,7 @@
</span><span class="cx"> {
</span><span class="cx"> // It's unfortunate that this needs to be done with an ifdef. Ideally there would be a way to feature-detect
</span><span class="cx"> // the necessary support within AppKit.
</span><del>-#if ENABLE(ASYNC_SCROLLING) && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><ins>+#if ENABLE(ASYNC_SCROLLING) && PLATFORM(MAC)
</ins><span class="cx"> return !m_scrollableArea.forceUpdateScrollbarsOnMainThreadForPerformanceTesting()
</span><span class="cx"> && (m_scrollableArea.hasLayerForVerticalScrollbar() || m_scrollableArea.hasLayerForHorizontalScrollbar())
</span><span class="cx"> && m_scrollableArea.usesAsyncScrolling();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaMemoryPressureHandlerCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -68,16 +68,12 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> if (critical == Critical::Yes && !isUnderMemoryPressure()) {
</span><span class="cx"> // libcache listens to OS memory notifications, but for process suspension
</span><span class="cx"> // or memory pressure simulation, we need to prod it manually:
</span><span class="cx"> ReliefLogger log("Purging libcache caches");
</span><span class="cx"> cache_simulate_memory_warning_event(DISPATCH_MEMORYPRESSURE_CRITICAL);
</span><span class="cx"> }
</span><del>-#else
- UNUSED_PARAM(critical);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static dispatch_source_t _cache_event_source = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaNetworkExtensionContentFilterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.h (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.h 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.h 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> #include <wtf/OSObjectPtr.h>
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx">
</span><del>-#define HAVE_NETWORK_EXTENSION PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000 && CPU(X86_64))
</del><ins>+#define HAVE_NETWORK_EXTENSION PLATFORM(IOS) || (PLATFORM(MAC) && CPU(X86_64))
</ins><span class="cx">
</span><span class="cx"> enum NEFilterSourceStatus : NSInteger;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -682,7 +682,7 @@
</span><span class="cx"> if (!m_videoLayer)
</span><span class="cx"> createAVPlayerLayer();
</span><span class="cx">
</span><del>-#if USE(VIDEOTOOLBOX) && (!defined(__MAC_OS_X_VERSION_MIN_REQUIRED) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000)
</del><ins>+#if USE(VIDEOTOOLBOX)
</ins><span class="cx"> if (!m_videoOutput)
</span><span class="cx"> createVideoOutput();
</span><span class="cx"> #endif
</span><span class="lines">@@ -2216,7 +2216,7 @@
</span><span class="cx"> if (!m_avPlayerItem || m_videoOutput)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-#if USE(VIDEOTOOLBOX) && (!defined(__MAC_OS_X_VERSION_MIN_REQUIRED) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000)
</del><ins>+#if USE(VIDEOTOOLBOX)
</ins><span class="cx"> NSDictionary* attributes = nil;
</span><span class="cx"> #else
</span><span class="cx"> NSDictionary* attributes = [NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithUnsignedInt:kCVPixelFormatType_32BGRA], kCVPixelBufferPixelFormatTypeKey,
</span><span class="lines">@@ -2229,10 +2229,6 @@
</span><span class="cx">
</span><span class="cx"> [m_avPlayerItem.get() addOutput:m_videoOutput.get()];
</span><span class="cx">
</span><del>-#if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101000
- waitForVideoOutputMediaDataWillChange();
-#endif
-
</del><span class="cx"> LOG(Media, "MediaPlayerPrivateAVFoundationObjC::createVideoOutput(%p) - returning %p", this, m_videoOutput.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2353,10 +2349,8 @@
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateAVFoundationObjC::paintWithVideoOutput(GraphicsContext& context, const FloatRect& outputRect)
</span><span class="cx"> {
</span><del>-#if (!defined(__MAC_OS_X_VERSION_MIN_REQUIRED) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000)
</del><span class="cx"> if (m_videoOutput && !m_lastImage && !videoOutputHasAvailableFrame())
</span><span class="cx"> waitForVideoOutputMediaDataWillChange();
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> updateLastImage();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgImageSourceCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -368,7 +368,7 @@
</span><span class="cx"> if (!imageUTI)
</span><span class="cx"> return image.leakRef();
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> if (CFEqual(imageUTI, kUTTypeGIF)) {
</span><span class="cx"> CGImageSetCachingFlags(image.get(), kCGImageCachingTransient);
</span><span class="cx"> return image.leakRef();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaFontCacheCoreTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -133,7 +133,6 @@
</span><span class="cx">
</span><span class="cx"> static inline void appendOpenTypeFeature(CFMutableArrayRef features, const FontFeature& feature)
</span><span class="cx"> {
</span><del>-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || PLATFORM(IOS)
</del><span class="cx"> RetainPtr<CFStringRef> featureKey = adoptCF(CFStringCreateWithBytes(kCFAllocatorDefault, reinterpret_cast<const UInt8*>(feature.tag().data()), feature.tag().size() * sizeof(FontFeatureTag::value_type), kCFStringEncodingASCII, false));
</span><span class="cx"> int rawFeatureValue = feature.value();
</span><span class="cx"> RetainPtr<CFNumberRef> featureValue = adoptCF(CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &rawFeatureValue));
</span><span class="lines">@@ -141,10 +140,6 @@
</span><span class="cx"> CFTypeRef featureDictionaryValues[] = { featureKey.get(), featureValue.get() };
</span><span class="cx"> RetainPtr<CFDictionaryRef> featureDictionary = adoptCF(CFDictionaryCreate(kCFAllocatorDefault, featureDictionaryKeys, featureDictionaryValues, WTF_ARRAY_LENGTH(featureDictionaryValues), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
</span><span class="cx"> CFArrayAppendValue(features, featureDictionary.get());
</span><del>-#else
- UNUSED_PARAM(features);
- UNUSED_PARAM(feature);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> typedef HashMap<FontFeatureTag, int, FontFeatureTagHash, FontFeatureTagHashTraits> FeaturesMap;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaFontCascadeCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -591,17 +591,8 @@
</span><span class="cx">
</span><span class="cx"> bool FontCascade::primaryFontIsSystemFont() const
</span><span class="cx"> {
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED > 1090
</del><span class="cx"> const auto& fontData = primaryFont();
</span><span class="cx"> return !fontData.isSVGFont() && CTFontDescriptorIsSystemUIFont(adoptCF(CTFontCopyFontDescriptor(fontData.platformData().ctFont())).get());
</span><del>-#else
- const String& firstFamily = this->firstFamily();
- return equalIgnoringASCIICase(firstFamily, "-webkit-system-font")
- || equalIgnoringASCIICase(firstFamily, "-apple-system-font")
- || equalIgnoringASCIICase(firstFamily, "-apple-system")
- || equalIgnoringASCIICase(firstFamily, "-apple-menu")
- || equalIgnoringASCIICase(firstFamily, "-apple-status-bar");
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FontCascade::adjustSelectionRectForComplexText(const TextRun& run, LayoutRect& selectionRect, int from, int to) const
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacGraphicsContext3DMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -63,15 +63,11 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-#define USE_GPU_STATUS_CHECK ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || PLATFORM(IOS))
-
</del><span class="cx"> const int maxActiveContexts = 64;
</span><span class="cx"> int GraphicsContext3D::numActiveContexts = 0;
</span><del>-#if USE_GPU_STATUS_CHECK
</del><span class="cx"> const int GPUStatusCheckThreshold = 5;
</span><span class="cx"> int GraphicsContext3D::GPUCheckCounter = 0;
</span><del>-#endif
-
</del><ins>+
</ins><span class="cx"> // FIXME: This class is currently empty on Mac, but will get populated as
</span><span class="cx"> // the restructuring in https://bugs.webkit.org/show_bug.cgi?id=66903 is done
</span><span class="cx"> class GraphicsContext3DPrivate {
</span><span class="lines">@@ -205,14 +201,12 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> CGLError err = CGLCreateContext(pixelFormatObj, 0, &m_contextObj);
</span><del>-#if USE_GPU_STATUS_CHECK
</del><span class="cx"> GLint abortOnBlacklist = 0;
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> CGLSetParameter(m_contextObj, kCGLCPAbortOnGPURestartStatusBlacklisted, &abortOnBlacklist);
</span><span class="cx"> #elif PLATFORM(IOS)
</span><span class="cx"> CGLSetParameter(m_contextObj, kEAGLCPAbortOnGPURestartStatusBlacklisted, &abortOnBlacklist);
</span><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> CGLDestroyPixelFormat(pixelFormatObj);
</span><span class="cx">
</span><span class="lines">@@ -373,7 +367,6 @@
</span><span class="cx">
</span><span class="cx"> void GraphicsContext3D::checkGPUStatusIfNecessary()
</span><span class="cx"> {
</span><del>-#if USE_GPU_STATUS_CHECK
</del><span class="cx"> bool needsCheck = !GPUCheckCounter;
</span><span class="cx"> GPUCheckCounter = (GPUCheckCounter + 1) % GPUStatusCheckThreshold;
</span><span class="cx">
</span><span class="lines">@@ -397,7 +390,6 @@
</span><span class="cx"> [EAGLContext setCurrentContext:0];
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacNSScrollerImpDetailsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/NSScrollerImpDetails.h (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/NSScrollerImpDetails.h 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebCore/platform/mac/NSScrollerImpDetails.h 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -63,9 +63,7 @@
</span><span class="cx"> - (void)mouseEnteredScroller;
</span><span class="cx"> - (void)mouseExitedScroller;
</span><span class="cx"> - (void)setTracking:(BOOL)tracking;
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> - (void)setNeedsDisplay:(BOOL)flag;
</span><del>-#endif
</del><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface NSObject (ScrollbarPainterController)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacScrollAnimatorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -1025,17 +1025,11 @@
</span><span class="cx"> [m_scrollbarPainterController setHorizontalScrollerImp:nil];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> void ScrollAnimatorMac::invalidateScrollbarPartLayers(Scrollbar* scrollbar)
</span><span class="cx"> {
</span><span class="cx"> ScrollbarPainter painter = scrollbarPainterForScrollbar(*scrollbar);
</span><span class="cx"> [painter setNeedsDisplay:YES];
</span><span class="cx"> }
</span><del>-#else
-void ScrollAnimatorMac::invalidateScrollbarPartLayers(Scrollbar*)
-{
-}
-#endif
</del><span class="cx">
</span><span class="cx"> void ScrollAnimatorMac::verticalScrollbarLayerDidChange()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacScrollViewMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ScrollViewMac.mm (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ScrollViewMac.mm 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebCore/platform/mac/ScrollViewMac.mm 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -38,12 +38,6 @@
</span><span class="cx"> - (NSEdgeInsets)contentInsets;
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101000
-@interface NSScrollView (WebDetails)
-@property BOOL automaticallyAdjustsContentInsets;
-@end
-#endif
-
</del><span class="cx"> @interface NSWindow (WebWindowDetails)
</span><span class="cx"> - (BOOL)_needsToResetDragMargins;
</span><span class="cx"> - (void)_setNeedsToResetDragMargins:(BOOL)needs;
</span><span class="lines">@@ -117,9 +111,7 @@
</span><span class="cx"> float ScrollView::platformTopContentInset() const
</span><span class="cx"> {
</span><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS;
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> return scrollView().contentInsets.top;
</span><del>-#endif
</del><span class="cx"> END_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx">
</span><span class="cx"> return 0;
</span><span class="lines">@@ -128,7 +120,6 @@
</span><span class="cx"> void ScrollView::platformSetTopContentInset(float topContentInset)
</span><span class="cx"> {
</span><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS;
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> if (topContentInset)
</span><span class="cx"> scrollView().automaticallyAdjustsContentInsets = NO;
</span><span class="cx"> else
</span><span class="lines">@@ -137,9 +128,6 @@
</span><span class="cx"> NSEdgeInsets contentInsets = scrollView().contentInsets;
</span><span class="cx"> contentInsets.top = topContentInset;
</span><span class="cx"> scrollView().contentInsets = contentInsets;
</span><del>-#else
- UNUSED_PARAM(topContentInset);
-#endif
</del><span class="cx"> END_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -148,10 +136,8 @@
</span><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx"> IntRect visibleContentRect = platformVisibleContentRectIncludingObscuredArea(includeScrollbars);
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> visibleContentRect.move(scrollView().contentInsets.left, scrollView().contentInsets.top);
</span><span class="cx"> visibleContentRect.contract(scrollView().contentInsets.left + scrollView().contentInsets.right, scrollView().contentInsets.top + scrollView().contentInsets.bottom);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> return visibleContentRect;
</span><span class="cx"> END_BLOCK_OBJC_EXCEPTIONS;
</span><span class="lines">@@ -209,12 +195,10 @@
</span><span class="cx"> NSPoint floatPoint = scrollPoint;
</span><span class="cx"> NSPoint tempPoint = { std::max(-[scrollView() scrollOrigin].x, floatPoint.x), std::max(-[scrollView() scrollOrigin].y, floatPoint.y) }; // Don't use NSMakePoint to work around 4213314.
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> // AppKit has the inset factored into all of its scroll positions. In WebCore, we use positions that ignore
</span><span class="cx"> // the insets so that they are equivalent whether or not there is an inset.
</span><span class="cx"> tempPoint.x = tempPoint.x - scrollView().contentInsets.left;
</span><span class="cx"> tempPoint.y = tempPoint.y - scrollView().contentInsets.top;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> [documentView() scrollPoint:tempPoint];
</span><span class="cx"> END_BLOCK_OBJC_EXCEPTIONS;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacScrollbarThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -483,7 +483,7 @@
</span><span class="cx"> [painter setEnabled:scrollbar.enabled()];
</span><span class="cx"> [painter setBoundsSize:scrollbar.frameRect().size()];
</span><span class="cx"> [painter setDoubleValue:value];
</span><del>-#if ENABLE(ASYNC_SCROLLING) && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><ins>+#if ENABLE(ASYNC_SCROLLING) && PLATFORM(MAC)
</ins><span class="cx"> [painter setPresentationValue:value];
</span><span class="cx"> #endif
</span><span class="cx"> [painter setKnobProportion:proportion];
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ThemeMac.mm (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ThemeMac.mm 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebCore/platform/mac/ThemeMac.mm 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -186,10 +186,6 @@
</span><span class="cx">
</span><span class="cx"> static void updateStates(NSCell* cell, const ControlStates& controlStates, bool useAnimation = false)
</span><span class="cx"> {
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101000
- UNUSED_PARAM(useAnimation);
-#endif
-
</del><span class="cx"> // The animated state cause this thread to start and stop repeatedly on CoreAnimation synchronize calls.
</span><span class="cx"> // This short burts of activity in between are not long enough for VoiceOver to retrieve accessibility attributes and makes the process appear unresponsive.
</span><span class="cx"> if (AXObjectCache::accessibilityEnhancedUserInterfaceEnabled())
</span><span class="lines">@@ -203,11 +199,7 @@
</span><span class="cx"> bool oldPressed = [cell isHighlighted];
</span><span class="cx"> bool pressed = states & ControlStates::PressedState;
</span><span class="cx"> if (pressed != oldPressed) {
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> [(NSButtonCell*)cell _setHighlighted:pressed animated:useAnimation];
</span><del>-#else
- [cell setHighlighted:pressed];
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Enabled state
</span><span class="lines">@@ -223,11 +215,7 @@
</span><span class="cx"> bool oldChecked = [cell state] == NSOnState;
</span><span class="cx"> if (oldIndeterminate != indeterminate || checked != oldChecked) {
</span><span class="cx"> NSCellStateValue newState = indeterminate ? NSMixedState : (checked ? NSOnState : NSOffState);
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> [(NSButtonCell*)cell _setState:newState animated:useAnimation];
</span><del>-#else
- [cell setState:newState];
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Window inactive state does not need to be checked explicitly, since we paint parented to
</span><span class="lines">@@ -419,17 +407,12 @@
</span><span class="cx">
</span><span class="cx"> LocalCurrentGraphicsContext localContext(context);
</span><span class="cx">
</span><del>- bool useUnparentedView = false;
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
- useUnparentedView = true;
-#endif
- NSView *view = ThemeMac::ensuredView(scrollView, controlStates, useUnparentedView);
</del><ins>+ NSView *view = ThemeMac::ensuredView(scrollView, controlStates, true /* useUnparentedView */);
</ins><span class="cx">
</span><span class="cx"> bool needsRepaint = false;
</span><span class="cx"> bool useImageBuffer = pageScaleFactor != 1.0f || zoomFactor != 1.0f;
</span><span class="cx"> bool isCellFocused = controlStates.states() & ControlStates::FocusState;
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> if ([toggleButtonCell _stateAnimationRunning]) {
</span><span class="cx"> context.translate(inflatedRect.x(), inflatedRect.y());
</span><span class="cx"> context.scale(FloatSize(1, -1));
</span><span class="lines">@@ -440,15 +423,10 @@
</span><span class="cx"> needsRepaint = ThemeMac::drawCellOrFocusRingWithViewIntoContext(toggleButtonCell.get(), context, inflatedRect, view, false, true, useImageBuffer, deviceScaleFactor);
</span><span class="cx"> } else
</span><span class="cx"> needsRepaint = ThemeMac::drawCellOrFocusRingWithViewIntoContext(toggleButtonCell.get(), context, inflatedRect, view, true, isCellFocused, useImageBuffer, deviceScaleFactor);
</span><del>-#else
- needsRepaint = ThemeMac::drawCellOrFocusRingWithViewIntoContext(toggleButtonCell.get(), context, inflatedRect, view, true, isCellFocused, useImageBuffer, deviceScaleFactor);
-#endif
</del><span class="cx">
</span><span class="cx"> [toggleButtonCell setControlView:nil];
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> needsRepaint |= [toggleButtonCell _stateAnimationRunning];
</span><del>-#endif
</del><span class="cx"> controlStates.setNeedsRepaint(needsRepaint);
</span><span class="cx"> if (needsRepaint)
</span><span class="cx"> controlStates.setPlatformControl(toggleButtonCell.get());
</span><span class="lines">@@ -561,12 +539,9 @@
</span><span class="cx">
</span><span class="cx"> bool useImageBuffer = pageScaleFactor != 1.0f || zoomFactor != 1.0f;
</span><span class="cx"> bool needsRepaint = ThemeMac::drawCellOrFocusRingWithViewIntoContext(buttonCell, context, inflatedRect, view, true, states & ControlStates::FocusState, useImageBuffer, deviceScaleFactor);
</span><del>- if (states & ControlStates::DefaultState) {
</del><ins>+ if (states & ControlStates::DefaultState)
</ins><span class="cx"> [window setDefaultButtonCell:buttonCell];
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101000
- wkAdvanceDefaultButtonPulseAnimation(buttonCell);
-#endif
- } else if ([previousDefaultButtonCell isEqual:buttonCell])
</del><ins>+ else if ([previousDefaultButtonCell isEqual:buttonCell])
</ins><span class="cx"> [window setDefaultButtonCell:nil];
</span><span class="cx">
</span><span class="cx"> controlStates.setNeedsRepaint(needsRepaint);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebCoreFullScreenPlaceholderViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebCoreFullScreenPlaceholderView.h (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebCoreFullScreenPlaceholderView.h 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebCore/platform/mac/WebCoreFullScreenPlaceholderView.h 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -31,12 +31,8 @@
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT @interface WebCoreFullScreenPlaceholderView : NSView {
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> RetainPtr<NSVisualEffectView> _effectView;
</span><span class="cx"> RetainPtr<NSTextField> _exitWarning;
</span><del>-#else
- RetainPtr<NSView> _exitWarning;
-#endif
</del><span class="cx"> NSObject* _target;
</span><span class="cx"> SEL _action;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebCoreFullScreenPlaceholderViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebCoreFullScreenPlaceholderView.mm (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebCoreFullScreenPlaceholderView.mm 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebCore/platform/mac/WebCoreFullScreenPlaceholderView.mm 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -45,7 +45,6 @@
</span><span class="cx"> if (!self)
</span><span class="cx"> return nil;
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> self.wantsLayer = YES;
</span><span class="cx"> self.autoresizesSubviews = YES;
</span><span class="cx"> self.layerContentsPlacement = NSViewLayerContentsPlacementScaleProportionallyToFit;
</span><span class="lines">@@ -76,19 +75,7 @@
</span><span class="cx"> warningFrame.origin = NSMakePoint((frameRect.size.width - warningFrame.size.width) / 2, frameRect.size.height / 2);
</span><span class="cx"> _exitWarning.get().frame = warningFrame;
</span><span class="cx"> [_effectView addSubview:_exitWarning.get()];
</span><del>-#else
- [self setLayer:[CALayer layer]];
- [self setLayerContentsRedrawPolicy:NSViewLayerContentsRedrawNever];
- [self setWantsLayer:YES];
</del><span class="cx">
</span><del>- _exitWarning = adoptNS([[WebCoreFullScreenWarningView alloc] initWithTitle:clickToExitFullScreenText()]);
- NSRect warningFrame = [_exitWarning.get() frame];
- warningFrame.origin = NSMakePoint((frameRect.size.width - warningFrame.size.width) / 2, (frameRect.size.height - warningFrame.size.height) / 2);
- [_exitWarning.get() setFrame:warningFrame];
- [_exitWarning.get() setHidden:YES];
- [self addSubview:_exitWarning.get()];
-#endif
-
</del><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -108,18 +95,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)setExitWarningVisible:(BOOL)visible
</span><span class="cx"> {
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> [_effectView setHidden:!visible];
</span><del>-#else
- [_exitWarning.get() setHidden:!visible];
- if (visible) {
- CAFilter* filter = [CAFilter filterWithType:@"colorMonochrome"];
- [filter setValue:[NSNumber numberWithFloat:-0.2] forKey:@"inputBias"];
- [filter setValue:[NSNumber numberWithFloat:1] forKey:@"inputAmount"];
- [[self layer] setFilters:[NSArray arrayWithObject:filter]];
- } else
- [[self layer] setFilters:nil];
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)mouseDown:(NSEvent *)theEvent
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfCookieJarCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> #include <windows.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(WIN) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090)
</del><ins>+#if PLATFORM(WIN)
</ins><span class="cx"> enum {
</span><span class="cx"> CFHTTPCookieStorageAcceptPolicyExclusivelyFromMainDocumentDomain = 3
</span><span class="cx"> };
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> {
</span><span class="cx"> bool secure = url.protocolIs("https");
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> return adoptCF(_CFHTTPCookieStorageCopyCookiesForURLWithMainDocumentURL(session.cookieStorage().get(), url.createCFURL().get(), firstParty.createCFURL().get(), secure));
</span><span class="cx"> #else
</span><span class="cx"> // _CFHTTPCookieStorageCopyCookiesForURLWithMainDocumentURL is not available on other platforms.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequest.h (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceRequest.h 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebCore/platform/network/cf/ResourceRequest.h 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -151,14 +151,8 @@
</span><span class="cx">
</span><span class="cx"> inline bool ResourceRequest::resourcePrioritiesEnabled()
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> return true;
</span><del>-#elif PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101000
- // See <rdar://problem/16518595>, <rdar://problem/17168793> for issues we had before OS X 10.10.
- // HTTP Pipelining could be enabled for experiments, but there is no point in doing so on old OS versions,
- // and that can't work well because of the above issues.
- ASSERT(!httpPipeliningEnabled());
- return false;
</del><span class="cx"> #elif PLATFORM(IOS)
</span><span class="cx"> return true;
</span><span class="cx"> #elif PLATFORM(WIN)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicfCFNetworkSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> #include <CFNetwork/CFURLRequest.h>
</span><span class="cx">
</span><span class="cx"> // FIXME: Remove the defined(__OBJC__)-guard onnce we fix <rdar://problem/19033610>.
</span><del>-#if defined(__OBJC__) && (PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000)
</del><ins>+#if defined(__OBJC__) && PLATFORM(COCOA)
</ins><span class="cx"> // FIXME: As a workaround for <rdar://problem/18337182>, we conditionally enclose the header
</span><span class="cx"> // in an extern "C" linkage block to make it suitable for C++ use.
</span><span class="cx"> #ifdef __cplusplus
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><del>-#endif // defined(__OBJC__) && (PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000)
</del><ins>+#endif // defined(__OBJC__) && PLATFORM(COCOA)
</ins><span class="cx">
</span><span class="cx"> #else // PLATFORM(WIN) || USE(APPLE_INTERNAL_SDK)
</span><span class="cx">
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> @end
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if defined(__OBJC__) && (!USE(APPLE_INTERNAL_SDK) || PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090)
</del><ins>+#if defined(__OBJC__) && !USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> enum : NSUInteger {
</span><span class="cx"> NSHTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain = 3,
</span><span class="cx"> };
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> EXTERN_C Boolean _CFNetworkSetATSContext(CFDataRef);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> EXTERN_C void _CFNetworkResetHSTSHostsSinceDate(CFURLStorageSessionRef, CFDateRef);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx"> @end
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !USE(APPLE_INTERNAL_SDK) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED == 1090)
</del><ins>+#if !USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> @interface NSHTTPCookieStorage ()
</span><span class="cx"> - (void)removeCookiesSinceDate:(NSDate *)date;
</span><span class="cx"> - (id)_initWithCFHTTPCookieStorage:(CFHTTPCookieStorageRef)cfStorage;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaCoreTextSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> CTFontRef CTFontCreateForCSS(CFStringRef name, uint16_t weight, CTFontSymbolicTraits, CGFloat size);
</span><span class="cx"> CTFontRef CTFontCreateForCharactersWithLanguage(CTFontRef currentFont, const UTF16Char *characters, CFIndex length, CFStringRef language, CFIndex *coveredLength);
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> extern const CFStringRef kCTUIFontTextStyleShortHeadline;
</span><span class="cx"> extern const CFStringRef kCTUIFontTextStyleShortBody;
</span><span class="cx"> extern const CFStringRef kCTUIFontTextStyleShortSubhead;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaNSButtonCellSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cocoa/NSButtonCellSPI.h (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/NSButtonCellSPI.h 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebCore/platform/spi/cocoa/NSButtonCellSPI.h 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -25,8 +25,6 @@
</span><span class="cx">
</span><span class="cx"> #import <AppKit/NSButtonCell.h>
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
-
</del><span class="cx"> #if USE(APPLE_INTERNAL_SDK)
</span><span class="cx">
</span><span class="cx"> #import <AppKit/NSButtonCell_Private.h>
</span><span class="lines">@@ -42,5 +40,3 @@
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#endif
-
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaNSColorSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cocoa/NSColorSPI.h (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/NSColorSPI.h 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebCore/platform/spi/cocoa/NSColorSPI.h 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -25,8 +25,6 @@
</span><span class="cx">
</span><span class="cx"> #import <AppKit/NSColor.h>
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
-
</del><span class="cx"> #if PLATFORM(MAC) && USE(APPLE_INTERNAL_SDK)
</span><span class="cx">
</span><span class="cx"> #import <AppKit/NSColor_Private.h>
</span><span class="lines">@@ -46,5 +44,3 @@
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaQuartzCoreSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -70,12 +70,10 @@
</span><span class="cx"> - (uint32_t)createImageSlot:(CGSize)size hasAlpha:(BOOL)flag;
</span><span class="cx"> - (void)deleteSlot:(uint32_t)name;
</span><span class="cx"> - (void)invalidate;
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> - (mach_port_t)createFencePort;
</span><span class="cx"> - (void)setFencePort:(mach_port_t)port;
</span><span class="cx"> - (void)setFencePort:(mach_port_t)port commitHandler:(void(^)(void))block;
</span><del>-#endif
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> @property BOOL colorMatchUntaggedContent;
</span><span class="cx"> #endif
</span><span class="cx"> @property (readonly) uint32_t contextId;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspimacLookupSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/mac/LookupSPI.h (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/mac/LookupSPI.h 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebCore/platform/spi/mac/LookupSPI.h 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -48,8 +48,6 @@
</span><span class="cx">
</span><span class="cx"> #endif // !USE(APPLE_INTERNAL_SDK)
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
-
</del><span class="cx"> @interface LULookupDefinitionModule ()
</span><span class="cx">
</span><span class="cx"> + (id<NSImmediateActionAnimationController>)lookupAnimationControllerForTerm:(NSAttributedString *)term atLocation:(NSPoint)screenPoint options:(NSDictionary *)options;
</span><span class="lines">@@ -58,8 +56,6 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-#endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
-
</del><span class="cx"> @interface LULookupDefinitionModule ()
</span><span class="cx">
</span><span class="cx"> + (void)showDefinitionForTerm:(NSAttributedString *)term relativeToRect:(NSRect)positioningRect ofView:(NSView *)positioningView options:(NSDictionary *)options;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspimacNSFontSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/mac/NSFontSPI.h (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/mac/NSFontSPI.h 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebCore/platform/spi/mac/NSFontSPI.h 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -38,7 +38,6 @@
</span><span class="cx"> + (NSFont *)systemFontOfSize:(CGFloat)size weight:(CGFloat)weight;
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> extern const CGFloat NSFontWeightUltraLight;
</span><span class="cx"> extern const CGFloat NSFontWeightThin;
</span><span class="cx"> extern const CGFloat NSFontWeightLight;
</span><span class="lines">@@ -48,7 +47,6 @@
</span><span class="cx"> extern const CGFloat NSFontWeightBold;
</span><span class="cx"> extern const CGFloat NSFontWeightHeavy;
</span><span class="cx"> extern const CGFloat NSFontWeightBlack;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspimacNSImmediateActionGestureRecognizerSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/mac/NSImmediateActionGestureRecognizerSPI.h (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/mac/NSImmediateActionGestureRecognizerSPI.h 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebCore/platform/spi/mac/NSImmediateActionGestureRecognizerSPI.h 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -25,8 +25,6 @@
</span><span class="cx"> #ifndef NSImmediateActionGestureRecognizerSPI_h
</span><span class="cx"> #define NSImmediateActionGestureRecognizerSPI_h
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
-
</del><span class="cx"> #import <AppKit/NSGestureRecognizer.h>
</span><span class="cx">
</span><span class="cx"> // FIXME: This header should include system headers when possible.
</span><span class="lines">@@ -61,6 +59,4 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-#endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
-
</del><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspimacNSPopoverSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/mac/NSPopoverSPI.h (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/mac/NSPopoverSPI.h 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebCore/platform/spi/mac/NSPopoverSPI.h 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -23,8 +23,6 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
-
</del><span class="cx"> #import "NSImmediateActionGestureRecognizerSPI.h"
</span><span class="cx">
</span><span class="cx"> // FIXME: This header should include system headers when possible.
</span><span class="lines">@@ -46,5 +44,3 @@
</span><span class="cx"> @interface NSPopover (WKDetails)
</span><span class="cx"> @property NSPopoverPositioningOptions positioningOptions;
</span><span class="cx"> @end
</span><del>-
-#endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformspimacNSSharingServicePickerSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/mac/NSSharingServicePickerSPI.h (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/mac/NSSharingServicePickerSPI.h 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebCore/platform/spi/mac/NSSharingServicePickerSPI.h 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -23,8 +23,6 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
-
</del><span class="cx"> #if USE(APPLE_INTERNAL_SDK)
</span><span class="cx">
</span><span class="cx"> #import <AppKit/NSSharingService_Private.h>
</span><span class="lines">@@ -47,5 +45,3 @@
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformspimacNSSharingServiceSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/mac/NSSharingServiceSPI.h (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/mac/NSSharingServiceSPI.h 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebCore/platform/spi/mac/NSSharingServiceSPI.h 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -23,8 +23,6 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
-
</del><span class="cx"> #if USE(APPLE_INTERNAL_SDK)
</span><span class="cx">
</span><span class="cx"> #import <AppKit/NSSharingService_Private.h>
</span><span class="lines">@@ -54,5 +52,3 @@
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformspimacTUCallSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/mac/TUCallSPI.h (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/mac/TUCallSPI.h 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebCore/platform/spi/mac/TUCallSPI.h 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -23,8 +23,6 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
-
</del><span class="cx"> #import "SoftLinking.h"
</span><span class="cx"> #import <objc/runtime.h>
</span><span class="cx">
</span><span class="lines">@@ -37,5 +35,3 @@
</span><span class="cx">
</span><span class="cx"> SOFT_LINK_PRIVATE_FRAMEWORK_OPTIONAL(TelephonyUtilities)
</span><span class="cx"> SOFT_LINK_CLASS(TelephonyUtilities, TUCall)
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformsqlSQLiteDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/sql/SQLiteDatabase.cpp (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/sql/SQLiteDatabase.cpp 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebCore/platform/sql/SQLiteDatabase.cpp 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> // std::call_once is used to stay on the safe side. See bug #143245.
</span><span class="cx"> int ret = sqlite3_initialize();
</span><span class="cx"> if (ret != SQLITE_OK) {
</span><del>-#if (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || (!defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && SQLITE_VERSION_NUMBER >= 3007015)
</del><ins>+#if PLATFORM(MAC) || SQLITE_VERSION_NUMBER >= 3007015
</ins><span class="cx"> WTFLogAlways("Failed to initialize SQLite: %s", sqlite3_errstr(ret));
</span><span class="cx"> #else
</span><span class="cx"> WTFLogAlways("Failed to initialize SQLite");
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderButtoncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderButton.cpp (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderButton.cpp 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebCore/rendering/RenderButton.cpp 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -41,7 +41,6 @@
</span><span class="cx"> : RenderFlexibleBox(element, WTF::move(style))
</span><span class="cx"> , m_buttonText(0)
</span><span class="cx"> , m_inner(0)
</span><del>- , m_default(false)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -111,18 +110,6 @@
</span><span class="cx">
</span><span class="cx"> if (m_inner) // RenderBlock handled updating the anonymous block's style.
</span><span class="cx"> setupInnerStyle(&m_inner->style());
</span><del>-
- if (!m_default && theme().isDefault(*this)) {
- if (theme().defaultButtonHasAnimation()) {
- if (!m_timer)
- m_timer = std::make_unique<Timer>(*this, &RenderButton::timerFired);
- m_timer->startRepeating(0.03);
- }
- m_default = true;
- } else if (m_default && !theme().isDefault(*this)) {
- m_default = false;
- m_timer = nullptr;
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderButton::setupInnerStyle(RenderStyle* innerStyle)
</span><span class="lines">@@ -186,18 +173,6 @@
</span><span class="cx"> return LayoutRect(additionalOffset.x() + borderLeft(), additionalOffset.y() + borderTop(), width() - borderLeft() - borderRight(), height() - borderTop() - borderBottom());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderButton::timerFired()
-{
- // FIXME Bug 25110: Ideally we would stop our timer when our Document
- // enters the page cache. But we currently have no way of being notified
- // when that happens, so we'll just ignore the timer firing as long as
- // we're in the cache.
- if (document().inPageCache())
- return;
-
- repaint();
-}
-
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> void RenderButton::layout()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderButtonh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderButton.h (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderButton.h 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebCore/rendering/RenderButton.h 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -74,15 +74,10 @@
</span><span class="cx">
</span><span class="cx"> virtual bool requiresForcedStyleRecalcPropagation() const override { return true; }
</span><span class="cx">
</span><del>- void timerFired();
-
</del><span class="cx"> bool isFlexibleBoxImpl() const override { return true; }
</span><span class="cx">
</span><span class="cx"> RenderTextFragment* m_buttonText;
</span><span class="cx"> RenderBlock* m_inner;
</span><del>-
- std::unique_ptr<Timer> m_timer;
- bool m_default;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTheme.h (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTheme.h 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebCore/rendering/RenderTheme.h 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -247,8 +247,6 @@
</span><span class="cx"> virtual IntSize imageControlsButtonPositionOffset() const { return IntSize(); }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- virtual bool defaultButtonHasAnimation() const { return false; }
-
</del><span class="cx"> #if ENABLE(ATTACHMENT_ELEMENT)
</span><span class="cx"> virtual LayoutSize attachmentIntrinsicSize(const RenderAttachment&) const { return LayoutSize(); }
</span><span class="cx"> virtual int attachmentBaseline(const RenderAttachment&) const { return -1; }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.h (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.h 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.h 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -100,8 +100,6 @@
</span><span class="cx"> // A view associated to the contained document.
</span><span class="cx"> NSView* documentViewFor(const RenderObject&) const;
</span><span class="cx">
</span><del>- virtual bool defaultButtonHasAnimation() const override;
-
</del><span class="cx"> protected:
</span><span class="cx"> RenderThemeMac();
</span><span class="cx"> virtual ~RenderThemeMac();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -175,11 +175,9 @@
</span><span class="cx"> @implementation WebCoreRenderThemeBundle
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> @interface NSSearchFieldCell()
</span><span class="cx"> @property (getter=isCenteredLook) BOOL centeredLook;
</span><span class="cx"> @end
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -469,12 +467,8 @@
</span><span class="cx"> color = convertNSColorToColor([NSColor keyboardFocusIndicatorColor]);
</span><span class="cx"> break;
</span><span class="cx"> case CSSValueActivebuttontext:
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> // There is no corresponding NSColor for this so we use a hard coded value.
</span><span class="cx"> color = Color::white;
</span><del>-#else
- color = convertNSColorToColor([NSColor controlTextColor]);
-#endif
</del><span class="cx"> break;
</span><span class="cx"> case CSSValueActivecaption:
</span><span class="cx"> color = convertNSColorToColor([NSColor windowFrameTextColor]);
</span><span class="lines">@@ -568,7 +562,6 @@
</span><span class="cx"> case CSSValueWindowtext:
</span><span class="cx"> color = convertNSColorToColor([NSColor windowFrameTextColor]);
</span><span class="cx"> break;
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> case CSSValueAppleWirelessPlaybackTargetActive:
</span><span class="cx"> color = convertNSColorToColor([NSColor systemBlueColor]);
</span><span class="cx"> break;
</span><span class="lines">@@ -599,7 +592,6 @@
</span><span class="cx"> case CSSValueAppleSystemYellow:
</span><span class="cx"> color = convertNSColorToColor([NSColor systemYellowColor]);
</span><span class="cx"> break;
</span><del>-#endif
</del><span class="cx"> default:
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -933,11 +925,6 @@
</span><span class="cx">
</span><span class="cx"> GraphicsContextStateSaver stateSaver(paintInfo.context());
</span><span class="cx">
</span><del>- // Before Yosemite we did not want the cell to ever draw outside the given rectangle.
-#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101000
- paintInfo.context().clip(inflatedRect);
-#endif
-
</del><span class="cx"> if (zoomLevel != 1.0f) {
</span><span class="cx"> inflatedRect.setWidth(inflatedRect.width() / zoomLevel);
</span><span class="cx"> inflatedRect.setHeight(inflatedRect.height() / zoomLevel);
</span><span class="lines">@@ -1971,9 +1958,7 @@
</span><span class="cx"> [m_search.get() setBezeled:YES];
</span><span class="cx"> [m_search.get() setEditable:YES];
</span><span class="cx"> [m_search.get() setFocusRingType:NSFocusRingTypeExterior];
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> [m_search.get() setCenteredLook:NO];
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return m_search.get();
</span><span class="lines">@@ -2043,15 +2028,6 @@
</span><span class="cx"> return StringTruncator::centerTruncate(strToTruncate, width, font, StringTruncator::EnableRoundingHacks);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeMac::defaultButtonHasAnimation() const
-{
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
- return false;
-#else
- return true;
-#endif
-}
-
</del><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><span class="cx"> NSServicesRolloverButtonCell* RenderThemeMac::servicesRolloverButtonCell() const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-12-19 Dan Bernstein <mitz@apple.com>
+
+ [Mac] WebKit contains dead source code for OS X Mavericks and earlier
+ https://bugs.webkit.org/show_bug.cgi?id=152462
+
+ Reviewed by Alexey Proskuryakov.
+
+ - Removed build setting definitions for OS X 10.9 and earlier, and simplified defintions
+ that became uniform across all OS X versions as a result:
+
+ * Configurations/Base.xcconfig:
+ * Configurations/DebugRelease.xcconfig:
+ * Configurations/Version.xcconfig:
+
+ * Scripts/copy-user-interface-resources.pl: Removed code to delete Images/Legacy.
+
+ * UserInterface/Images/Legacy: Removed this empty directory.
+
</ins><span class="cx"> 2015-12-18 Matt Baker <mattbaker@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Make it possible to debug injected scripts when the Debug UI is enabled
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Configurations/Base.xcconfig (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Configurations/Base.xcconfig 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebInspectorUI/Configurations/Base.xcconfig 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -63,14 +63,6 @@
</span><span class="cx">
</span><span class="cx"> OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH = -Wl,-dyld_env -Wl,DYLD_VERSIONED_FRAMEWORK_PATH=/System/Library/StagedFrameworks/Safari;
</span><span class="cx">
</span><del>-TOOLCHAINS[sdk=macosx*] = $(TOOLCHAINS_macosx);
-TOOLCHAINS_macosx = $(TOOLCHAINS_macosx_$(MAC_OS_X_VERSION_MAJOR));
-TOOLCHAINS_macosx_1080 = default;
-TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
-TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
-TOOLCHAINS_macosx_101100 = $(TOOLCHAINS_macosx_101000);
-TOOLCHAINS_macosx_101200 = $(TOOLCHAINS_macosx_101100);
-
</del><span class="cx"> OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
</span><span class="cx"> OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
</span><span class="cx"> OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIConfigurationsDebugReleasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -5,8 +5,6 @@
</span><span class="cx"> ONLY_ACTIVE_ARCH = YES;
</span><span class="cx">
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><del>-MACOSX_DEPLOYMENT_TARGET_macosx_1080 = 10.8;
-MACOSX_DEPLOYMENT_TARGET_macosx_1090 = 10.9;
</del><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIConfigurationsVersionxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Configurations/Version.xcconfig (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Configurations/Version.xcconfig 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebInspectorUI/Configurations/Version.xcconfig 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -8,8 +8,6 @@
</span><span class="cx"> // The system version prefix is based on the current system version.
</span><span class="cx"> SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
</span><span class="cx"> SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><del>-SYSTEM_VERSION_PREFIX_macosx_1080 = 8;
-SYSTEM_VERSION_PREFIX_macosx_1090 = 9;
</del><span class="cx"> SYSTEM_VERSION_PREFIX_macosx_101000 = 10;
</span><span class="cx"> SYSTEM_VERSION_PREFIX_macosx_101100 = 11;
</span><span class="cx"> SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIScriptscopyuserinterfaceresourcespl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -227,9 +227,6 @@
</span><span class="cx">
</span><span class="cx"> ditto(File::Spec->catdir($uiRoot, 'Images'), File::Spec->catdir($targetResourcePath, 'Images'));
</span><span class="cx">
</span><del>- # Remove Images/Legacy on modern systems (OS X 10.10 Yosemite and greater or Windows).
- remove_tree(File::Spec->catdir($targetResourcePath, 'Images', 'Legacy')) if (defined $ENV{'MAC_OS_X_VERSION_MAJOR'} && $ENV{'MAC_OS_X_VERSION_MAJOR'} ge 101000) or defined $ENV{'OFFICIAL_BUILD'};
-
</del><span class="cx"> # Remove Images/gtk on Mac and Windows builds.
</span><span class="cx"> remove_tree(File::Spec->catdir($targetResourcePath, 'Images', 'gtk')) if defined $ENV{'MAC_OS_X_VERSION_MAJOR'} or defined $ENV{'OFFICIAL_BUILD'};
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2015-12-19 Dan Bernstein <mitz@apple.com>
+
+ [Mac] WebKit contains dead source code for OS X Mavericks and earlier
+ https://bugs.webkit.org/show_bug.cgi?id=152462
+
+ Reviewed by Alexey Proskuryakov.
+
+ - Removed build setting definitions for OS X 10.9 and earlier, and simplified defintions
+ that became uniform across all OS X versions as a result:
+
+ * Configurations/DebugRelease.xcconfig:
+ * Configurations/FeatureDefines.xcconfig:
+ * Configurations/Version.xcconfig:
+ * Configurations/WebKitLegacy.xcconfig:
+
+ - Simplified expressions involving __MAC_OS_X_VERSION_MIN_REQUIRED and removed code that was
+ never getting compiled:
+
+ * WebCoreSupport/WebInspectorClient.mm:
+ * WebView/WebDynamicScrollBarsView.mm:
+ * WebView/WebHTMLView.mm:
+ * WebView/WebImmediateActionController.h:
+ * WebView/WebImmediateActionController.mm:
+ * WebView/WebView.mm:
+ * WebView/WebViewData.h:
+ * WebView/WebViewData.mm:
+ * WebView/WebViewInternal.h:
+
</ins><span class="cx"> 2015-12-17 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Data detector yellow highlight location is vertically mirrored in WebKit1
</span></span></pre></div>
<a id="trunkSourceWebKitmacConfigurationsDebugReleasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Configurations/DebugRelease.xcconfig (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Configurations/DebugRelease.xcconfig 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit/mac/Configurations/DebugRelease.xcconfig 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx"> ONLY_ACTIVE_ARCH = YES;
</span><span class="cx">
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><del>-MACOSX_DEPLOYMENT_TARGET_macosx_1090 = 10.9;
</del><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
</span><span class="lines">@@ -39,7 +38,6 @@
</span><span class="cx"> WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphoneos*] = WebKitSystemInterfaceIOSDevice$(IPHONEOS_DEPLOYMENT_TARGET);
</span><span class="cx"> WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphonesimulator*] = WebKitSystemInterfaceIOSSimulator$(IPHONEOS_DEPLOYMENT_TARGET);
</span><span class="cx"> WEBKIT_SYSTEM_INTERFACE_LIBRARY = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><del>-WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1090 = WebKitSystemInterfaceMavericks;
</del><span class="cx"> WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000 = WebKitSystemInterfaceYosemite;
</span><span class="cx"> WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101100 = WebKitSystemInterfaceElCapitan;
</span><span class="cx"> WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101200 = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101100);
</span></span></pre></div>
<a id="trunkSourceWebKitmacConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -35,12 +35,7 @@
</span><span class="cx"> ENABLE_ACCELERATED_2D_CANVAS = ;
</span><span class="cx"> ENABLE_ACCELERATED_OVERFLOW_SCROLLING[sdk=iphone*] = ENABLE_ACCELERATED_OVERFLOW_SCROLLING;
</span><span class="cx"> ENABLE_ATTACHMENT_ELEMENT = ENABLE_ATTACHMENT_ELEMENT;
</span><del>-ENABLE_AVF_CAPTIONS[sdk=iphone*] = ENABLE_AVF_CAPTIONS;
-ENABLE_AVF_CAPTIONS[sdk=macosx*] = $(ENABLE_AVF_CAPTIONS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_AVF_CAPTIONS_macosx_1090 = ;
-ENABLE_AVF_CAPTIONS_macosx_101000 = ENABLE_AVF_CAPTIONS;
-ENABLE_AVF_CAPTIONS_macosx_101100 = ENABLE_AVF_CAPTIONS;
-ENABLE_AVF_CAPTIONS_macosx_101200 = ENABLE_AVF_CAPTIONS;
</del><ins>+ENABLE_AVF_CAPTIONS = ENABLE_AVF_CAPTIONS;
</ins><span class="cx"> ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
</span><span class="cx"> ENABLE_CANVAS_PATH = ENABLE_CANVAS_PATH;
</span><span class="cx"> ENABLE_CANVAS_PROXY = ;
</span><span class="lines">@@ -76,12 +71,7 @@
</span><span class="cx"> ENABLE_ENCRYPTED_MEDIA[sdk=macosx*] = ENABLE_ENCRYPTED_MEDIA;
</span><span class="cx"> ENABLE_ENCRYPTED_MEDIA_V2[sdk=macosx*] = ENABLE_ENCRYPTED_MEDIA_V2;
</span><span class="cx"> ENABLE_FETCH_API = ENABLE_FETCH_API;
</span><del>-ENABLE_FILTERS_LEVEL_2[sdk=iphone*] = ENABLE_FILTERS_LEVEL_2;
-ENABLE_FILTERS_LEVEL_2[sdk=macosx*] = $(ENABLE_FILTERS_LEVEL_2_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_FILTERS_LEVEL_2_macosx_1090 = ;
-ENABLE_FILTERS_LEVEL_2_macosx_101000 = ENABLE_FILTERS_LEVEL_2;
-ENABLE_FILTERS_LEVEL_2_macosx_101100 = ENABLE_FILTERS_LEVEL_2;
-ENABLE_FILTERS_LEVEL_2_macosx_101200 = ENABLE_FILTERS_LEVEL_2;
</del><ins>+ENABLE_FILTERS_LEVEL_2 = ENABLE_FILTERS_LEVEL_2;
</ins><span class="cx"> ENABLE_FONT_LOAD_EVENTS = ;
</span><span class="cx"> ENABLE_FULLSCREEN_API[sdk=macosx*] = ENABLE_FULLSCREEN_API;
</span><span class="cx"> ENABLE_GAMEPAD[sdk=macosx*] = ENABLE_GAMEPAD;
</span><span class="lines">@@ -89,11 +79,7 @@
</span><span class="cx"> ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
</span><span class="cx"> ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING[sdk=macosx*] = ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING;
</span><span class="cx"> ENABLE_ICONDATABASE[sdk=macosx*] = ENABLE_ICONDATABASE;
</span><del>-ENABLE_SERVICE_CONTROLS[sdk=macosx*] = $(ENABLE_SERVICE_CONTROLS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_SERVICE_CONTROLS_macosx_1090 = ;
-ENABLE_SERVICE_CONTROLS_macosx_101000 = ENABLE_SERVICE_CONTROLS;
-ENABLE_SERVICE_CONTROLS_macosx_101100 = ENABLE_SERVICE_CONTROLS;
-ENABLE_SERVICE_CONTROLS_macosx_101200 = ENABLE_SERVICE_CONTROLS;
</del><ins>+ENABLE_SERVICE_CONTROLS[sdk=macosx*] = ENABLE_SERVICE_CONTROLS;
</ins><span class="cx"> ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
</span><span class="cx"> ENABLE_INDEXED_DATABASE_IN_WORKERS = ;
</span><span class="cx"> ENABLE_INDIE_UI = ENABLE_INDIE_UI;
</span><span class="lines">@@ -106,16 +92,10 @@
</span><span class="cx"> ENABLE_INPUT_TYPE_TIME[sdk=iphone*] = ENABLE_INPUT_TYPE_TIME;
</span><span class="cx"> ENABLE_INPUT_TYPE_WEEK[sdk=iphone*] = ENABLE_INPUT_TYPE_WEEK;
</span><span class="cx">
</span><del>-ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS[sdk=iphone*] = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
-ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS[sdk=macosx*] = $(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR))
-ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_1090 = ;
-ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_101000 = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
-ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_101100 = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
-ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_101200 = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
</del><ins>+ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
</ins><span class="cx">
</span><span class="cx"> ENABLE_WIRELESS_PLAYBACK_TARGET[sdk=iphone*] = ENABLE_WIRELESS_PLAYBACK_TARGET;
</span><span class="cx"> ENABLE_WIRELESS_PLAYBACK_TARGET[sdk=macosx*] = $(ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR))
</span><del>-ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_1090 = ;
</del><span class="cx"> ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_101000 = ;
</span><span class="cx"> ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_101100 = ENABLE_WIRELESS_PLAYBACK_TARGET;
</span><span class="cx"> ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_101200 = ENABLE_WIRELESS_PLAYBACK_TARGET;
</span><span class="lines">@@ -128,7 +108,6 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_MAC_GESTURE_EVENTS = ;
</span><span class="cx"> ENABLE_MAC_GESTURE_EVENTS[sdk=macosx*] = $(ENABLE_MAC_GESTURE_EVENTS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
</span><del>-ENABLE_MAC_GESTURE_EVENTS_macosx_1090_WITH_INTERNAL_SDK_YES = ;
</del><span class="cx"> ENABLE_MAC_GESTURE_EVENTS_macosx_101000_WITH_INTERNAL_SDK_YES = ;
</span><span class="cx"> ENABLE_MAC_GESTURE_EVENTS_macosx_101100_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
</span><span class="cx"> ENABLE_MAC_GESTURE_EVENTS_macosx_101200_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
</span><span class="lines">@@ -148,11 +127,7 @@
</span><span class="cx"> ENABLE_MEDIA_CONTROLS_SCRIPT = ENABLE_MEDIA_CONTROLS_SCRIPT;
</span><span class="cx"> ENABLE_MEDIA_SESSION = ;
</span><span class="cx">
</span><del>-ENABLE_MEDIA_SOURCE[sdk=macosx*] = $(ENABLE_MEDIA_SOURCE_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_MEDIA_SOURCE_macosx_1090 = ;
-ENABLE_MEDIA_SOURCE_macosx_101000 = ENABLE_MEDIA_SOURCE;
-ENABLE_MEDIA_SOURCE_macosx_101100 = ENABLE_MEDIA_SOURCE;
-ENABLE_MEDIA_SOURCE_macosx_101200 = ENABLE_MEDIA_SOURCE;
</del><ins>+ENABLE_MEDIA_SOURCE[sdk=macosx*] = ENABLE_MEDIA_SOURCE;
</ins><span class="cx">
</span><span class="cx"> ENABLE_MEDIA_STATISTICS = ;
</span><span class="cx"> ENABLE_MEDIA_STREAM = ENABLE_MEDIA_STREAM;
</span><span class="lines">@@ -170,12 +145,7 @@
</span><span class="cx"> ENABLE_QUOTA = ;
</span><span class="cx"> ENABLE_REQUEST_ANIMATION_FRAME = ENABLE_REQUEST_ANIMATION_FRAME;
</span><span class="cx"> ENABLE_REQUEST_AUTOCOMPLETE = ;
</span><del>-ENABLE_REMOTE_INSPECTOR[sdk=iphone*] = ENABLE_REMOTE_INSPECTOR;
-ENABLE_REMOTE_INSPECTOR[sdk=macosx*] = $(ENABLE_REMOTE_INSPECTOR_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_REMOTE_INSPECTOR_macosx_1090 = ;
-ENABLE_REMOTE_INSPECTOR_macosx_101000 = ENABLE_REMOTE_INSPECTOR;
-ENABLE_REMOTE_INSPECTOR_macosx_101100 = ENABLE_REMOTE_INSPECTOR;
-ENABLE_REMOTE_INSPECTOR_macosx_101200 = ENABLE_REMOTE_INSPECTOR;
</del><ins>+ENABLE_REMOTE_INSPECTOR = ENABLE_REMOTE_INSPECTOR;
</ins><span class="cx"> ENABLE_RESOLUTION_MEDIA_QUERY = ;
</span><span class="cx"> ENABLE_RUBBER_BANDING[sdk=macosx*] = ENABLE_RUBBER_BANDING;
</span><span class="cx"> ENABLE_CSS_SCROLL_SNAP = ENABLE_CSS_SCROLL_SNAP;
</span><span class="lines">@@ -185,12 +155,7 @@
</span><span class="cx"> ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
</span><span class="cx"> ENABLE_SVG_OTF_CONVERTER = ENABLE_SVG_OTF_CONVERTER;
</span><span class="cx">
</span><del>-ENABLE_TELEPHONE_NUMBER_DETECTION[sdk=iphone*] = ENABLE_TELEPHONE_NUMBER_DETECTION;
-ENABLE_TELEPHONE_NUMBER_DETECTION[sdk=macosx*] = $(ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_1090 = ;
-ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_101000 = ENABLE_TELEPHONE_NUMBER_DETECTION;
-ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_101100 = ENABLE_TELEPHONE_NUMBER_DETECTION;
-ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_101200 = ENABLE_TELEPHONE_NUMBER_DETECTION;
</del><ins>+ENABLE_TELEPHONE_NUMBER_DETECTION = ENABLE_TELEPHONE_NUMBER_DETECTION;
</ins><span class="cx">
</span><span class="cx"> ENABLE_TEMPLATE_ELEMENT = ENABLE_TEMPLATE_ELEMENT;
</span><span class="cx"> ENABLE_TEXT_AUTOSIZING = ;
</span><span class="lines">@@ -219,12 +184,7 @@
</span><span class="cx"> ENABLE_WEB_REPLAY_macosx_Release = ENABLE_WEB_REPLAY;
</span><span class="cx"> ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
</span><span class="cx">
</span><del>-ENABLE_WEB_TIMING[sdk=iphone*] = ENABLE_WEB_TIMING;
-ENABLE_WEB_TIMING[sdk=macosx*] = $(ENABLE_WEB_TIMING_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_WEB_TIMING_macosx_1090 = ;
-ENABLE_WEB_TIMING_macosx_101000 = ENABLE_WEB_TIMING;
-ENABLE_WEB_TIMING_macosx_101100 = ENABLE_WEB_TIMING;
-ENABLE_WEB_TIMING_macosx_101200 = ENABLE_WEB_TIMING;
</del><ins>+ENABLE_WEB_TIMING = ENABLE_WEB_TIMING;
</ins><span class="cx">
</span><span class="cx"> ENABLE_XSLT = ENABLE_XSLT;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacConfigurationsVersionxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Configurations/Version.xcconfig (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Configurations/Version.xcconfig 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit/mac/Configurations/Version.xcconfig 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -35,7 +35,6 @@
</span><span class="cx"> // The system version prefix is based on the current system version.
</span><span class="cx"> SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
</span><span class="cx"> SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><del>-SYSTEM_VERSION_PREFIX_macosx_1090 = 9;
</del><span class="cx"> SYSTEM_VERSION_PREFIX_macosx_101000 = 10;
</span><span class="cx"> SYSTEM_VERSION_PREFIX_macosx_101100 = 11;
</span><span class="cx"> SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
</span></span></pre></div>
<a id="trunkSourceWebKitmacConfigurationsWebKitLegacyxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -49,9 +49,6 @@
</span><span class="cx"> OTHER_CFLAGS[sdk=macosx*] = $(OTHER_CFLAGS) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
</span><span class="cx"> OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
</span><span class="cx">
</span><del>-WEBKIT_LEGACY_SYSTEM_FRAMEWORK_MISSING = $(WEBKIT_LEGACY_SYSTEM_FRAMEWORK_MISSING_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WEBKIT_LEGACY_SYSTEM_FRAMEWORK_MISSING_1090 = YES;
-
</del><span class="cx"> GCC_PREFIX_HEADER = mac/WebKitPrefix.h;
</span><span class="cx"> GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) FRAMEWORK_NAME=WebKitLegacy $(inherited);
</span><span class="cx"> HEADER_SEARCH_PATHS = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH) $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders $(WEBCORE_PRIVATE_HEADERS_DIR)/icu "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy" "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(HEADER_SEARCH_PATHS);
</span><span class="lines">@@ -60,9 +57,7 @@
</span><span class="cx"> INSTALL_PATH[sdk=macosx*] = $(WEBKIT_LEGACY_FRAMEWORKS_DIR);
</span><span class="cx">
</span><span class="cx"> DYLIB_INSTALL_NAME_BASE[sdk=iphone*] = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
</span><del>-DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_$(PLATFORM_NAME)_WEBKIT_LEGACY_SYSTEM_FRAMEWORK_MISSING_$(WEBKIT_LEGACY_SYSTEM_FRAMEWORK_MISSING));
-DYLIB_INSTALL_NAME_BASE_macosx_WEBKIT_LEGACY_SYSTEM_FRAMEWORK_MISSING_ = $(NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR);
-DYLIB_INSTALL_NAME_BASE_macosx_WEBKIT_LEGACY_SYSTEM_FRAMEWORK_MISSING_YES = $(WEBKIT_LEGACY_FRAMEWORKS_DIR);
</del><ins>+DYLIB_INSTALL_NAME_BASE = $(NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR);
</ins><span class="cx">
</span><span class="cx"> INSTALLHDRS_COPY_PHASE = YES;
</span><span class="cx"> INSTALLHDRS_SCRIPT_PHASE = YES;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebInspectorClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -274,9 +274,6 @@
</span><span class="cx">
</span><span class="cx"> void WebInspectorFrontendClient::setToolbarHeight(unsigned height)
</span><span class="cx"> {
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090
- [[m_frontendWindowController window] setContentBorderThickness:height forEdge:NSMaxYEdge];
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspectorFrontendClient::inspectedURLChanged(const String& newURL)
</span><span class="lines">@@ -398,10 +395,6 @@
</span><span class="cx"> [_frontendWebView setUIDelegate:self];
</span><span class="cx"> [_frontendWebView setPolicyDelegate:self];
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090
- [_frontendWebView setDrawsBackground:NO];
-#endif
-
</del><span class="cx"> [preferences release];
</span><span class="cx">
</span><span class="cx"> [self setWindowFrameAutosaveName:@"Web Inspector 2"];
</span><span class="lines">@@ -468,12 +461,7 @@
</span><span class="cx"> if (window)
</span><span class="cx"> return window;
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> NSUInteger styleMask = NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask | NSFullSizeContentViewWindowMask;
</span><del>-#else
- NSUInteger styleMask = NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask | NSTexturedBackgroundWindowMask;
-#endif
-
</del><span class="cx"> window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, initialWindowWidth, initialWindowHeight) styleMask:styleMask backing:NSBackingStoreBuffered defer:NO];
</span><span class="cx"> [window setDelegate:self];
</span><span class="cx"> [window setMinSize:NSMakeSize(minimumWindowWidth, minimumWindowHeight)];
</span><span class="lines">@@ -486,12 +474,7 @@
</span><span class="cx"> [window setCollectionBehavior:([window collectionBehavior] | NSWindowCollectionBehaviorFullScreenAllowsTiling)];
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> window.titlebarAppearsTransparent = YES;
</span><del>-#else
- [window setAutorecalculatesContentBorderThickness:NO forEdge:NSMaxYEdge];
- [window setContentBorderThickness:55. forEdge:NSMaxYEdge];
-#endif
</del><span class="cx">
</span><span class="cx"> [self setWindow:window];
</span><span class="cx"> [window release];
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebDynamicScrollBarsViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebDynamicScrollBarsView.mm (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebDynamicScrollBarsView.mm 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit/mac/WebView/WebDynamicScrollBarsView.mm 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -618,12 +618,10 @@
</span><span class="cx"> return _private->inProgrammaticScroll;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> - (void)setContentInsets:(NSEdgeInsets)edgeInsets
</span><span class="cx"> {
</span><span class="cx"> [super setContentInsets:edgeInsets];
</span><span class="cx"> [self tile];
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -4353,7 +4353,7 @@
</span><span class="cx"> frame->eventHandler().wheelEvent(event);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> [[[self _webView] _immediateActionController] webView:[self _webView] didHandleScrollWheel:event];
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebImmediateActionControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebImmediateActionController.h (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebImmediateActionController.h 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit/mac/WebView/WebImmediateActionController.h 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> #import "WebUIDelegatePrivate.h"
</span><span class="cx"> #import <WebCore/HitTestResult.h>
</span><span class="lines">@@ -57,4 +57,4 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-#endif // PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><ins>+#endif // PLATFORM(MAC)
</ins></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebImmediateActionControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx">
</span><span class="cx"> #import "WebImmediateActionController.h"
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> #import "DOMElementInternal.h"
</span><span class="cx"> #import "DOMNodeInternal.h"
</span><span class="lines">@@ -554,4 +554,4 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-#endif // PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><ins>+#endif // PLATFORM(MAC)
</ins></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -902,7 +902,7 @@
</span><span class="cx"> [self addSubview:frameView];
</span><span class="cx"> [frameView release];
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> if (Class gestureClass = NSClassFromString(@"NSImmediateActionGestureRecognizer")) {
</span><span class="cx"> RetainPtr<NSImmediateActionGestureRecognizer> recognizer = adoptNS([(NSImmediateActionGestureRecognizer *)[gestureClass alloc] init]);
</span><span class="cx"> _private->immediateActionController = [[WebImmediateActionController alloc] initWithWebView:self recognizer:recognizer.get()];
</span><span class="lines">@@ -1760,7 +1760,7 @@
</span><span class="cx">
</span><span class="cx"> [_private->inspector inspectedWebViewClosed];
</span><span class="cx"> #endif
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> [_private->immediateActionController webViewClosed];
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -2346,7 +2346,7 @@
</span><span class="cx"> settings.setHttpEquivEnabled([preferences httpEquivEnabled]);
</span><span class="cx">
</span><span class="cx"> settings.setFixedPositionCreatesStackingContext(true);
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> settings.setAcceleratedCompositingForFixedPositionEnabled(true);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -5293,7 +5293,7 @@
</span><span class="cx"> _private->page->setDeviceScaleFactor([self _deviceScaleFactor]);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> if (_private->immediateActionController) {
</span><span class="cx"> NSImmediateActionGestureRecognizer *recognizer = [_private->immediateActionController immediateActionRecognizer];
</span><span class="cx"> if ([self window]) {
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebViewData.h (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebViewData.h 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit/mac/WebView/WebViewData.h 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -172,11 +172,9 @@
</span><span class="cx"> WebNodeHighlight *currentNodeHighlight;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> WebImmediateActionController *immediateActionController;
</span><del>-#endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx">
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200 && USE(APPLE_INTERNAL_SDK)
</del><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200 && USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> #import <WebKitAdditions/WebViewDataAdditions.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewDatamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebViewData.mm (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebViewData.mm 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit/mac/WebView/WebViewData.mm 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> [inspector release];
</span><span class="cx"> [currentNodeHighlight release];
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> [immediateActionController release];
</span><span class="cx"> #endif
</span><span class="cx"> [hostWindow release];
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebViewInternal.h (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebViewInternal.h 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit/mac/WebView/WebViewInternal.h 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -271,10 +271,8 @@
</span><span class="cx"> - (void)_clearTextIndicatorWithAnimation:(WebCore::TextIndicatorWindowDismissalAnimation)animation;
</span><span class="cx"> - (void)_setTextIndicatorAnimationProgress:(float)progress;
</span><span class="cx"> - (void)_showDictionaryLookupPopup:(const WebCore::DictionaryPopupInfo&)dictionaryPopupInfo;
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> - (id)_animationControllerForDictionaryLookupPopupInfo:(const WebCore::DictionaryPopupInfo&)dictionaryPopupInfo;
</span><span class="cx"> - (WebImmediateActionController *)_immediateActionController;
</span><del>-#endif
</del><span class="cx"> - (NSEvent *)_pressureEvent;
</span><span class="cx"> - (void)_setPressureEvent:(NSEvent *)event;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit2/ChangeLog 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -1,3 +1,67 @@
</span><ins>+2015-12-19 Dan Bernstein <mitz@apple.com>
+
+ [Mac] WebKit contains dead source code for OS X Mavericks and earlier
+ https://bugs.webkit.org/show_bug.cgi?id=152462
+
+ Reviewed by Alexey Proskuryakov.
+
+ - Removed build setting definitions for OS X 10.9 and earlier, and simplified defintions
+ that became uniform across all OS X versions as a result:
+
+ * Configurations/BaseTarget.xcconfig:
+ * Configurations/BaseXPCService.xcconfig:
+ * Configurations/DebugRelease.xcconfig:
+ * Configurations/FeatureDefines.xcconfig:
+ * Configurations/Version.xcconfig:
+ * Configurations/WebKit.xcconfig:
+
+ - Removed the definition of BUNDLE_LOCALIZATION_KEY:
+
+ * Configurations/WebContentService.Development.xcconfig:
+ * Configurations/WebContentService.xcconfig:
+
+ - Added CFBundleFollowParentLocalization set to true:
+
+ * WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info-OSX.plist:
+ * WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info-iOS.plist:
+ * WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist:
+ * WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist:
+ * WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist:
+
+ * WebKit2.xcodeproj/project.pbxproj: Removed the “Add CFBundle Localization Info.plist Key”
+ script build phases from the Web Content Service targets.
+
+ - Simplified expressions involving __MAC_OS_X_VERSION_MIN_REQUIRED and removed code that was
+ never getting compiled:
+
+ * DatabaseProcess/mac/com.apple.WebKit.Databases.sb.in:
+ * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+ * NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in:
+ * Platform/IPC/mac/ConnectionMac.mm:
+ * Platform/IPC/mac/ImportanceAssertion.h:
+ * Platform/mac/MenuUtilities.h:
+ * Platform/mac/MenuUtilities.mm:
+ * Platform/mac/StringUtilities.h:
+ * Platform/mac/StringUtilities.mm:
+ * Shared/API/Cocoa/WKFoundation.h:
+ * Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm:
+ * UIProcess/API/Cocoa/WKViewPrivate.h:
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+ * UIProcess/API/mac/WKView.mm:
+ * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+ * UIProcess/Cocoa/WebViewImpl.h:
+ * UIProcess/Cocoa/WebViewImpl.mm:
+ * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
+ * UIProcess/mac/PageClientImpl.mm:
+ * UIProcess/mac/WKImmediateActionController.h:
+ * UIProcess/mac/WKImmediateActionController.mm:
+ * UIProcess/mac/WebInspectorProxyMac.mm:
+ * WebProcess/WebPage/FindController.cpp:
+ * WebProcess/WebPage/WebPage.cpp:
+ * WebProcess/com.apple.WebProcess.sb.in:
+ * config.h:
+
</ins><span class="cx"> 2015-12-18 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Cache redirects as separate entries
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsBaseTargetxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -65,7 +65,6 @@
</span><span class="cx"> WK_MANUAL_SANDBOXING_DEFINES_YES = ENABLE_MANUAL_SANDBOXING;
</span><span class="cx">
</span><span class="cx"> WK_DONT_LINK_SHIM = $(WK_DONT_LINK_SHIM_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><del>-WK_DONT_LINK_SHIM_1090 = YES;
</del><span class="cx"> WK_DONT_LINK_SHIM_101000 = YES;
</span><span class="cx">
</span><span class="cx"> WK_LINK_SHIM[sdk=macosx*] = $(WK_LINK_SHIM_$(WK_DONT_LINK_SHIM));
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsBaseXPCServicexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/BaseXPCService.xcconfig (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/BaseXPCService.xcconfig 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit2/Configurations/BaseXPCService.xcconfig 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -56,5 +56,4 @@
</span><span class="cx"> CODE_SIGN_ENTITLEMENTS_IOS_MANUAL_SANDBOXING_YES = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2/$(WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE)-no-sandbox.entitlements;
</span><span class="cx">
</span><span class="cx"> WK_XPC_SERVICE_INFOPLIST_SUFFIX[sdk=macosx*] = $(WK_XPC_SERVICE_INFOPLIST_SUFFIX_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><del>-WK_XPC_SERVICE_INFOPLIST_SUFFIX_1090 = -10.9-10.10;
</del><span class="cx"> WK_XPC_SERVICE_INFOPLIST_SUFFIX_101000 = -10.9-10.10;
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsDebugReleasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/DebugRelease.xcconfig (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/DebugRelease.xcconfig 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit2/Configurations/DebugRelease.xcconfig 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx"> ONLY_ACTIVE_ARCH = YES;
</span><span class="cx">
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><del>-MACOSX_DEPLOYMENT_TARGET_macosx_1090 = 10.9;
</del><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
</span><span class="lines">@@ -39,7 +38,6 @@
</span><span class="cx"> WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphoneos*] = WebKitSystemInterfaceIOSDevice$(IPHONEOS_DEPLOYMENT_TARGET);
</span><span class="cx"> WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphonesimulator*] = WebKitSystemInterfaceIOSSimulator$(IPHONEOS_DEPLOYMENT_TARGET);
</span><span class="cx"> WEBKIT_SYSTEM_INTERFACE_LIBRARY = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><del>-WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1090 = WebKitSystemInterfaceMavericks;
</del><span class="cx"> WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000 = WebKitSystemInterfaceYosemite;
</span><span class="cx"> WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101100 = WebKitSystemInterfaceElCapitan;
</span><span class="cx"> WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101200 = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101100);
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -35,12 +35,7 @@
</span><span class="cx"> ENABLE_ACCELERATED_2D_CANVAS = ;
</span><span class="cx"> ENABLE_ACCELERATED_OVERFLOW_SCROLLING[sdk=iphone*] = ENABLE_ACCELERATED_OVERFLOW_SCROLLING;
</span><span class="cx"> ENABLE_ATTACHMENT_ELEMENT = ENABLE_ATTACHMENT_ELEMENT;
</span><del>-ENABLE_AVF_CAPTIONS[sdk=iphone*] = ENABLE_AVF_CAPTIONS;
-ENABLE_AVF_CAPTIONS[sdk=macosx*] = $(ENABLE_AVF_CAPTIONS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_AVF_CAPTIONS_macosx_1090 = ;
-ENABLE_AVF_CAPTIONS_macosx_101000 = ENABLE_AVF_CAPTIONS;
-ENABLE_AVF_CAPTIONS_macosx_101100 = ENABLE_AVF_CAPTIONS;
-ENABLE_AVF_CAPTIONS_macosx_101200 = ENABLE_AVF_CAPTIONS;
</del><ins>+ENABLE_AVF_CAPTIONS = ENABLE_AVF_CAPTIONS;
</ins><span class="cx"> ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
</span><span class="cx"> ENABLE_CANVAS_PATH = ENABLE_CANVAS_PATH;
</span><span class="cx"> ENABLE_CANVAS_PROXY = ;
</span><span class="lines">@@ -76,12 +71,7 @@
</span><span class="cx"> ENABLE_ENCRYPTED_MEDIA[sdk=macosx*] = ENABLE_ENCRYPTED_MEDIA;
</span><span class="cx"> ENABLE_ENCRYPTED_MEDIA_V2[sdk=macosx*] = ENABLE_ENCRYPTED_MEDIA_V2;
</span><span class="cx"> ENABLE_FETCH_API = ENABLE_FETCH_API;
</span><del>-ENABLE_FILTERS_LEVEL_2[sdk=iphone*] = ENABLE_FILTERS_LEVEL_2;
-ENABLE_FILTERS_LEVEL_2[sdk=macosx*] = $(ENABLE_FILTERS_LEVEL_2_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_FILTERS_LEVEL_2_macosx_1090 = ;
-ENABLE_FILTERS_LEVEL_2_macosx_101000 = ENABLE_FILTERS_LEVEL_2;
-ENABLE_FILTERS_LEVEL_2_macosx_101100 = ENABLE_FILTERS_LEVEL_2;
-ENABLE_FILTERS_LEVEL_2_macosx_101200 = ENABLE_FILTERS_LEVEL_2;
</del><ins>+ENABLE_FILTERS_LEVEL_2 = ENABLE_FILTERS_LEVEL_2;
</ins><span class="cx"> ENABLE_FONT_LOAD_EVENTS = ;
</span><span class="cx"> ENABLE_FULLSCREEN_API[sdk=macosx*] = ENABLE_FULLSCREEN_API;
</span><span class="cx"> ENABLE_GAMEPAD[sdk=macosx*] = ENABLE_GAMEPAD;
</span><span class="lines">@@ -89,11 +79,7 @@
</span><span class="cx"> ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
</span><span class="cx"> ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING[sdk=macosx*] = ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING;
</span><span class="cx"> ENABLE_ICONDATABASE[sdk=macosx*] = ENABLE_ICONDATABASE;
</span><del>-ENABLE_SERVICE_CONTROLS[sdk=macosx*] = $(ENABLE_SERVICE_CONTROLS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_SERVICE_CONTROLS_macosx_1090 = ;
-ENABLE_SERVICE_CONTROLS_macosx_101000 = ENABLE_SERVICE_CONTROLS;
-ENABLE_SERVICE_CONTROLS_macosx_101100 = ENABLE_SERVICE_CONTROLS;
-ENABLE_SERVICE_CONTROLS_macosx_101200 = ENABLE_SERVICE_CONTROLS;
</del><ins>+ENABLE_SERVICE_CONTROLS[sdk=macosx*] = ENABLE_SERVICE_CONTROLS;
</ins><span class="cx"> ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
</span><span class="cx"> ENABLE_INDEXED_DATABASE_IN_WORKERS = ;
</span><span class="cx"> ENABLE_INDIE_UI = ENABLE_INDIE_UI;
</span><span class="lines">@@ -106,16 +92,10 @@
</span><span class="cx"> ENABLE_INPUT_TYPE_TIME[sdk=iphone*] = ENABLE_INPUT_TYPE_TIME;
</span><span class="cx"> ENABLE_INPUT_TYPE_WEEK[sdk=iphone*] = ENABLE_INPUT_TYPE_WEEK;
</span><span class="cx">
</span><del>-ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS[sdk=iphone*] = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
-ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS[sdk=macosx*] = $(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR))
-ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_1090 = ;
-ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_101000 = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
-ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_101100 = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
-ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_101200 = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
</del><ins>+ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
</ins><span class="cx">
</span><span class="cx"> ENABLE_WIRELESS_PLAYBACK_TARGET[sdk=iphone*] = ENABLE_WIRELESS_PLAYBACK_TARGET;
</span><span class="cx"> ENABLE_WIRELESS_PLAYBACK_TARGET[sdk=macosx*] = $(ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR))
</span><del>-ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_1090 = ;
</del><span class="cx"> ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_101000 = ;
</span><span class="cx"> ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_101100 = ENABLE_WIRELESS_PLAYBACK_TARGET;
</span><span class="cx"> ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_101200 = ENABLE_WIRELESS_PLAYBACK_TARGET;
</span><span class="lines">@@ -128,7 +108,6 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_MAC_GESTURE_EVENTS = ;
</span><span class="cx"> ENABLE_MAC_GESTURE_EVENTS[sdk=macosx*] = $(ENABLE_MAC_GESTURE_EVENTS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
</span><del>-ENABLE_MAC_GESTURE_EVENTS_macosx_1090_WITH_INTERNAL_SDK_YES = ;
</del><span class="cx"> ENABLE_MAC_GESTURE_EVENTS_macosx_101000_WITH_INTERNAL_SDK_YES = ;
</span><span class="cx"> ENABLE_MAC_GESTURE_EVENTS_macosx_101100_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
</span><span class="cx"> ENABLE_MAC_GESTURE_EVENTS_macosx_101200_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
</span><span class="lines">@@ -148,11 +127,7 @@
</span><span class="cx"> ENABLE_MEDIA_CONTROLS_SCRIPT = ENABLE_MEDIA_CONTROLS_SCRIPT;
</span><span class="cx"> ENABLE_MEDIA_SESSION = ;
</span><span class="cx">
</span><del>-ENABLE_MEDIA_SOURCE[sdk=macosx*] = $(ENABLE_MEDIA_SOURCE_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_MEDIA_SOURCE_macosx_1090 = ;
-ENABLE_MEDIA_SOURCE_macosx_101000 = ENABLE_MEDIA_SOURCE;
-ENABLE_MEDIA_SOURCE_macosx_101100 = ENABLE_MEDIA_SOURCE;
-ENABLE_MEDIA_SOURCE_macosx_101200 = ENABLE_MEDIA_SOURCE;
</del><ins>+ENABLE_MEDIA_SOURCE[sdk=macosx*] = ENABLE_MEDIA_SOURCE;
</ins><span class="cx">
</span><span class="cx"> ENABLE_MEDIA_STATISTICS = ;
</span><span class="cx"> ENABLE_MEDIA_STREAM = ENABLE_MEDIA_STREAM;
</span><span class="lines">@@ -170,12 +145,7 @@
</span><span class="cx"> ENABLE_QUOTA = ;
</span><span class="cx"> ENABLE_REQUEST_ANIMATION_FRAME = ENABLE_REQUEST_ANIMATION_FRAME;
</span><span class="cx"> ENABLE_REQUEST_AUTOCOMPLETE = ;
</span><del>-ENABLE_REMOTE_INSPECTOR[sdk=iphone*] = ENABLE_REMOTE_INSPECTOR;
-ENABLE_REMOTE_INSPECTOR[sdk=macosx*] = $(ENABLE_REMOTE_INSPECTOR_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_REMOTE_INSPECTOR_macosx_1090 = ;
-ENABLE_REMOTE_INSPECTOR_macosx_101000 = ENABLE_REMOTE_INSPECTOR;
-ENABLE_REMOTE_INSPECTOR_macosx_101100 = ENABLE_REMOTE_INSPECTOR;
-ENABLE_REMOTE_INSPECTOR_macosx_101200 = ENABLE_REMOTE_INSPECTOR;
</del><ins>+ENABLE_REMOTE_INSPECTOR = ENABLE_REMOTE_INSPECTOR;
</ins><span class="cx"> ENABLE_RESOLUTION_MEDIA_QUERY = ;
</span><span class="cx"> ENABLE_RUBBER_BANDING[sdk=macosx*] = ENABLE_RUBBER_BANDING;
</span><span class="cx"> ENABLE_CSS_SCROLL_SNAP = ENABLE_CSS_SCROLL_SNAP;
</span><span class="lines">@@ -185,12 +155,7 @@
</span><span class="cx"> ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
</span><span class="cx"> ENABLE_SVG_OTF_CONVERTER = ENABLE_SVG_OTF_CONVERTER;
</span><span class="cx">
</span><del>-ENABLE_TELEPHONE_NUMBER_DETECTION[sdk=iphone*] = ENABLE_TELEPHONE_NUMBER_DETECTION;
-ENABLE_TELEPHONE_NUMBER_DETECTION[sdk=macosx*] = $(ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_1090 = ;
-ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_101000 = ENABLE_TELEPHONE_NUMBER_DETECTION;
-ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_101100 = ENABLE_TELEPHONE_NUMBER_DETECTION;
-ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_101200 = ENABLE_TELEPHONE_NUMBER_DETECTION;
</del><ins>+ENABLE_TELEPHONE_NUMBER_DETECTION = ENABLE_TELEPHONE_NUMBER_DETECTION;
</ins><span class="cx">
</span><span class="cx"> ENABLE_TEMPLATE_ELEMENT = ENABLE_TEMPLATE_ELEMENT;
</span><span class="cx"> ENABLE_TEXT_AUTOSIZING = ;
</span><span class="lines">@@ -219,12 +184,7 @@
</span><span class="cx"> ENABLE_WEB_REPLAY_macosx_Release = ENABLE_WEB_REPLAY;
</span><span class="cx"> ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
</span><span class="cx">
</span><del>-ENABLE_WEB_TIMING[sdk=iphone*] = ENABLE_WEB_TIMING;
-ENABLE_WEB_TIMING[sdk=macosx*] = $(ENABLE_WEB_TIMING_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_WEB_TIMING_macosx_1090 = ;
-ENABLE_WEB_TIMING_macosx_101000 = ENABLE_WEB_TIMING;
-ENABLE_WEB_TIMING_macosx_101100 = ENABLE_WEB_TIMING;
-ENABLE_WEB_TIMING_macosx_101200 = ENABLE_WEB_TIMING;
</del><ins>+ENABLE_WEB_TIMING = ENABLE_WEB_TIMING;
</ins><span class="cx">
</span><span class="cx"> ENABLE_XSLT = ENABLE_XSLT;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsVersionxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/Version.xcconfig (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/Version.xcconfig 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit2/Configurations/Version.xcconfig 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -35,7 +35,6 @@
</span><span class="cx"> // The system version prefix is based on the current system version.
</span><span class="cx"> SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
</span><span class="cx"> SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><del>-SYSTEM_VERSION_PREFIX_macosx_1090 = 9;
</del><span class="cx"> SYSTEM_VERSION_PREFIX_macosx_101000 = 10;
</span><span class="cx"> SYSTEM_VERSION_PREFIX_macosx_101100 = 11;
</span><span class="cx"> SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsWebContentServiceDevelopmentxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/WebContentService.Development.xcconfig (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/WebContentService.Development.xcconfig 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit2/Configurations/WebContentService.Development.xcconfig 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -30,12 +30,5 @@
</span><span class="cx"> INFOPLIST_FILE[sdk=iphone*] = WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info-iOS.plist;
</span><span class="cx"> INFOPLIST_FILE[sdk=macosx*] = WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info-OSX.plist;
</span><span class="cx">
</span><del>-BUNDLE_LOCALIZATION_KEY[sdk=iphone*] = CFBundleFollowParentLocalization;
-BUNDLE_LOCALIZATION_KEY = $(BUNDLE_LOCALIZATION_KEY_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-BUNDLE_LOCALIZATION_KEY_macosx_1090 = CFBundleAllowMixedLocalizations;
-BUNDLE_LOCALIZATION_KEY_macosx_101000 = CFBundleFollowParentLocalization;
-BUNDLE_LOCALIZATION_KEY_macosx_101100 = CFBundleFollowParentLocalization;
-BUNDLE_LOCALIZATION_KEY_macosx_101200 = CFBundleFollowParentLocalization;
-
</del><span class="cx"> OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(OTHER_LDFLAGS_PLATFORM);
</span><span class="cx"> OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit;
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsWebContentServicexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/WebContentService.xcconfig (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/WebContentService.xcconfig 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit2/Configurations/WebContentService.xcconfig 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -30,13 +30,6 @@
</span><span class="cx"> INFOPLIST_FILE[sdk=iphone*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist;
</span><span class="cx"> INFOPLIST_FILE[sdk=macosx*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX$(WK_XPC_SERVICE_INFOPLIST_SUFFIX).plist;
</span><span class="cx">
</span><del>-BUNDLE_LOCALIZATION_KEY[sdk=iphone*] = CFBundleFollowParentLocalization;
-BUNDLE_LOCALIZATION_KEY = $(BUNDLE_LOCALIZATION_KEY_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-BUNDLE_LOCALIZATION_KEY_macosx_1090 = CFBundleAllowMixedLocalizations;
-BUNDLE_LOCALIZATION_KEY_macosx_101000 = CFBundleFollowParentLocalization;
-BUNDLE_LOCALIZATION_KEY_macosx_101100 = CFBundleFollowParentLocalization;
-BUNDLE_LOCALIZATION_KEY_macosx_101200 = CFBundleFollowParentLocalization;
-
</del><span class="cx"> OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(OTHER_LDFLAGS_PLATFORM);
</span><span class="cx"> OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit $(OTHER_LDFLAGS_SHIM_$(WK_LINK_SHIM));
</span><span class="cx"> OTHER_LDFLAGS_SHIM_YES = $(BUILT_PRODUCTS_DIR)/WebProcessShim.dylib;
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsWebKitxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/WebKit.xcconfig (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/WebKit.xcconfig 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit2/Configurations/WebKit.xcconfig 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -53,5 +53,4 @@
</span><span class="cx"> INSTALLHDRS_SCRIPT_PHASE = YES;
</span><span class="cx">
</span><span class="cx"> WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED[sdk=macosx*] = $(WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED_macosx_$(MAC_OS_X_VERSION_MAJOR));
</span><del>-WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED_macosx_1090 = YES;
</del><span class="cx"> WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED_macosx_101000 = YES;
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessmaccomappleWebKitDatabasessbin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/mac/com.apple.WebKit.Databases.sb.in (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/mac/com.apple.WebKit.Databases.sb.in 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit2/DatabaseProcess/mac/com.apple.WebKit.Databases.sb.in 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -74,8 +74,4 @@
</span><span class="cx"> (deny file-write-xattr (xattr "com.apple.quarantine") (with no-log))
</span><span class="cx">
</span><span class="cx"> ;; Reserve a namespace for additional protected extended attributes.
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED > 1090
</del><span class="cx"> (deny file-read-xattr file-write-xattr (xattr-regex #"^com\.apple\.security\.private\."))
</span><del>-#else
-(deny file-read-xattr file-write-xattr (xattr #"^com\.apple\.security\.private\."))
-#endif
</del></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscocoaNetworkProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -220,12 +220,10 @@
</span><span class="cx">
</span><span class="cx"> void NetworkProcess::clearHSTSCache(WebCore::NetworkStorageSession& session, std::chrono::system_clock::time_point modifiedSince)
</span><span class="cx"> {
</span><del>-#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000)
</del><span class="cx"> NSTimeInterval timeInterval = std::chrono::duration_cast<std::chrono::duration<double>>(modifiedSince.time_since_epoch()).count();
</span><span class="cx"> NSDate *date = [NSDate dateWithTimeIntervalSince1970:timeInterval];
</span><span class="cx">
</span><span class="cx"> _CFNetworkResetHSTSHostsSinceDate(session.platformSession(), (__bridge CFDateRef)date);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void clearNSURLCache(dispatch_group_t group, std::chrono::system_clock::time_point modifiedSince, const std::function<void ()>& completionHandler)
</span><span class="lines">@@ -233,13 +231,10 @@
</span><span class="cx"> dispatch_group_async(group, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), [modifiedSince, completionHandler] {
</span><span class="cx"> NSURLCache *cache = [NSURLCache sharedURLCache];
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> NSTimeInterval timeInterval = std::chrono::duration_cast<std::chrono::duration<double>>(modifiedSince.time_since_epoch()).count();
</span><span class="cx"> NSDate *date = [NSDate dateWithTimeIntervalSince1970:timeInterval];
</span><span class="cx"> [cache removeCachedResponsesSinceDate:date];
</span><del>-#else
- [cache removeAllCachedResponses];
-#endif
</del><ins>+
</ins><span class="cx"> dispatch_async(dispatch_get_main_queue(), [completionHandler] {
</span><span class="cx"> completionHandler();
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessmaccomappleWebKitNetworkProcesssbin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit2/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -154,11 +154,7 @@
</span><span class="cx"> (deny file-write-xattr (xattr "com.apple.quarantine") (with no-log))
</span><span class="cx">
</span><span class="cx"> ;; Reserve a namespace for additional protected extended attributes.
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED > 1090
</del><span class="cx"> (deny file-read-xattr file-write-xattr (xattr-regex #"^com\.apple\.security\.private\."))
</span><del>-#else
-(deny file-read-xattr file-write-xattr (xattr #"^com\.apple\.security\.private\."))
-#endif
</del><span class="cx">
</span><span class="cx"> (deny file-read* file-write* (with no-log)
</span><span class="cx"> ;; FIXME: Should be removed after <rdar://problem/10463881> is fixed.
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCmacConnectionMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> } AXSuspendStatus;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !TARGET_OS_IPHONE && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> extern "C" AXError _AXUIElementNotifyProcessSuspendStatus(AXSuspendStatus);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -193,10 +193,8 @@
</span><span class="cx"> // Create the receive port.
</span><span class="cx"> mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &m_receivePort);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> mach_port_set_attributes(mach_task_self(), m_receivePort, MACH_PORT_DENAP_RECEIVER, (mach_port_info_t)0, 0);
</span><del>-#elif PLATFORM(MAC)
- mach_port_set_attributes(mach_task_self(), m_receivePort, MACH_PORT_IMPORTANCE_RECEIVER, (mach_port_info_t)0, 0);
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> m_isConnected = true;
</span><span class="lines">@@ -611,7 +609,7 @@
</span><span class="cx">
</span><span class="cx"> static void AccessibilityProcessSuspendedNotification(bool suspended)
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> _AXUIElementNotifyProcessSuspendStatus(suspended ? AXSuspendStatusSuspended : AXSuspendStatusRunning);
</span><span class="cx"> #elif PLATFORM(IOS)
</span><span class="cx"> UIAccessibilityPostNotification(kAXPidStatusChangedNotification, @{ @"pid" : @(getpid()), @"suspended" : @(suspended) });
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCmacImportanceAssertionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/mac/ImportanceAssertion.h (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/mac/ImportanceAssertion.h 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit2/Platform/IPC/mac/ImportanceAssertion.h 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -32,13 +32,8 @@
</span><span class="cx"> #include <libproc_internal.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> extern "C" int proc_denap_assertion_begin_with_msg(mach_msg_header_t*, uint64_t *);
</span><span class="cx"> extern "C" int proc_denap_assertion_complete(uint64_t);
</span><del>-#else
-extern "C" int proc_importance_assertion_begin_with_msg(mach_msg_header_t*, mach_msg_trailer_t*, uint64_t*);
-extern "C" int proc_importance_assertion_complete(uint64_t assertion_handle);
-#endif
</del><span class="cx">
</span><span class="cx"> namespace IPC {
</span><span class="cx">
</span><span class="lines">@@ -49,20 +44,12 @@
</span><span class="cx"> explicit ImportanceAssertion(mach_msg_header_t* header)
</span><span class="cx"> : m_assertion(0)
</span><span class="cx"> {
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> proc_denap_assertion_begin_with_msg(header, &m_assertion);
</span><del>-#else
- proc_importance_assertion_begin_with_msg(header, 0, &m_assertion);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ~ImportanceAssertion()
</span><span class="cx"> {
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> proc_denap_assertion_complete(m_assertion);
</span><del>-#else
- proc_importance_assertion_complete(m_assertion);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformmacMenuUtilitiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/mac/MenuUtilities.h (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/mac/MenuUtilities.h 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit2/Platform/mac/MenuUtilities.h 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-#if ENABLE(TELEPHONE_NUMBER_DETECTION) && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><ins>+#if ENABLE(TELEPHONE_NUMBER_DETECTION) && PLATFORM(MAC)
</ins><span class="cx"> NSMenuItem *menuItemForTelephoneNumber(const String& telephoneNumber);
</span><span class="cx"> RetainPtr<NSMenu> menuForTelephoneNumber(const String& telephoneNumber);
</span><span class="cx"> NSString *menuItemTitleForTelephoneNumberGroup();
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformmacMenuUtilitiesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/mac/MenuUtilities.mm (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/mac/MenuUtilities.mm 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit2/Platform/mac/MenuUtilities.mm 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -33,13 +33,13 @@
</span><span class="cx"> #import <WebCore/LocalizedStrings.h>
</span><span class="cx"> #import <objc/runtime.h>
</span><span class="cx">
</span><del>-#if ENABLE(TELEPHONE_NUMBER_DETECTION) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><ins>+#if ENABLE(TELEPHONE_NUMBER_DETECTION)
</ins><span class="cx"> #import <WebCore/TUCallSPI.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-#if ENABLE(TELEPHONE_NUMBER_DETECTION) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><ins>+#if ENABLE(TELEPHONE_NUMBER_DETECTION)
</ins><span class="cx">
</span><span class="cx"> NSString *menuItemTitleForTelephoneNumberGroup()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformmacStringUtilitiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/mac/StringUtilities.h (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/mac/StringUtilities.h 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit2/Platform/mac/StringUtilities.h 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> // expects to be called on the thread running WebCore.
</span><span class="cx"> NSString *nsStringFromWebCoreString(const String&);
</span><span class="cx">
</span><del>-#if ENABLE(TELEPHONE_NUMBER_DETECTION) && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><ins>+#if ENABLE(TELEPHONE_NUMBER_DETECTION) && PLATFORM(MAC)
</ins><span class="cx"> NSString *formattedPhoneNumberString(NSString *originalPhoneNumber);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformmacStringUtilitiesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/mac/StringUtilities.mm (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/mac/StringUtilities.mm 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit2/Platform/mac/StringUtilities.mm 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> return string.isEmpty() ? @"" : CFBridgingRelease(WKStringCopyCFString(0, toAPI(string.impl())));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(TELEPHONE_NUMBER_DETECTION) && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><ins>+#if ENABLE(TELEPHONE_NUMBER_DETECTION) && PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> SOFT_LINK_PRIVATE_FRAMEWORK(PhoneNumbers);
</span><span class="cx">
</span><span class="lines">@@ -72,6 +72,6 @@
</span><span class="cx"> return [(NSString *)phoneNumberString autorelease];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // ENABLE(TELEPHONE_NUMBER_DETECTION) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><ins>+#endif // ENABLE(TELEPHONE_NUMBER_DETECTION) && PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPICocoaWKFoundationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -113,10 +113,6 @@
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101000
-typedef NSUInteger NSEventModifierFlags;
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #endif
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedEntryPointUtilitiesmacXPCServiceXPCServiceMainDevelopmentmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -160,7 +160,6 @@
</span><span class="cx">
</span><span class="cx"> int main(int argc, char** argv)
</span><span class="cx"> {
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> if (auto bootstrap = adoptOSObject(xpc_copy_bootstrap())) {
</span><span class="cx"> if (xpc_object_t languages = xpc_dictionary_get_value(bootstrap.get(), "OverrideLanguages")) {
</span><span class="cx"> NSDictionary *existingArguments = [[NSUserDefaults standardUserDefaults] volatileDomainForName:NSArgumentDomain];
</span><span class="lines">@@ -174,9 +173,8 @@
</span><span class="cx"> [[NSUserDefaults standardUserDefaults] setVolatileDomain:newArguments forName:NSArgumentDomain];
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> #pragma clang diagnostic push
</span><span class="cx"> #pragma clang diagnostic ignored "-Wdeprecated-declarations"
</span><span class="cx"> // Workaround for <rdar://problem/20653234>, make XPC transactions work after re-exec.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -78,9 +78,7 @@
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, setter=_setOverrideDeviceScaleFactor:) CGFloat _overrideDeviceScaleFactor WK_AVAILABLE(10_11, NA);
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> @property (nonatomic, setter=_setAutomaticallyAdjustsContentInsets:) BOOL _automaticallyAdjustsContentInsets;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> @property (readonly) NSColor *_pageExtendedBackgroundColor;
</span><span class="cx"> @property (copy, nonatomic) NSColor *underlayColor;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -411,10 +411,8 @@
</span><span class="cx"> _impl = std::make_unique<WebKit::WebViewImpl>(self, self, processPool, WTF::move(pageConfiguration));
</span><span class="cx"> _page = &_impl->page();
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> _impl->setAutomaticallyAdjustsContentInsets(true);
</span><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> _page->setBackgroundExtendsBeyondPage(true);
</span><span class="cx">
</span><span class="lines">@@ -4090,7 +4088,6 @@
</span><span class="cx"> return nil;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> - (void)_setAutomaticallyAdjustsContentInsets:(BOOL)automaticallyAdjustsContentInsets
</span><span class="cx"> {
</span><span class="cx"> _impl->setAutomaticallyAdjustsContentInsets(automaticallyAdjustsContentInsets);
</span><span class="lines">@@ -4100,7 +4097,6 @@
</span><span class="cx"> {
</span><span class="cx"> return _impl->automaticallyAdjustsContentInsets();
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> - (CGFloat)_minimumLayoutWidth
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -176,9 +176,7 @@
</span><span class="cx"> @property (nonatomic, setter=_setDrawsBackground:) BOOL _drawsBackground;
</span><span class="cx"> @property (nonatomic, setter=_setTopContentInset:) CGFloat _topContentInset;
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> @property (nonatomic, setter=_setAutomaticallyAdjustsContentInsets:) BOOL _automaticallyAdjustsContentInsets;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> // Default value is 0. A value of 0 means the window's backing scale factor will be used and automatically update when the window moves screens.
</span><span class="cx"> @property (nonatomic, setter=_setOverrideDeviceScaleFactor:) CGFloat _overrideDeviceScaleFactor WK_AVAILABLE(10_11, NA);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -1435,8 +1435,6 @@
</span><span class="cx"> _data->_impl->dismissContentRelativeChildWindowsWithAnimationFromViewOnly(withAnimation);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
-
</del><span class="cx"> - (void)_setAutomaticallyAdjustsContentInsets:(BOOL)automaticallyAdjustsContentInsets
</span><span class="cx"> {
</span><span class="cx"> _data->_impl->setAutomaticallyAdjustsContentInsets(automaticallyAdjustsContentInsets);
</span><span class="lines">@@ -1447,8 +1445,6 @@
</span><span class="cx"> return _data->_impl->automaticallyAdjustsContentInsets();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif
-
</del><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(MAC)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebProcessPoolCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -508,13 +508,11 @@
</span><span class="cx">
</span><span class="cx"> void WebProcessPool::resetHSTSHostsAddedAfterDate(double startDateIntervalSince1970)
</span><span class="cx"> {
</span><del>-#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000)
</del><span class="cx"> NSDate *startDate = [NSDate dateWithTimeIntervalSince1970:startDateIntervalSince1970];
</span><span class="cx"> _CFNetworkResetHSTSHostsSinceDate(nullptr, (__bridge CFDateRef)startDate);
</span><span class="cx"> #if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</span><span class="cx"> _CFNetworkResetHSTSHostsSinceDate(privateBrowsingSession(), (__bridge CFDateRef)startDate);
</span><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int networkProcessLatencyQOS()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebViewImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -563,10 +563,8 @@
</span><span class="cx"> bool m_ignoresAllEvents { false };
</span><span class="cx"> bool m_ignoresMouseDraggedEvents { false };
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> RetainPtr<WKImmediateActionController> m_immediateActionController;
</span><span class="cx"> RetainPtr<NSImmediateActionGestureRecognizer> m_immediateActionGestureRecognizer;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> bool m_allowsLinkPreview { true };
</span><span class="cx"> bool m_didRegisterForLookupPopoverCloseNotifications { false };
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebViewImplmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -139,9 +139,7 @@
</span><span class="cx"> [super dealloc];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> static void* keyValueObservingContext = &keyValueObservingContext;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> - (void)startObserving:(NSWindow *)window
</span><span class="cx"> {
</span><span class="lines">@@ -164,10 +162,9 @@
</span><span class="cx"> [defaultNotificationCenter addObserver:self selector:@selector(_windowDidChangeScreen:) name:NSWindowDidChangeScreenNotification object:window];
</span><span class="cx"> [defaultNotificationCenter addObserver:self selector:@selector(_windowDidChangeLayerHosting:) name:@"_NSWindowDidChangeContentsHostedInLayerSurfaceNotification" object:window];
</span><span class="cx"> [defaultNotificationCenter addObserver:self selector:@selector(_windowDidChangeOcclusionState:) name:NSWindowDidChangeOcclusionStateNotification object:window];
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><ins>+
</ins><span class="cx"> [window addObserver:self forKeyPath:@"contentLayoutRect" options:NSKeyValueObservingOptionInitial context:keyValueObservingContext];
</span><span class="cx"> [window addObserver:self forKeyPath:@"titlebarAppearsTransparent" options:NSKeyValueObservingOptionInitial context:keyValueObservingContext];
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)stopObserving:(NSWindow *)window
</span><span class="lines">@@ -190,19 +187,16 @@
</span><span class="cx"> [defaultNotificationCenter removeObserver:self name:NSWindowDidChangeScreenNotification object:window];
</span><span class="cx"> [defaultNotificationCenter removeObserver:self name:@"_NSWindowDidChangeContentsHostedInLayerSurfaceNotification" object:window];
</span><span class="cx"> [defaultNotificationCenter removeObserver:self name:NSWindowDidChangeOcclusionStateNotification object:window];
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><ins>+
</ins><span class="cx"> if (_impl->isEditable())
</span><span class="cx"> [[NSFontPanel sharedFontPanel] removeObserver:self forKeyPath:@"visible" context:keyValueObservingContext];
</span><span class="cx"> [window removeObserver:self forKeyPath:@"contentLayoutRect" context:keyValueObservingContext];
</span><span class="cx"> [window removeObserver:self forKeyPath:@"titlebarAppearsTransparent" context:keyValueObservingContext];
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)startObservingFontPanel
</span><span class="cx"> {
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> [[NSFontPanel sharedFontPanel] addObserver:self forKeyPath:@"visible" options:0 context:keyValueObservingContext];
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)startObservingLookupDismissal
</span><span class="lines">@@ -274,7 +268,6 @@
</span><span class="cx">
</span><span class="cx"> - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
</span><span class="cx"> {
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> if (context != keyValueObservingContext) {
</span><span class="cx"> [super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
</span><span class="cx"> return;
</span><span class="lines">@@ -286,7 +279,6 @@
</span><span class="cx"> }
</span><span class="cx"> if ([keyPath isEqualToString:@"contentLayoutRect"] || [keyPath isEqualToString:@"titlebarAppearsTransparent"])
</span><span class="cx"> _impl->updateContentInsetsIfAutomatic();
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_dictionaryLookupPopoverWillClose:(NSNotification *)notification
</span><span class="lines">@@ -459,16 +451,13 @@
</span><span class="cx">
</span><span class="cx"> m_page->setIntrinsicDeviceScaleFactor(intrinsicDeviceScaleFactor());
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> if (Class gestureClass = NSClassFromString(@"NSImmediateActionGestureRecognizer")) {
</span><span class="cx"> m_immediateActionGestureRecognizer = adoptNS([(NSImmediateActionGestureRecognizer *)[gestureClass alloc] init]);
</span><span class="cx"> m_immediateActionController = adoptNS([[WKImmediateActionController alloc] initWithPage:m_page view:m_view viewImpl:*this recognizer:m_immediateActionGestureRecognizer.get()]);
</span><span class="cx"> [m_immediateActionGestureRecognizer setDelegate:m_immediateActionController.get()];
</span><span class="cx"> [m_immediateActionGestureRecognizer setDelaysPrimaryMouseButtonEvents:NO];
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><del>-
</del><span class="cx"> m_page->setAddsVisitedLinks(processPool.historyClient().addsVisitedLinks());
</span><span class="cx">
</span><span class="cx"> m_page->initializeWebPage();
</span><span class="lines">@@ -502,9 +491,7 @@
</span><span class="cx">
</span><span class="cx"> [m_layoutStrategy invalidate];
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> [m_immediateActionController willDestroyView:m_view];
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> m_page->close();
</span><span class="cx">
</span><span class="lines">@@ -800,7 +787,6 @@
</span><span class="cx">
</span><span class="cx"> void WebViewImpl::updateContentInsetsIfAutomatic()
</span><span class="cx"> {
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> if (!m_automaticallyAdjustsContentInsets)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -812,7 +798,6 @@
</span><span class="cx"> setTopContentInset(newTopContentInset);
</span><span class="cx"> } else
</span><span class="cx"> setTopContentInset(0);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebViewImpl::setTopContentInset(CGFloat contentInset)
</span><span class="lines">@@ -1182,10 +1167,8 @@
</span><span class="cx">
</span><span class="cx"> accessibilityRegisterUIProcessTokens();
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> if (m_immediateActionGestureRecognizer && ![[m_view gestureRecognizers] containsObject:m_immediateActionGestureRecognizer.get()] && !m_ignoresNonWheelEvents && m_allowsLinkPreview)
</span><span class="cx"> [m_view addGestureRecognizer:m_immediateActionGestureRecognizer.get()];
</span><del>-#endif
</del><span class="cx"> } else {
</span><span class="cx"> WebCore::ViewState::Flags viewStateChanges = WebCore::ViewState::WindowIsActive | WebCore::ViewState::IsVisible;
</span><span class="cx"> if (m_isDeferringViewInWindowChanges)
</span><span class="lines">@@ -1199,10 +1182,8 @@
</span><span class="cx">
</span><span class="cx"> dismissContentRelativeChildWindowsWithAnimation(false);
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> if (m_immediateActionGestureRecognizer)
</span><span class="cx"> [m_view removeGestureRecognizer:m_immediateActionGestureRecognizer.get()];
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_page->setIntrinsicDeviceScaleFactor(intrinsicDeviceScaleFactor());
</span><span class="lines">@@ -2158,27 +2139,21 @@
</span><span class="cx"> void WebViewImpl::dismissContentRelativeChildWindowsFromViewOnly()
</span><span class="cx"> {
</span><span class="cx"> bool hasActiveImmediateAction = false;
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> hasActiveImmediateAction = [m_immediateActionController hasActiveImmediateAction];
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> // FIXME: We don't know which panel we are dismissing, it may not even be in the current page (see <rdar://problem/13875766>).
</span><span class="cx"> if (m_view.window.isKeyWindow || hasActiveImmediateAction) {
</span><span class="cx"> WebCore::DictionaryLookup::hidePopup();
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> DDActionsManager *actionsManager = [getDDActionsManagerClass() sharedManager];
</span><span class="cx"> if ([actionsManager respondsToSelector:@selector(requestBubbleClosureUnanchorOnFailure:)])
</span><span class="cx"> [actionsManager requestBubbleClosureUnanchorOnFailure:YES];
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> clearTextIndicatorWithAnimation(WebCore::TextIndicatorWindowDismissalAnimation::FadeOut);
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> [m_immediateActionController dismissContentRelativeChildWindows];
</span><del>-#endif
-
</del><ins>+
</ins><span class="cx"> m_pageClient->dismissCorrectionPanel(WebCore::ReasonForDismissingAlternativeTextIgnored);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2192,12 +2167,10 @@
</span><span class="cx"> if (ignoresNonWheelEvents())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> if (m_immediateActionGestureRecognizer) {
</span><span class="cx"> [m_view _web_superQuickLookWithEvent:event];
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> NSPoint locationInViewCoordinates = [m_view convertPoint:[event locationInWindow] fromView:nil];
</span><span class="cx"> m_page->performDictionaryLookupAtLocation(WebCore::FloatPoint(locationInViewCoordinates));
</span><span class="lines">@@ -2220,12 +2193,10 @@
</span><span class="cx">
</span><span class="cx"> m_allowsLinkPreview = allowsLinkPreview;
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> if (!allowsLinkPreview)
</span><span class="cx"> [m_view removeGestureRecognizer:m_immediateActionGestureRecognizer.get()];
</span><span class="cx"> else if (NSGestureRecognizer *immediateActionRecognizer = m_immediateActionGestureRecognizer.get())
</span><span class="cx"> [m_view addGestureRecognizer:immediateActionRecognizer];
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void* WebViewImpl::immediateActionAnimationControllerForHitTestResult(API::HitTestResult* hitTestResult, uint32_t type, API::Object* userData)
</span><span class="lines">@@ -2235,9 +2206,7 @@
</span><span class="cx">
</span><span class="cx"> void WebViewImpl::didPerformImmediateActionHitTest(const WebHitTestResultData& result, bool contentPreventsDefault, API::Object* userData)
</span><span class="cx"> {
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> [m_immediateActionController didPerformImmediateActionHitTest:result contentPreventsDefault:contentPreventsDefault userData:userData];
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebViewImpl::prepareForImmediateActionAnimation()
</span><span class="lines">@@ -2268,14 +2237,12 @@
</span><span class="cx"> m_ignoresNonWheelEvents = ignoresNonWheelEvents;
</span><span class="cx"> m_page->setShouldDispatchFakeMouseMoveEvents(!ignoresNonWheelEvents);
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> if (ignoresNonWheelEvents)
</span><span class="cx"> [m_view removeGestureRecognizer:m_immediateActionGestureRecognizer.get()];
</span><span class="cx"> else if (NSGestureRecognizer *immediateActionRecognizer = m_immediateActionGestureRecognizer.get()) {
</span><span class="cx"> if (m_allowsLinkPreview)
</span><span class="cx"> [m_view addGestureRecognizer:immediateActionRecognizer];
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebViewImpl::setIgnoresAllEvents(bool ignoresAllEvents)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessLaunchermacProcessLauncherMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -203,13 +203,8 @@
</span><span class="cx"> {
</span><span class="cx"> // Create a connection to the WebKit XPC service.
</span><span class="cx"> auto connection = adoptOSObject(xpc_connection_create(serviceName(launchOptions, forDevelopment), 0));
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> xpc_connection_set_oneshot_instance(connection.get(), instanceUUID->uuid);
</span><del>-#else
- xpc_connection_set_instance(connection.get(), instanceUUID->uuid);
-#endif
</del><span class="cx">
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> // Inherit UI process localization. It can be different from child process default localization:
</span><span class="cx"> // 1. When the application and system frameworks simply have different localized resources available, we should match the application.
</span><span class="cx"> // 1.1. An important case is WebKitTestRunner, where we should use English localizations for all system frameworks.
</span><span class="lines">@@ -239,7 +234,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> xpc_connection_set_bootstrap(connection.get(), initializationMessage.get());
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> // XPC requires having an event handler, even if it is not used.
</span><span class="cx"> xpc_connection_set_event_handler(connection.get(), ^(xpc_object_t event) { });
</span><span class="lines">@@ -335,11 +329,7 @@
</span><span class="cx"> // FIXME: It would be nice if we could use OSObjectPtr for this connection as well, but we'd have to be careful
</span><span class="cx"> // not to introduce any retain cycles in the call to xpc_connection_set_event_handler below.
</span><span class="cx"> xpc_connection_t reExecConnection = xpc_connection_create(serviceName(launchOptions, true), 0);
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> xpc_connection_set_oneshot_instance(reExecConnection, instanceUUID->uuid);
</span><del>-#else
- xpc_connection_set_instance(reExecConnection, instanceUUID->uuid);
-#endif
</del><span class="cx">
</span><span class="cx"> // Keep the ProcessLauncher alive while we do the re-execing (balanced in event handler).
</span><span class="cx"> that->ref();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacPageClientImplmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -771,9 +771,7 @@
</span><span class="cx">
</span><span class="cx"> void PageClientImpl::didPerformImmediateActionHitTest(const WebHitTestResultData& result, bool contentPreventsDefault, API::Object* userData)
</span><span class="cx"> {
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> m_impl->didPerformImmediateActionHitTest(result, contentPreventsDefault, userData);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void* PageClientImpl::immediateActionAnimationControllerForHitTestResult(RefPtr<API::HitTestResult> hitTestResult, uint64_t type, RefPtr<API::Object> userData)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKImmediateActionControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.h (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.h 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.h 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKImmediateActionController_h
</span><span class="cx"> #define WKImmediateActionController_h
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> #import "WKImmediateActionTypes.h"
</span><span class="cx"> #import "WebHitTestResultData.h"
</span><span class="lines">@@ -76,6 +76,6 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-#endif // PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><ins>+#endif // PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> #endif // WKImmediateActionController_h
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKImmediateActionControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "WKImmediateActionController.h"
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> #import "APIHitTestResult.h"
</span><span class="cx"> #import "WKNSURLExtras.h"
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebInspectorProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -55,16 +55,7 @@
</span><span class="cx"> using namespace WebCore;
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090
-// The height needed to match a typical NSToolbar.
-static const CGFloat windowContentBorderThickness = 55;
-#endif
-
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> static const NSUInteger windowStyleMask = NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask | NSFullSizeContentViewWindowMask;
</span><del>-#else
-static const NSUInteger windowStyleMask = NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask | NSTexturedBackgroundWindowMask;
-#endif
</del><span class="cx">
</span><span class="cx"> // The time we keep our WebView alive before closing it and its process.
</span><span class="cx"> // Reusing the WebView improves start up time for people that jump in and out of the Inspector.
</span><span class="lines">@@ -301,12 +292,7 @@
</span><span class="cx"> [window setCollectionBehavior:([window collectionBehavior] | NSWindowCollectionBehaviorFullScreenAllowsTiling)];
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> window.titlebarAppearsTransparent = YES;
</span><del>-#else
- [window setAutorecalculatesContentBorderThickness:NO forEdge:NSMaxYEdge];
- [window setContentBorderThickness:windowContentBorderThickness forEdge:NSMaxYEdge];
-#endif
</del><span class="cx">
</span><span class="cx"> m_inspectorWindow = adoptNS(window);
</span><span class="cx">
</span><span class="lines">@@ -395,13 +381,7 @@
</span><span class="cx"> m_inspectorView = adoptNS([[WKWebInspectorWKWebView alloc] initWithFrame:initialRect configuration:configuration.get()]);
</span><span class="cx"> ASSERT(m_inspectorView);
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 10900
- m_inspectorView->_page->setDrawsBackground(false);
-#endif
-
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> [m_inspectorView _setAutomaticallyAdjustsContentInsets:NO];
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> m_inspectorProxyObjCAdapter = adoptNS([[WKWebInspectorProxyObjCAdapter alloc] initWithWebInspectorProxy:this]);
</span><span class="cx"> ASSERT(m_inspectorProxyObjCAdapter);
</span><span class="lines">@@ -806,9 +786,6 @@
</span><span class="cx">
</span><span class="cx"> void WebInspectorProxy::platformSetToolbarHeight(unsigned height)
</span><span class="cx"> {
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090
- [m_inspectorWindow setContentBorderThickness:height forEdge:NSMaxYEdge];
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspectorProxy::platformStartWindowDrag()
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -8633,7 +8633,6 @@
</span><span class="cx"> BC3DE46215A91763008D26FC /* Sources */,
</span><span class="cx"> BCDC308D15FDB99A006B6695 /* Frameworks */,
</span><span class="cx"> BC3DE46415A91763008D26FC /* Resources */,
</span><del>- E19C7DDB194A5E9100F1866F /* Add CFBundle Localization Info.plist Key */,
</del><span class="cx"> );
</span><span class="cx"> buildRules = (
</span><span class="cx"> );
</span><span class="lines">@@ -8742,7 +8741,6 @@
</span><span class="cx"> BCAE9DE5160C097400A33217 /* Sources */,
</span><span class="cx"> BCAE9DE6160C097400A33217 /* Frameworks */,
</span><span class="cx"> BCAE9DE7160C097400A33217 /* Resources */,
</span><del>- E19C7DDA194A4C9500F1866F /* Add CFBundle Localization Info.plist Key */,
</del><span class="cx"> );
</span><span class="cx"> buildRules = (
</span><span class="cx"> );
</span><span class="lines">@@ -9256,34 +9254,6 @@
</span><span class="cx"> shellPath = /bin/sh;
</span><span class="cx"> shellScript = "mkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit2\"\ncd \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit2\"\n\nexport WebKit2=\"${SRCROOT}\"\n\nif [ ! $CC ]; then\n export CC=\"`xcrun -find clang`\"\nfi\n\nif [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" -o \"${ACTION}\" = \"installhdrs\" ]; then\n make --no-builtin-rules -f \"${WebKit2}/DerivedSources.make\" -j `/usr/sbin/sysctl -n hw.activecpu` SDKROOT=${SDKROOT}\nfi\n";
</span><span class="cx"> };
</span><del>- E19C7DDA194A4C9500F1866F /* Add CFBundle Localization Info.plist Key */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputPaths = (
- );
- name = "Add CFBundle Localization Info.plist Key";
- outputPaths = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "/usr/libexec/PlistBuddy -c \"Print :$BUNDLE_LOCALIZATION_KEY\" $TARGET_BUILD_DIR/$INFOPLIST_PATH >/dev/null 2>/dev/null\nif [[ $? != 0 ]]; then\n echo \"Updating the Info.plist key\"\n /usr/libexec/PlistBuddy -c \"Delete :CFBundleAllowMixedLocalizations\" $TARGET_BUILD_DIR/$INFOPLIST_PATH 2>/dev/null\n /usr/libexec/PlistBuddy -c \"Delete :CFBundleFollowParentLocalization\" $TARGET_BUILD_DIR/$INFOPLIST_PATH 2>/dev/null\n /usr/libexec/PlistBuddy -c \"Add :$BUNDLE_LOCALIZATION_KEY bool true\" $TARGET_BUILD_DIR/$INFOPLIST_PATH\n if [[ ${PLIST_FILE_OUTPUT_FORMAT} == \"binary\" ]]; then\n plutil -convert binary1 \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\" || exit $?\n fi\n echo \"Done\"\nfi\n";
- };
- E19C7DDB194A5E9100F1866F /* Add CFBundle Localization Info.plist Key */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputPaths = (
- );
- name = "Add CFBundle Localization Info.plist Key";
- outputPaths = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "/usr/libexec/PlistBuddy -c \"Print :$BUNDLE_LOCALIZATION_KEY\" $TARGET_BUILD_DIR/$INFOPLIST_PATH >/dev/null 2>/dev/null\nif [[ $? != 0 ]]; then\n echo \"Updating the Info.plist key\"\n /usr/libexec/PlistBuddy -c \"Delete :CFBundleAllowMixedLocalizations\" $TARGET_BUILD_DIR/$INFOPLIST_PATH 2>/dev/null\n /usr/libexec/PlistBuddy -c \"Delete :CFBundleFollowParentLocalization\" $TARGET_BUILD_DIR/$INFOPLIST_PATH 2>/dev/null\n /usr/libexec/PlistBuddy -c \"Add :$BUNDLE_LOCALIZATION_KEY bool true\" $TARGET_BUILD_DIR/$INFOPLIST_PATH\n if [[ ${PLIST_FILE_OUTPUT_FORMAT} == \"binary\" ]]; then\n plutil -convert binary1 \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\" || exit $?\n fi\n echo \"Done\"\nfi\n";
- };
</del><span class="cx"> /* End PBXShellScriptBuildPhase section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXSourcesBuildPhase section */
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessEntryPointmacXPCServiceWebContentServiceInfoOSX1091010plist"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -2,6 +2,8 @@
</span><span class="cx"> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
</span><span class="cx"> <plist version="1.0">
</span><span class="cx"> <dict>
</span><ins>+ <key>CFBundleFollowParentLocalization</key>
+ <true/>
</ins><span class="cx"> <key>CFBundleGetInfoString</key>
</span><span class="cx"> <string>${BUNDLE_VERSION}, Copyright 2003-2015 Apple Inc.</string>
</span><span class="cx"> <key>CFBundleDevelopmentRegion</key>
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessEntryPointmacXPCServiceWebContentServiceInfoOSXplist"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -2,6 +2,8 @@
</span><span class="cx"> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
</span><span class="cx"> <plist version="1.0">
</span><span class="cx"> <dict>
</span><ins>+ <key>CFBundleFollowParentLocalization</key>
+ <true/>
</ins><span class="cx"> <key>CFBundleGetInfoString</key>
</span><span class="cx"> <string>${BUNDLE_VERSION}, Copyright 2003-2015 Apple Inc.</string>
</span><span class="cx"> <key>CFBundleDevelopmentRegion</key>
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessEntryPointmacXPCServiceWebContentServiceInfoiOSplist"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -2,6 +2,8 @@
</span><span class="cx"> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
</span><span class="cx"> <plist version="1.0">
</span><span class="cx"> <dict>
</span><ins>+ <key>CFBundleFollowParentLocalization</key>
+ <true/>
</ins><span class="cx"> <key>CFBundleGetInfoString</key>
</span><span class="cx"> <string>${BUNDLE_VERSION}, Copyright 2003-2015 Apple Inc.</string>
</span><span class="cx"> <key>CFBundleDevelopmentRegion</key>
</span><span class="lines">@@ -38,6 +40,6 @@
</span><span class="cx"> <key>UIBackgroundModes</key>
</span><span class="cx"> <array>
</span><span class="cx"> <string>audio</string>
</span><del>- </array>
</del><ins>+ </array>
</ins><span class="cx"> </dict>
</span><span class="cx"> </plist>
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessEntryPointmacXPCServiceWebContentServiceDevelopmentInfoOSXplist"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info-OSX.plist (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info-OSX.plist 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info-OSX.plist 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -2,6 +2,8 @@
</span><span class="cx"> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
</span><span class="cx"> <plist version="1.0">
</span><span class="cx"> <dict>
</span><ins>+ <key>CFBundleFollowParentLocalization</key>
+ <true/>
</ins><span class="cx"> <key>CFBundleGetInfoString</key>
</span><span class="cx"> <string>${BUNDLE_VERSION}, Copyright 2003-2015 Apple Inc.</string>
</span><span class="cx"> <key>CFBundleDevelopmentRegion</key>
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessEntryPointmacXPCServiceWebContentServiceDevelopmentInfoiOSplist"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info-iOS.plist (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info-iOS.plist 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info-iOS.plist 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -2,6 +2,8 @@
</span><span class="cx"> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
</span><span class="cx"> <plist version="1.0">
</span><span class="cx"> <dict>
</span><ins>+ <key>CFBundleFollowParentLocalization</key>
+ <true/>
</ins><span class="cx"> <key>CFBundleGetInfoString</key>
</span><span class="cx"> <string>${BUNDLE_VERSION}, Copyright 2003-2015 Apple Inc.</string>
</span><span class="cx"> <key>CFBundleDevelopmentRegion</key>
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageFindControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/FindController.cpp (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/FindController.cpp 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit2/WebProcess/WebPage/FindController.cpp 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -50,12 +50,6 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101000
-#define ENABLE_LEGACY_FIND_INDICATOR_STYLE 1
-#else
-#define ENABLE_LEGACY_FIND_INDICATOR_STYLE 0
-#endif
-
</del><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> static WebCore::FindOptions core(FindOptions options)
</span><span class="lines">@@ -446,17 +440,10 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(LEGACY_FIND_INDICATOR_STYLE)
</del><span class="cx"> const float shadowOffsetX = 0;
</span><del>-const float shadowOffsetY = 1;
-const float shadowBlurRadius = 2;
-const float shadowColorAlpha = 1;
-#else
-const float shadowOffsetX = 0;
</del><span class="cx"> const float shadowOffsetY = 0;
</span><span class="cx"> const float shadowBlurRadius = 1;
</span><span class="cx"> const float shadowColorAlpha = 0.5;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void FindController::drawRect(PageOverlay&, GraphicsContext& graphicsContext, const IntRect& dirtyRect)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -5009,9 +5009,6 @@
</span><span class="cx">
</span><span class="cx"> bool WebPage::synchronousMessagesShouldSpinRunLoop()
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101000
- return WebCore::AXObjectCache::accessibilityEnabled();
-#endif
</del><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesscomappleWebProcesssbin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -194,10 +194,8 @@
</span><span class="cx"> (global-name "com.apple.speech.speechsynthesisd")
</span><span class="cx"> (global-name "com.apple.speech.synthesis.console")
</span><span class="cx"> (global-name "com.apple.coreservices.launchservicesd")
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> (global-name "com.apple.iconservices")
</span><span class="cx"> (global-name "com.apple.iconservices.store")
</span><del>-#endif
</del><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
</span><span class="cx"> (global-name "com.apple.nesessionmanager.flow-divert-token")
</span><span class="cx"> #endif
</span><span class="lines">@@ -277,11 +275,7 @@
</span><span class="cx"> (deny file-write-xattr (xattr "com.apple.quarantine") (with no-log))
</span><span class="cx">
</span><span class="cx"> ;; Reserve a namespace for additional protected extended attributes.
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED > 1090
</del><span class="cx"> (deny file-read-xattr file-write-xattr (xattr-regex #"^com\.apple\.security\.private\."))
</span><del>-#else
-(deny file-read-xattr file-write-xattr (xattr #"^com\.apple\.security\.private\."))
-#endif
</del><span class="cx">
</span><span class="cx"> (deny file-read* file-write* (with no-log)
</span><span class="cx"> ;; FIXME: Should be removed after <rdar://problem/10463881> is fixed.
</span></span></pre></div>
<a id="trunkSourceWebKit2configh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/config.h (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/config.h 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/WebKit2/config.h 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -79,13 +79,13 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #ifndef HAVE_SEC_ACCESS_CONTROL
</span><del>-#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000)
</del><ins>+#if PLATFORM(IOS) || PLATFORM(MAC)
</ins><span class="cx"> #define HAVE_SEC_ACCESS_CONTROL 1
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #ifndef HAVE_OS_ACTIVITY
</span><del>-#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000)
</del><ins>+#if PLATFORM(IOS) || PLATFORM(MAC)
</ins><span class="cx"> #define HAVE_OS_ACTIVITY 1
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourcebmallocChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/ChangeLog (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/ChangeLog 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/bmalloc/ChangeLog 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-12-19 Dan Bernstein <mitz@apple.com>
+
+ [Mac] WebKit contains dead source code for OS X Mavericks and earlier
+ https://bugs.webkit.org/show_bug.cgi?id=152462
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/DebugRelease.xcconfig: Removed definition of MACOSX_DEPLOYMENT_TARGET for
+ OS X 10.9.
+
</ins><span class="cx"> 2015-12-03 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove Objective-C GC support
</span></span></pre></div>
<a id="trunkSourcebmallocConfigurationsDebugReleasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/Configurations/DebugRelease.xcconfig (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/Configurations/DebugRelease.xcconfig 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Source/bmalloc/Configurations/DebugRelease.xcconfig 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> ONLY_ACTIVE_ARCH = YES;
</span><span class="cx">
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><del>-MACOSX_DEPLOYMENT_TARGET_macosx_1090 = 10.9;
</del><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Tools/ChangeLog 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-12-19 Dan Bernstein <mitz@apple.com>
+
+ [Mac] WebKit contains dead source code for OS X Mavericks and earlier
+ https://bugs.webkit.org/show_bug.cgi?id=152462
+
+ Reviewed by Alexey Proskuryakov.
+
+ - Removed definitions of MACOSX_DEPLOYMENT_TARGET and WEBKIT_SYSTEM_INTERFACE_LIBRARY for
+ OS X 10.9:
+
+ * DumpRenderTree/mac/Configurations/DebugRelease.xcconfig:
+ * LayoutTestRelay/Configurations/DebugRelease.xcconfig:
+ * MiniBrowser/Configurations/DebugRelease.xcconfig:
+ * TestWebKitAPI/Configurations/DebugRelease.xcconfig:
+ * WebKitTestRunner/Configurations/DebugRelease.xcconfig:
+
+ - Simplified expressions involving __MAC_OS_X_VERSION_MIN_REQUIRED and removed code that was
+ never getting compiled:
+
+ * DumpRenderTree/mac/TextInputController.m:
+ * MiniBrowser/mac/BrowserWindowController.m:
+ * TestWebKitAPI/Tests/mac/AttributedString.mm:
+ * WebKitTestRunner/mac/EventSenderProxy.mm:
+
</ins><span class="cx"> 2015-12-18 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, add WebKitGTK+ Bugzilla email to committers list
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacConfigurationsDebugReleasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -28,13 +28,11 @@
</span><span class="cx"> ONLY_ACTIVE_ARCH = YES;
</span><span class="cx">
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET[sdk=macosx*] = $(MACOSX_DEPLOYMENT_TARGET_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><del>-MACOSX_DEPLOYMENT_TARGET_macosx_1090 = 10.9;
</del><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
</span><span class="cx">
</span><span class="cx"> WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=macosx*] = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><del>-WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1090 = WebKitSystemInterfaceMavericks;
</del><span class="cx"> WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000 = WebKitSystemInterfaceYosemite;
</span><span class="cx"> WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101100 = WebKitSystemInterfaceElCapitan;
</span><span class="cx"> WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101200 = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101100);
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacTextInputControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/TextInputController.m (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/TextInputController.m 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Tools/DumpRenderTree/mac/TextInputController.m 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -36,14 +36,12 @@
</span><span class="cx"> #import <AppKit/NSInputManager.h>
</span><span class="cx"> #import <AppKit/NSTextAlternatives.h>
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> #define SUPPORT_INSERTION_UNDO_GROUPING
</span><span class="cx"> #if __has_include(<AppKit/NSTextInputContext_Private.h>)
</span><span class="cx"> #import <AppKit/NSTextInputContext_Private.h>
</span><span class="cx"> #else
</span><span class="cx"> NSString *NSTextInsertionUndoableAttributeName;
</span><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #import <WebKit/WebDocument.h>
</span><span class="cx"> #import <WebKit/WebFrame.h>
</span></span></pre></div>
<a id="trunkToolsLayoutTestRelayConfigurationsDebugReleasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/LayoutTestRelay/Configurations/DebugRelease.xcconfig (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/LayoutTestRelay/Configurations/DebugRelease.xcconfig 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Tools/LayoutTestRelay/Configurations/DebugRelease.xcconfig 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -26,7 +26,6 @@
</span><span class="cx"> ARCHS = $(ARCHS_STANDARD_64_BIT);
</span><span class="cx">
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
</span><del>-MACOSX_DEPLOYMENT_TARGET_1090 = 10.9;
</del><span class="cx"> MACOSX_DEPLOYMENT_TARGET_101000 = 10.10;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_101100 = 10.11;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_101200 = 10.12;
</span></span></pre></div>
<a id="trunkToolsMiniBrowserConfigurationsDebugReleasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx"> ONLY_ACTIVE_ARCH = YES;
</span><span class="cx">
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
</span><del>-MACOSX_DEPLOYMENT_TARGET_1090 = 10.9;
</del><span class="cx"> MACOSX_DEPLOYMENT_TARGET_101000 = 10.10;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_101100 = 10.11;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_101200 = 10.12;
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacBrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/BrowserWindowController.m (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/BrowserWindowController.m 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Tools/MiniBrowser/mac/BrowserWindowController.m 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -39,9 +39,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)windowDidLoad
</span><span class="cx"> {
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> self.window.styleMask |= NSFullSizeContentViewWindowMask;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> [super windowDidLoad];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIConfigurationsDebugReleasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx"> ONLY_ACTIVE_ARCH = YES;
</span><span class="cx">
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
</span><del>-MACOSX_DEPLOYMENT_TARGET_1090 = 10.9;
</del><span class="cx"> MACOSX_DEPLOYMENT_TARGET_101000 = 10.10;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_101100 = 10.11;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_101200 = 10.12;
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsmacAttributedStringmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/mac/AttributedString.mm (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/mac/AttributedString.mm 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/AttributedString.mm 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -38,26 +38,14 @@
</span><span class="cx"> return [(NSView <NSTextInput> *)[[[webView mainFrame] frameView] documentView] attributedSubstringFromRange:range];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090
-static NSAttributedString *attributedString(WKView *wkView, NSRange range)
-{
- NSRange actualRange;
- return [wkView attributedSubstringForProposedRange:range actualRange:&actualRange];
-}
-#endif
-
</del><span class="cx"> class AttributedStringTest_CustomFont : public WebKitAgnosticTest {
</span><span class="cx"> public:
</span><span class="cx"> template <typename View> void runSyncTest(View);
</span><span class="cx">
</span><span class="cx"> // WebKitAgnosticTest
</span><span class="cx"> virtual void didLoadURL(WebView *webView) { runSyncTest(webView); }
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090
- virtual void didLoadURL(WKView *wkView) { runSyncTest(wkView); }
-#else
</del><span class="cx"> // FIXME: Reimplement the test using async NSTextInputClient interface.
</span><span class="cx"> virtual void didLoadURL(WKView *wkView) { }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> virtual NSURL *url() const { return [[NSBundle mainBundle] URLForResource:@"attributedStringCustomFont" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]; }
</span><span class="cx"> };
</span><span class="lines">@@ -74,25 +62,14 @@
</span><span class="cx"> runWebKit1Test();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090
-TEST_F(AttributedStringTest_CustomFont, WebKit2)
-{
- runWebKit2Test();
-}
-#endif
-
</del><span class="cx"> class AttributedStringTest_Strikethrough : public WebKitAgnosticTest {
</span><span class="cx"> public:
</span><span class="cx"> template <typename View> void runSyncTest(View);
</span><span class="cx">
</span><span class="cx"> // WebKitAgnosticTest
</span><span class="cx"> virtual void didLoadURL(WebView *webView) { runSyncTest(webView); }
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090
- virtual void didLoadURL(WKView *wkView) { runSyncTest(wkView); }
-#else
</del><span class="cx"> // FIXME: Reimplement the test using async NSTextInputClient interface.
</span><span class="cx"> virtual void didLoadURL(WKView *wkView) { }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> virtual NSURL *url() const { return [[NSBundle mainBundle] URLForResource:@"attributedStringStrikethrough" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]; }
</span><span class="cx"> };
</span><span class="lines">@@ -115,11 +92,4 @@
</span><span class="cx"> runWebKit1Test();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090
-TEST_F(AttributedStringTest_Strikethrough, WebKit2)
-{
- runWebKit2Test();
-}
-#endif
-
</del><span class="cx"> } // namespace TestWebKitAPI
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerConfigurationsDebugReleasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx"> ONLY_ACTIVE_ARCH = YES;
</span><span class="cx">
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
</span><del>-MACOSX_DEPLOYMENT_TARGET_1090 = 10.9;
</del><span class="cx"> MACOSX_DEPLOYMENT_TARGET_101000 = 10.10;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_101100 = 10.11;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_101200 = 10.12;
</span><span class="lines">@@ -36,7 +35,6 @@
</span><span class="cx"> WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphoneos*] = WebKitSystemInterfaceIOSDevice$(IPHONEOS_DEPLOYMENT_TARGET);
</span><span class="cx"> WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphonesimulator*] = WebKitSystemInterfaceIOSSimulator$(IPHONEOS_DEPLOYMENT_TARGET);
</span><span class="cx"> WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=macosx*] = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><del>-WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1090 = WebKitSystemInterfaceMavericks;
</del><span class="cx"> WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000 = WebKitSystemInterfaceYosemite;
</span><span class="cx"> WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101100 = WebKitSystemInterfaceElCapitan;
</span><span class="cx"> WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101200 = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101100);
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnermacEventSenderProxymm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/mac/EventSenderProxy.mm (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/mac/EventSenderProxy.mm 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/Tools/WebKitTestRunner/mac/EventSenderProxy.mm 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -46,7 +46,6 @@
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #if defined(__LP64__)
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> struct WKTRCGSEventRecord {
</span><span class="cx"> char offset1[150];
</span><span class="cx"> uint8_t phase;
</span><span class="lines">@@ -55,17 +54,7 @@
</span><span class="cx"> float deltaY;
</span><span class="cx"> char offset3[76];
</span><span class="cx"> } __attribute__((packed));
</span><del>-#else
-struct WKTRCGSEventRecord {
- char offset1[154];
- uint8_t phase;
- char offset2[5];
- float deltaX;
- float deltaY;
- char offset3[80];
-} __attribute__((packed));
</del><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> @interface EventSenderSyntheticEvent : NSEvent {
</span><span class="cx"> @public
</span><span class="lines">@@ -133,17 +122,10 @@
</span><span class="cx"> return _eventSender_type;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> - (NSEventSubtype)subtype
</span><span class="cx"> {
</span><span class="cx"> return (NSEventSubtype)_eventSender_subtype;
</span><span class="cx"> }
</span><del>-#else
-- (short)subtype
-{
- return _eventSender_subtype;
-}
-#endif
</del><span class="cx">
</span><span class="cx"> - (NSPoint)locationInWindow
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkWebKitLibrariesChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKitLibraries/ChangeLog (194317 => 194318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitLibraries/ChangeLog 2015-12-19 21:42:18 UTC (rev 194317)
+++ trunk/WebKitLibraries/ChangeLog 2015-12-20 06:27:04 UTC (rev 194318)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-12-19 Dan Bernstein <mitz@apple.com>
+
+ [Mac] WebKit contains dead source code for OS X Mavericks and earlier
+ https://bugs.webkit.org/show_bug.cgi?id=152462
+
+ Reviewed by Alexey Proskuryakov.
+
+ * libWebKitSystemInterfaceMavericks.a: Removed.
+
</ins><span class="cx"> 2015-12-16 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> [Fetch API] Add fetch API compile time flag
</span></span></pre></div>
<a id="trunkWebKitLibrarieslibWebKitSystemInterfaceMavericksa"></a>
<div class="binary"><h4>Deleted: trunk/WebKitLibraries/libWebKitSystemInterfaceMavericks.a</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
</div>
</body>
</html>