<!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>[179373] trunk/Source/WebKit2</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/179373">179373</a></dd>
<dt>Author</dt> <dd>bdakin@apple.com</dd>
<dt>Date</dt> <dd>2015-01-29 15:19:41 -0800 (Thu, 29 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove more Mountain Lion code from WebKit2
https://bugs.webkit.org/show_bug.cgi?id=141052
Reviewed by Tim Horton.
* NetworkProcess/NetworkResourceLoader.cpp:
(WebKit::NetworkResourceLoader::sendBufferMaybeAborting):
* NetworkProcess/NetworkResourceLoader.h:
* NetworkProcess/cocoa/NetworkProcessCocoa.mm:
(WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
* NetworkProcess/mac/NetworkDiskCacheMonitor.mm:
* NetworkProcess/mac/NetworkResourceLoaderMac.mm:
(WebKit::NetworkResourceLoader::willCacheResponseAsync):
* Platform/IPC/MessageDecoder.cpp:
* Platform/IPC/MessageDecoder.h:
* Platform/IPC/mac/ConnectionMac.mm:
(IPC::ConnectionTerminationWatchdog::watchdogTimerFired):
(IPC::Connection::open):
(IPC::Connection::receiveSourceEventHandler):
(IPC::Connection::kill):
* Platform/IPC/mac/ImportanceAssertion.h:
* PluginProcess/mac/PluginProcessMac.mm:
(WebKit::PluginProcess::initializeProcessName):
* Shared/WebPreferencesDefinitions.h:
* Shared/mac/ChildProcessMac.mm:
(WebKit::initializeTimerCoalescingPolicy):
(WebKit::ChildProcess::setApplicationIsDaemon):
(WebKit::ChildProcess::platformInitialize):
(WebKit::ChildProcess::setQOS):
* Shared/mac/CookieStorageShim.mm:
(WebKit::CookieStorageShim::initialize):
* UIProcess/API/mac/WKView.mm:
(-[WKView addWindowObserversForWindow:]):
(-[WKView removeWindowObservers]):
(-[WKView _windowDidChangeOcclusionState:]):
* UIProcess/Cocoa/NavigationState.mm:
(WebKit::NavigationState::LoaderClient::didReceiveAuthenticationChallengeInFrame):
* UIProcess/Cocoa/WebProcessPoolCocoa.mm:
(WebKit::registerUserDefaultsIfNeeded):
(WebKit::WebProcessPool::platformInitializeWebProcess):
(WebKit::WebProcessPool::registerNotificationObservers):
(WebKit::WebProcessPool::unregisterNotificationObservers):
(WebKit::privateBrowsingSession):
(WebKit::WebProcessPool::isURLKnownHSTSHost):
(WebKit::WebProcessPool::resetHSTSHosts):
* UIProcess/Databases/mac/DatabaseProcessProxyMac.mm:
(WebKit::shouldUseXPC):
* UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
(WebKit::shouldUseXPC):
* UIProcess/WebProcessPool.h:
* UIProcess/mac/TextCheckerMac.mm:
(WebKit::shouldAutomaticQuoteSubstitutionBeEnabled):
(WebKit::shouldAutomaticDashSubstitutionBeEnabled):
(WebKit::TextChecker::didChangeAutomaticQuoteSubstitutionEnabled):
(WebKit::TextChecker::didChangeAutomaticDashSubstitutionEnabled):
* UIProcess/mac/ViewGestureControllerMac.mm:
(WebKit::ViewGestureController::applyDebuggingPropertiesToSwipeViews):
* UIProcess/mac/WebProcessProxyMac.mm:
(WebKit::shouldUseXPC):
* WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
(InitWebCoreSystemInterface):
* WebProcess/cocoa/WebProcessCocoa.mm:
(WebKit::WebProcess::updateActivePages):
* WebProcess/com.apple.WebProcess.sb.in:
* config.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoaderh">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscocoaNetworkProcessCocoamm">trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessmacNetworkDiskCacheMonitormm">trunk/Source/WebKit2/NetworkProcess/mac/NetworkDiskCacheMonitor.mm</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessmacNetworkResourceLoaderMacmm">trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCMessageDecodercpp">trunk/Source/WebKit2/Platform/IPC/MessageDecoder.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCMessageDecoderh">trunk/Source/WebKit2/Platform/IPC/MessageDecoder.h</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="#trunkSourceWebKit2PluginProcessmacPluginProcessMacmm">trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPreferencesDefinitionsh">trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h</a></li>
<li><a href="#trunkSourceWebKit2SharedmacChildProcessMacmm">trunk/Source/WebKit2/Shared/mac/ChildProcessMac.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedmacCookieStorageShimmm">trunk/Source/WebKit2/Shared/mac/CookieStorageShim.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKViewmm">trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaNavigationStatemm">trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebProcessPoolCocoamm">trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDatabasesmacDatabaseProcessProxyMacmm">trunk/Source/WebKit2/UIProcess/Databases/mac/DatabaseProcessProxyMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsmacPluginProcessProxyMacmm">trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolh">trunk/Source/WebKit2/UIProcess/WebProcessPool.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacTextCheckerMacmm">trunk/Source/WebKit2/UIProcess/mac/TextCheckerMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacViewGestureControllerMacmm">trunk/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebProcessProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebProcessProxyMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportmacWebSystemInterfacemm">trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm">trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (179372 => 179373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-01-29 23:17:18 UTC (rev 179372)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-29 23:19:41 UTC (rev 179373)
</span><span class="lines">@@ -1,3 +1,71 @@
</span><ins>+2015-01-29 Beth Dakin <bdakin@apple.com>
+
+ Remove more Mountain Lion code from WebKit2
+ https://bugs.webkit.org/show_bug.cgi?id=141052
+
+ Reviewed by Tim Horton.
+
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ (WebKit::NetworkResourceLoader::sendBufferMaybeAborting):
+ * NetworkProcess/NetworkResourceLoader.h:
+ * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+ (WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
+ * NetworkProcess/mac/NetworkDiskCacheMonitor.mm:
+ * NetworkProcess/mac/NetworkResourceLoaderMac.mm:
+ (WebKit::NetworkResourceLoader::willCacheResponseAsync):
+ * Platform/IPC/MessageDecoder.cpp:
+ * Platform/IPC/MessageDecoder.h:
+ * Platform/IPC/mac/ConnectionMac.mm:
+ (IPC::ConnectionTerminationWatchdog::watchdogTimerFired):
+ (IPC::Connection::open):
+ (IPC::Connection::receiveSourceEventHandler):
+ (IPC::Connection::kill):
+ * Platform/IPC/mac/ImportanceAssertion.h:
+ * PluginProcess/mac/PluginProcessMac.mm:
+ (WebKit::PluginProcess::initializeProcessName):
+ * Shared/WebPreferencesDefinitions.h:
+ * Shared/mac/ChildProcessMac.mm:
+ (WebKit::initializeTimerCoalescingPolicy):
+ (WebKit::ChildProcess::setApplicationIsDaemon):
+ (WebKit::ChildProcess::platformInitialize):
+ (WebKit::ChildProcess::setQOS):
+ * Shared/mac/CookieStorageShim.mm:
+ (WebKit::CookieStorageShim::initialize):
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView addWindowObserversForWindow:]):
+ (-[WKView removeWindowObservers]):
+ (-[WKView _windowDidChangeOcclusionState:]):
+ * UIProcess/Cocoa/NavigationState.mm:
+ (WebKit::NavigationState::LoaderClient::didReceiveAuthenticationChallengeInFrame):
+ * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+ (WebKit::registerUserDefaultsIfNeeded):
+ (WebKit::WebProcessPool::platformInitializeWebProcess):
+ (WebKit::WebProcessPool::registerNotificationObservers):
+ (WebKit::WebProcessPool::unregisterNotificationObservers):
+ (WebKit::privateBrowsingSession):
+ (WebKit::WebProcessPool::isURLKnownHSTSHost):
+ (WebKit::WebProcessPool::resetHSTSHosts):
+ * UIProcess/Databases/mac/DatabaseProcessProxyMac.mm:
+ (WebKit::shouldUseXPC):
+ * UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
+ (WebKit::shouldUseXPC):
+ * UIProcess/WebProcessPool.h:
+ * UIProcess/mac/TextCheckerMac.mm:
+ (WebKit::shouldAutomaticQuoteSubstitutionBeEnabled):
+ (WebKit::shouldAutomaticDashSubstitutionBeEnabled):
+ (WebKit::TextChecker::didChangeAutomaticQuoteSubstitutionEnabled):
+ (WebKit::TextChecker::didChangeAutomaticDashSubstitutionEnabled):
+ * UIProcess/mac/ViewGestureControllerMac.mm:
+ (WebKit::ViewGestureController::applyDebuggingPropertiesToSwipeViews):
+ * UIProcess/mac/WebProcessProxyMac.mm:
+ (WebKit::shouldUseXPC):
+ * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
+ (InitWebCoreSystemInterface):
+ * WebProcess/cocoa/WebProcessCocoa.mm:
+ (WebKit::WebProcess::updateActivePages):
+ * WebProcess/com.apple.WebProcess.sb.in:
+ * config.h:
+
</ins><span class="cx"> 2015-01-29 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove support for screen font substitution
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (179372 => 179373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2015-01-29 23:17:18 UTC (rev 179372)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2015-01-29 23:19:41 UTC (rev 179373)
</span><span class="lines">@@ -522,7 +522,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!isSynchronous());
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> ShareableResource::Handle shareableResourceHandle;
</span><span class="cx"> NetworkResourceLoader::tryGetShareableHandleFromSharedBuffer(shareableResourceHandle, buffer);
</span><span class="cx"> if (!shareableResourceHandle.isNull()) {
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h (179372 => 179373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2015-01-29 23:17:18 UTC (rev 179372)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2015-01-29 23:19:41 UTC (rev 179373)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> // Message handlers.
</span><span class="cx"> void didReceiveNetworkResourceLoaderMessage(IPC::Connection&, IPC::MessageDecoder&);
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> static void tryGetShareableHandleFromCFURLCachedResponse(ShareableResource::Handle&, CFCachedURLResponseRef);
</span><span class="cx"> static void tryGetShareableHandleFromSharedBuffer(ShareableResource::Handle&, WebCore::SharedBuffer&);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscocoaNetworkProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm (179372 => 179373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2015-01-29 23:17:18 UTC (rev 179372)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2015-01-29 23:19:41 UTC (rev 179373)
</span><span class="lines">@@ -83,13 +83,11 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> RetainPtr<CFURLCacheRef> cache = adoptCF(CFURLCacheCopySharedURLCache());
</span><span class="cx"> if (!cache)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> _CFURLCacheSetMinSizeForVMCachedResource(cache.get(), NetworkResourceLoader::fileBackedResourceMinimumSize());
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static uint64_t memorySize()
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessmacNetworkDiskCacheMonitormm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/mac/NetworkDiskCacheMonitor.mm (179372 => 179373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/mac/NetworkDiskCacheMonitor.mm 2015-01-29 23:17:18 UTC (rev 179372)
+++ trunk/Source/WebKit2/NetworkProcess/mac/NetworkDiskCacheMonitor.mm 2015-01-29 23:19:41 UTC (rev 179373)
</span><span class="lines">@@ -32,8 +32,6 @@
</span><span class="cx"> #import "WebCoreArgumentCoders.h"
</span><span class="cx"> #import <WebCore/CFNetworkSPI.h>
</span><span class="cx">
</span><del>-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
-
</del><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -75,5 +73,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessmacNetworkResourceLoaderMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm (179372 => 179373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm 2015-01-29 23:17:18 UTC (rev 179372)
+++ trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm 2015-01-29 23:19:41 UTC (rev 179373)
</span><span class="lines">@@ -38,8 +38,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
-
</del><span class="cx"> static void tryGetShareableHandleFromCFData(ShareableResource::Handle& handle, CFDataRef data)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<SharedMemory> sharedMemory = SharedMemory::createFromVMBuffer((void*)CFDataGetBytePtr(data), CFDataGetLength(data));
</span><span class="lines">@@ -79,8 +77,6 @@
</span><span class="cx"> tryGetShareableHandleFromCFData(handle, data);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // IOS || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
-
</del><span class="cx"> size_t NetworkResourceLoader::fileBackedResourceMinimumSize()
</span><span class="cx"> {
</span><span class="cx"> return SharedMemory::systemPageSize();
</span><span class="lines">@@ -104,10 +100,8 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT_UNUSED(handle, handle == m_handle);
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> if (m_bytesReceived >= fileBackedResourceMinimumSize())
</span><span class="cx"> NetworkDiskCacheMonitor::monitorFileBackingStoreCreation([nsResponse _CFCachedURLResponse], this);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> m_handle->continueWillCacheResponse(nsResponse);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCMessageDecodercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/MessageDecoder.cpp (179372 => 179373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/MessageDecoder.cpp 2015-01-29 23:17:18 UTC (rev 179372)
+++ trunk/Source/WebKit2/Platform/IPC/MessageDecoder.cpp 2015-01-29 23:19:41 UTC (rev 179373)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #include "MessageFlags.h"
</span><span class="cx"> #include "StringReference.h"
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> #include "ImportanceAssertion.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> return m_messageFlags & DispatchMessageWhenWaitingForSyncReply;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> void MessageDecoder::setImportanceAssertion(std::unique_ptr<ImportanceAssertion> assertion)
</span><span class="cx"> {
</span><span class="cx"> m_importanceAssertion = WTF::move(assertion);
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCMessageDecoderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/MessageDecoder.h (179372 => 179373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/MessageDecoder.h 2015-01-29 23:17:18 UTC (rev 179372)
+++ trunk/Source/WebKit2/Platform/IPC/MessageDecoder.h 2015-01-29 23:19:41 UTC (rev 179373)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> bool isSyncMessage() const;
</span><span class="cx"> bool shouldDispatchMessageWhenWaitingForSyncReply() const;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> void setImportanceAssertion(std::unique_ptr<ImportanceAssertion>);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> std::unique_ptr<MessageRecorder::MessageProcessingToken> m_processingToken;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> std::unique_ptr<ImportanceAssertion> m_importanceAssertion;
</span><span class="cx"> #endif
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCmacConnectionMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm (179372 => 179373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm 2015-01-29 23:17:18 UTC (rev 179372)
+++ trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm 2015-01-29 23:19:41 UTC (rev 179373)
</span><span class="lines">@@ -87,9 +87,7 @@
</span><span class="cx">
</span><span class="cx"> void watchdogTimerFired()
</span><span class="cx"> {
</span><del>-#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
</del><span class="cx"> xpc_connection_kill(m_xpcConnection.get(), SIGKILL);
</span><del>-#endif
</del><span class="cx"> delete this;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -188,7 +186,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span><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) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><ins>+#elif PLATFORM(MAC)
</ins><span class="cx"> mach_port_set_attributes(mach_task_self(), m_receivePort, MACH_PORT_IMPORTANCE_RECEIVER, (mach_port_info_t)0, 0);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -475,7 +473,7 @@
</span><span class="cx"> std::unique_ptr<MessageDecoder> decoder = createMessageDecoder(header);
</span><span class="cx"> ASSERT(decoder);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> decoder->setImportanceAssertion(std::make_unique<ImportanceAssertion>(header));
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -585,12 +583,10 @@
</span><span class="cx">
</span><span class="cx"> bool Connection::kill()
</span><span class="cx"> {
</span><del>-#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
</del><span class="cx"> if (m_xpcConnection) {
</span><span class="cx"> xpc_connection_kill(m_xpcConnection.get(), SIGKILL);
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> return false;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCmacImportanceAssertionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/mac/ImportanceAssertion.h (179372 => 179373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/mac/ImportanceAssertion.h 2015-01-29 23:17:18 UTC (rev 179372)
+++ trunk/Source/WebKit2/Platform/IPC/mac/ImportanceAssertion.h 2015-01-29 23:19:41 UTC (rev 179373)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef ImportanceAssertion_h
</span><span class="cx"> #define ImportanceAssertion_h
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> #if __has_include(<libproc_internal.h>)
</span><span class="cx"> #include <libproc_internal.h>
</span><span class="lines">@@ -71,6 +71,6 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><ins>+#endif // PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> #endif // ImportanceAssertion_h
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessmacPluginProcessMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm (179372 => 179373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm 2015-01-29 23:17:18 UTC (rev 179372)
+++ trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm 2015-01-29 23:19:41 UTC (rev 179373)
</span><span class="lines">@@ -449,10 +449,8 @@
</span><span class="cx"> {
</span><span class="cx"> NSString *applicationName = [NSString stringWithFormat:WEB_UI_STRING("%@ (%@ Internet plug-in)", "visible name of the plug-in host process. The first argument is the plug-in name and the second argument is the application name."), [[(NSString *)m_pluginPath lastPathComponent] stringByDeletingPathExtension], (NSString *)parameters.uiProcessName];
</span><span class="cx"> WKSetVisibleApplicationName((CFStringRef)applicationName);
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> if (!m_pluginBundleIdentifier.isEmpty())
</span><span class="cx"> WKSetApplicationInformationItem(kLSPlugInBundleIdentifierKey, m_pluginBundleIdentifier.createCFString().get());
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PluginProcess::initializeSandbox(const ChildProcessInitializationParameters& parameters, SandboxInitializationParameters& sandboxParameters)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPreferencesDefinitionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (179372 => 179373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2015-01-29 23:17:18 UTC (rev 179372)
+++ trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2015-01-29 23:19:41 UTC (rev 179373)
</span><span class="lines">@@ -42,10 +42,12 @@
</span><span class="cx"> #define DEFAULT_HIDDEN_PAGE_DOM_TIMER_THROTTLING_ENABLED true
</span><span class="cx"> #define DEFAULT_HIDDEN_PAGE_CSS_ANIMATION_SUSPENSION_ENABLED true
</span><span class="cx"> #define DEFAULT_PDFPLUGIN_ENABLED true
</span><ins>+#define DEFAULT_SCREEN_FONT_SUBSTITUTION_ENABLED false
</ins><span class="cx"> #else
</span><span class="cx"> #define DEFAULT_HIDDEN_PAGE_DOM_TIMER_THROTTLING_ENABLED false
</span><span class="cx"> #define DEFAULT_HIDDEN_PAGE_CSS_ANIMATION_SUSPENSION_ENABLED false
</span><span class="cx"> #define DEFAULT_PDFPLUGIN_ENABLED false
</span><ins>+#define DEFAULT_SCREEN_FONT_SUBSTITUTION_ENABLED true
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacChildProcessMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/ChildProcessMac.mm (179372 => 179373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/ChildProcessMac.mm 2015-01-29 23:17:18 UTC (rev 179372)
+++ trunk/Source/WebKit2/Shared/mac/ChildProcessMac.mm 2015-01-29 23:19:41 UTC (rev 179373)
</span><span class="lines">@@ -51,11 +51,9 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> typedef bool (^LSServerConnectionAllowedBlock) ( CFDictionaryRef optionsRef );
</span><span class="cx"> extern "C" void _LSSetApplicationLaunchServicesServerConnectionStatus(uint64_t flags, LSServerConnectionAllowedBlock block);
</span><span class="cx"> extern "C" CFDictionaryRef _LSApplicationCheckIn(int sessionID, CFDictionaryRef applicationInfo);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> extern "C" OSStatus SetApplicationIsDaemon(Boolean isDaemon);
</span><span class="cx">
</span><span class="lines">@@ -63,7 +61,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> static void initializeTimerCoalescingPolicy()
</span><span class="cx"> {
</span><span class="cx"> // Set task_latency and task_throughput QOS tiers as appropriate for a visible application.
</span><span class="lines">@@ -71,25 +68,19 @@
</span><span class="cx"> kern_return_t kr = task_policy_set(mach_task_self(), TASK_BASE_QOS_POLICY, (task_policy_t)&qosinfo, TASK_QOS_POLICY_COUNT);
</span><span class="cx"> ASSERT_UNUSED(kr, kr == KERN_SUCCESS);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void ChildProcess::setApplicationIsDaemon()
</span><span class="cx"> {
</span><span class="cx"> OSStatus error = SetApplicationIsDaemon(true);
</span><span class="cx"> ASSERT_UNUSED(error, error == noErr);
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> _LSSetApplicationLaunchServicesServerConnectionStatus(0, 0);
</span><span class="cx"> RetainPtr<CFDictionaryRef> unused = _LSApplicationCheckIn(-2, CFBundleGetInfoDictionary(CFBundleGetMainBundle()));
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ChildProcess::platformInitialize()
</span><span class="cx"> {
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> initializeTimerCoalescingPolicy();
</span><del>-#endif
-
</del><span class="cx"> [[NSFileManager defaultManager] changeCurrentDirectoryPath:[[NSBundle mainBundle] bundlePath]];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -197,7 +188,6 @@
</span><span class="cx">
</span><span class="cx"> void ChildProcess::setQOS(int latencyQOS, int throughputQOS)
</span><span class="cx"> {
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> if (!latencyQOS && !throughputQOS)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -207,10 +197,6 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> task_policy_set(mach_task_self(), TASK_OVERRIDE_QOS_POLICY, (task_policy_t)&qosinfo, TASK_QOS_POLICY_COUNT);
</span><del>-#else
- UNUSED_PARAM(latencyQOS);
- UNUSED_PARAM(throughputQOS);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacCookieStorageShimmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/CookieStorageShim.mm (179372 => 179373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/CookieStorageShim.mm 2015-01-29 23:17:18 UTC (rev 179372)
+++ trunk/Source/WebKit2/Shared/mac/CookieStorageShim.mm 2015-01-29 23:19:41 UTC (rev 179373)
</span><span class="lines">@@ -52,9 +52,7 @@
</span><span class="cx">
</span><span class="cx"> @interface WKNSURLSessionLocal : NSObject
</span><span class="cx"> - (CFDictionaryRef) _copyCookiesForRequestUsingAllAppropriateStorageSemantics:(CFURLRequestRef) request;
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> - (void)_getCookieHeadersForTask:(NSURLSessionTask*)task completionHandler:(void (^)(CFDictionaryRef))completionHandler;
</span><del>-#endif
</del><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -98,13 +96,11 @@
</span><span class="cx"> method_exchangeImplementations(original, replacement);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> if (Method original = class_getInstanceMethod(__NSURLSessionLocalClass, @selector(_getCookieHeadersForTask:completionHandler:))) {
</span><span class="cx"> Method replacement = class_getInstanceMethod([WKNSURLSessionLocal class], @selector(_getCookieHeadersForTask:completionHandler:));
</span><span class="cx"> ASSERT(replacement);
</span><span class="cx"> method_exchangeImplementations(original, replacement);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><span class="lines">@@ -115,7 +111,6 @@
</span><span class="cx"> return WebKit::webKitCookieStorageCopyRequestHeaderFieldsForURL(nullptr, CFURLRequestGetURL(request));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> using CompletionHandlerBlock = void(^)(CFDictionaryRef);
</span><span class="cx"> - (void)_getCookieHeadersForTask:(NSURLSessionTask*)task completionHandler:(CompletionHandlerBlock)completionHandler
</span><span class="cx"> {
</span><span class="lines">@@ -129,7 +124,7 @@
</span><span class="cx"> [completionHandlerCopy release];
</span><span class="cx"> });
</span><span class="cx"> }
</span><del>-#endif
</del><ins>+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(NETWORK_PROCESS)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (179372 => 179373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-01-29 23:17:18 UTC (rev 179372)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-01-29 23:19:41 UTC (rev 179373)
</span><span class="lines">@@ -2487,10 +2487,8 @@
</span><span class="cx"> name:NSWindowDidChangeScreenNotification object:window];
</span><span class="cx"> [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_windowDidChangeLayerHosting:)
</span><span class="cx"> name:@"_NSWindowDidChangeContentsHostedInLayerSurfaceNotification" object:window];
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_windowDidChangeOcclusionState:)
</span><span class="cx"> name:NSWindowDidChangeOcclusionStateNotification object:window];
</span><del>-#endif
</del><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span><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><span class="lines">@@ -2516,9 +2514,7 @@
</span><span class="cx"> [[NSNotificationCenter defaultCenter] removeObserver:self name:NSWindowDidChangeBackingPropertiesNotification object:window];
</span><span class="cx"> [[NSNotificationCenter defaultCenter] removeObserver:self name:NSWindowDidChangeScreenNotification object:window];
</span><span class="cx"> [[NSNotificationCenter defaultCenter] removeObserver:self name:@"_NSWindowDidChangeContentsHostedInLayerSurfaceNotification" object:window];
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> [[NSNotificationCenter defaultCenter] removeObserver:self name:NSWindowDidChangeOcclusionStateNotification object:window];
</span><del>-#endif
</del><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span><span class="cx"> [window removeObserver:self forKeyPath:@"contentLayoutRect" context:keyValueObservingContext];
</span><span class="cx"> [window removeObserver:self forKeyPath:@"titlebarAppearsTransparent" context:keyValueObservingContext];
</span><span class="lines">@@ -2668,12 +2664,10 @@
</span><span class="cx"> _data->_page->setIntrinsicDeviceScaleFactor(newBackingScaleFactor);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> - (void)_windowDidChangeOcclusionState:(NSNotification *)notification
</span><span class="cx"> {
</span><span class="cx"> _data->_page->viewStateDidChange(ViewState::IsVisible);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> - (void)drawRect:(NSRect)rect
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaNavigationStatemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm (179372 => 179373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2015-01-29 23:17:18 UTC (rev 179372)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2015-01-29 23:19:41 UTC (rev 179373)
</span><span class="lines">@@ -574,7 +574,6 @@
</span><span class="cx">
</span><span class="cx"> void NavigationState::LoaderClient::didReceiveAuthenticationChallengeInFrame(WebPageProxy&, WebFrameProxy&, AuthenticationChallengeProxy* authenticationChallenge)
</span><span class="cx"> {
</span><del>-#if !defined(__MAC_OS_X_VERSION_MIN_REQUIRED) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> if (m_navigationState.m_navigationDelegateMethods.webViewDidReceiveAuthenticationChallengeCompletionHandler) {
</span><span class="cx"> auto navigationDelegate = m_navigationState.m_navigationDelegate.get();
</span><span class="cx"> if (!navigationDelegate) {
</span><span class="lines">@@ -617,7 +616,6 @@
</span><span class="cx"> ];
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> if (!m_navigationState.m_navigationDelegateMethods.webViewDidReceiveAuthenticationChallenge)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebProcessPoolCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm (179372 => 179373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2015-01-29 23:17:18 UTC (rev 179372)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2015-01-29 23:19:41 UTC (rev 179373)
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> [registrationDictionary setObject:[NSNumber numberWithBool:YES] forKey:WebKitJSCJITEnabledDefaultsKey];
</span><span class="cx"> [registrationDictionary setObject:[NSNumber numberWithBool:YES] forKey:WebKitJSCFTLJITEnabledDefaultsKey];
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><ins>+#if PLATFORM(IOS)
</ins><span class="cx"> [registrationDictionary setObject:[NSNumber numberWithBool:YES] forKey:WebKitKerningAndLigaturesEnabledByDefaultDefaultsKey];
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -418,7 +418,6 @@
</span><span class="cx"> textCheckerStateChanged();
</span><span class="cx"> }];
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> m_automaticQuoteSubstitutionNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSSpellCheckerDidChangeAutomaticQuoteSubstitutionNotification object:nil queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *notification) {
</span><span class="cx"> TextChecker::didChangeAutomaticQuoteSubstitutionEnabled();
</span><span class="cx"> textCheckerStateChanged();
</span><span class="lines">@@ -428,7 +427,6 @@
</span><span class="cx"> TextChecker::didChangeAutomaticDashSubstitutionEnabled();
</span><span class="cx"> textCheckerStateChanged();
</span><span class="cx"> }];
</span><del>-#endif
</del><span class="cx"> #endif // !PLATFORM(IOS)
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -438,14 +436,11 @@
</span><span class="cx"> [[NSNotificationCenter defaultCenter] removeObserver:m_enhancedAccessibilityObserver.get()];
</span><span class="cx"> [[NSNotificationCenter defaultCenter] removeObserver:m_automaticTextReplacementNotificationObserver.get()];
</span><span class="cx"> [[NSNotificationCenter defaultCenter] removeObserver:m_automaticSpellingCorrectionNotificationObserver.get()];
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> [[NSNotificationCenter defaultCenter] removeObserver:m_automaticQuoteSubstitutionNotificationObserver.get()];
</span><span class="cx"> [[NSNotificationCenter defaultCenter] removeObserver:m_automaticDashSubstitutionNotificationObserver.get()];
</span><del>-#endif
</del><span class="cx"> #endif // !PLATFORM(IOS)
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> static CFURLStorageSessionRef privateBrowsingSession()
</span><span class="cx"> {
</span><span class="cx"> static CFURLStorageSessionRef session;
</span><span class="lines">@@ -458,25 +453,18 @@
</span><span class="cx">
</span><span class="cx"> return session;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> bool WebProcessPool::isURLKnownHSTSHost(const String& urlString, bool privateBrowsingEnabled) const
</span><span class="cx"> {
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> RetainPtr<CFURLRef> url = URL(URL(), urlString).createCFURL();
</span><span class="cx">
</span><span class="cx"> return _CFNetworkIsKnownHSTSHostWithSession(url.get(), privateBrowsingEnabled ? privateBrowsingSession() : nullptr);
</span><del>-#else
- return false;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcessPool::resetHSTSHosts()
</span><span class="cx"> {
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> _CFNetworkResetHSTSHostsWithSession(nullptr);
</span><span class="cx"> _CFNetworkResetHSTSHostsWithSession(privateBrowsingSession());
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int networkProcessLatencyQOS()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDatabasesmacDatabaseProcessProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Databases/mac/DatabaseProcessProxyMac.mm (179372 => 179373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Databases/mac/DatabaseProcessProxyMac.mm 2015-01-29 23:17:18 UTC (rev 179372)
+++ trunk/Source/WebKit2/UIProcess/Databases/mac/DatabaseProcessProxyMac.mm 2015-01-29 23:19:41 UTC (rev 179373)
</span><span class="lines">@@ -37,11 +37,7 @@
</span><span class="cx"> if (id value = [[NSUserDefaults standardUserDefaults] objectForKey:@"WebKit2UseXPCServiceForWebProcess"])
</span><span class="cx"> return [value boolValue];
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> return true;
</span><del>-#else
- return false;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DatabaseProcessProxy::platformGetLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsmacPluginProcessProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm (179372 => 179373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm 2015-01-29 23:17:18 UTC (rev 179372)
+++ trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm 2015-01-29 23:19:41 UTC (rev 179373)
</span><span class="lines">@@ -139,11 +139,7 @@
</span><span class="cx"> if (launchOptions.executableHeap)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> return true;
</span><del>-#else
- return false;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PluginProcessProxy::platformGetLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions, const PluginProcessAttributes& pluginProcessAttributes)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.h (179372 => 179373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2015-01-29 23:17:18 UTC (rev 179372)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2015-01-29 23:19:41 UTC (rev 179373)
</span><span class="lines">@@ -489,11 +489,9 @@
</span><span class="cx"> RetainPtr<NSObject> m_enhancedAccessibilityObserver;
</span><span class="cx"> RetainPtr<NSObject> m_automaticTextReplacementNotificationObserver;
</span><span class="cx"> RetainPtr<NSObject> m_automaticSpellingCorrectionNotificationObserver;
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> RetainPtr<NSObject> m_automaticQuoteSubstitutionNotificationObserver;
</span><span class="cx"> RetainPtr<NSObject> m_automaticDashSubstitutionNotificationObserver;
</span><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> String m_overrideApplicationCacheDirectory;
</span><span class="cx"> String m_overrideIconDatabasePath;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacTextCheckerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/TextCheckerMac.mm (179372 => 179373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/TextCheckerMac.mm 2015-01-29 23:17:18 UTC (rev 179372)
+++ trunk/Source/WebKit2/UIProcess/mac/TextCheckerMac.mm 2015-01-29 23:19:41 UTC (rev 179373)
</span><span class="lines">@@ -71,20 +71,18 @@
</span><span class="cx"> static bool shouldAutomaticQuoteSubstitutionBeEnabled()
</span><span class="cx"> {
</span><span class="cx"> NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> if (![defaults objectForKey:WebAutomaticQuoteSubstitutionEnabled])
</span><span class="cx"> return [NSSpellChecker isAutomaticQuoteSubstitutionEnabled];
</span><del>-#endif
</del><ins>+
</ins><span class="cx"> return [defaults boolForKey:WebAutomaticQuoteSubstitutionEnabled];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool shouldAutomaticDashSubstitutionBeEnabled()
</span><span class="cx"> {
</span><span class="cx"> NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> if (![defaults objectForKey:WebAutomaticDashSubstitutionEnabled])
</span><span class="cx"> return [NSSpellChecker isAutomaticDashSubstitutionEnabled];
</span><del>-#endif
</del><ins>+
</ins><span class="cx"> return [defaults boolForKey:WebAutomaticDashSubstitutionEnabled];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -245,18 +243,14 @@
</span><span class="cx">
</span><span class="cx"> void TextChecker::didChangeAutomaticQuoteSubstitutionEnabled()
</span><span class="cx"> {
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> textCheckerState.isAutomaticQuoteSubstitutionEnabled = shouldAutomaticQuoteSubstitutionBeEnabled();
</span><span class="cx"> [[NSSpellChecker sharedSpellChecker] updatePanels];
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextChecker::didChangeAutomaticDashSubstitutionEnabled()
</span><span class="cx"> {
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> textCheckerState.isAutomaticDashSubstitutionEnabled = shouldAutomaticDashSubstitutionBeEnabled();
</span><span class="cx"> [[NSSpellChecker sharedSpellChecker] updatePanels];
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool TextChecker::substitutionsPanelIsShowing()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacViewGestureControllerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm (179372 => 179373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm 2015-01-29 23:17:18 UTC (rev 179372)
+++ trunk/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm 2015-01-29 23:19:41 UTC (rev 179373)
</span><span class="lines">@@ -495,10 +495,8 @@
</span><span class="cx">
</span><span class="cx"> void ViewGestureController::applyDebuggingPropertiesToSwipeViews()
</span><span class="cx"> {
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> CAFilter* filter = [CAFilter filterWithType:kCAFilterColorInvert];
</span><span class="cx"> [m_swipeLayer setFilters:@[ filter ]];
</span><del>-#endif
</del><span class="cx"> [m_swipeLayer setBackgroundColor:[NSColor blueColor].CGColor];
</span><span class="cx"> [m_swipeLayer setBorderColor:[NSColor yellowColor].CGColor];
</span><span class="cx"> [m_swipeLayer setBorderWidth:4];
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebProcessProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebProcessProxyMac.mm (179372 => 179373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebProcessProxyMac.mm 2015-01-29 23:17:18 UTC (rev 179372)
+++ trunk/Source/WebKit2/UIProcess/mac/WebProcessProxyMac.mm 2015-01-29 23:19:41 UTC (rev 179373)
</span><span class="lines">@@ -41,12 +41,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (id value = [[NSUserDefaults standardUserDefaults] objectForKey:@"WebKit2UseXPCServiceForWebProcess"])
</span><span class="cx"> return [value boolValue];
</span><del>-
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> return true;
</span><del>-#else
- return false;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcessProxy::platformGetLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportmacWebSystemInterfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm (179372 => 179373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2015-01-29 23:17:18 UTC (rev 179372)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2015-01-29 23:19:41 UTC (rev 179373)
</span><span class="lines">@@ -166,11 +166,8 @@
</span><span class="cx">
</span><span class="cx"> INIT(DestroyRenderingResources);
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> INIT(ExecutableWasLinkedOnOrBeforeLion);
</span><del>-#endif
-
-#if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> INIT(CreateMemoryStatusPressureCriticalDispatchOnMainQueue);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (179372 => 179373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2015-01-29 23:17:18 UTC (rev 179372)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2015-01-29 23:19:41 UTC (rev 179373)
</span><span class="lines">@@ -267,7 +267,7 @@
</span><span class="cx">
</span><span class="cx"> void WebProcess::updateActivePages()
</span><span class="cx"> {
</span><del>-#if USE(APPKIT) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><ins>+#if USE(APPKIT)
</ins><span class="cx"> RetainPtr<CFMutableArrayRef> activePageURLs = adoptCF(CFArrayCreateMutable(0, 0, &kCFTypeArrayCallBacks));
</span><span class="cx"> for (const auto& iter: m_pageMap) {
</span><span class="cx"> WebPage* page = iter.value.get();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesscomappleWebProcesssbin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in (179372 => 179373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in 2015-01-29 23:17:18 UTC (rev 179372)
+++ trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in 2015-01-29 23:19:41 UTC (rev 179373)
</span><span class="lines">@@ -117,10 +117,8 @@
</span><span class="cx"> (allow mach-register (global-name-regex #"^_oglprof_attach_<[0-9]+>$")))
</span><span class="cx">
</span><span class="cx"> ;; MediaAccessibility
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> (allow file-read* (home-literal "/Library/Preferences/com.apple.mediaaccessibility.plist"))
</span><span class="cx"> (allow file-read* file-write* (home-literal "/Library/Preferences/com.apple.mediaaccessibility.public.plist"))
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> (if (positive? (string-length (param "DARWIN_USER_CACHE_DIR")))
</span><span class="cx"> (allow file* (subpath (param "DARWIN_USER_CACHE_DIR"))))
</span><span class="lines">@@ -189,9 +187,7 @@
</span><span class="cx"> (global-name "com.apple.PowerManagement.control")
</span><span class="cx"> (global-name "com.apple.speech.speechsynthesisd")
</span><span class="cx"> (global-name "com.apple.speech.synthesis.console")
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> (global-name "com.apple.coreservices.launchservicesd")
</span><del>-#endif
</del><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span><span class="cx"> (global-name "com.apple.iconservices")
</span><span class="cx"> (global-name "com.apple.iconservices.store")
</span></span></pre></div>
<a id="trunkSourceWebKit2configh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/config.h (179372 => 179373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/config.h 2015-01-29 23:17:18 UTC (rev 179372)
+++ trunk/Source/WebKit2/config.h 2015-01-29 23:19:41 UTC (rev 179373)
</span><span class="lines">@@ -69,8 +69,8 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> #ifndef HAVE_WINDOW_SERVER_OCCLUSION_NOTIFICATIONS
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> #define HAVE_WINDOW_SERVER_OCCLUSION_NOTIFICATIONS 1
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>