<!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>[179294] trunk/Source</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/179294">179294</a></dd>
<dt>Author</dt> <dd>bdakin@apple.com</dd>
<dt>Date</dt> <dd>2015-01-28 14:22:16 -0800 (Wed, 28 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove Mountain Lion code from WebKit and WebKit2
https://bugs.webkit.org/show_bug.cgi?id=141010
Reviewed by Sam Weinig.
Source/WebKit/mac:
* DOM/WebDOMOperations.mm:
(toNSEventPhase):
* WebView/WebHTMLView.mm:
(isQuickLookEvent):
Source/WebKit2:
* NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in:
* PluginProcess/EntryPoint/mac/LegacyProcess/PluginProcessMain.mm:
* Shared/mac/ChildProcessMac.mm:
(WebKit::ChildProcess::initializeSandbox):
* Shared/mac/WebEventFactory.mm:
(WebKit::phaseForEvent):
* UIProcess/API/mac/WKView.mm:
(-[WKView quickLookWithEvent:]):
(-[WKView updateLayer]):
(-[WKView createFullScreenWindow]):
* UIProcess/Network/NetworkProcessProxy.cpp:
(WebKit::NetworkProcessProxy::didFinishLaunching):
* UIProcess/Network/mac/NetworkProcessProxyMac.mm:
(WebKit::shouldUseXPC):
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::didFinishLaunching):
* UIProcess/mac/PageClientImpl.mm:
(WebKit::PageClientImpl::isViewVisible):
* WebKit2Prefix.h:
* WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
(InitWebCoreSystemInterface):
* WebProcess/com.apple.WebProcess.sb.in:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacDOMWebDOMOperationsmm">trunk/Source/WebKit/mac/DOM/WebDOMOperations.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLViewmm">trunk/Source/WebKit/mac/WebView/WebHTMLView.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessmaccomappleWebKitNetworkProcesssbin">trunk/Source/WebKit2/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessEntryPointmacLegacyProcessPluginProcessMainmm">trunk/Source/WebKit2/PluginProcess/EntryPoint/mac/LegacyProcess/PluginProcessMain.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedmacChildProcessMacmm">trunk/Source/WebKit2/Shared/mac/ChildProcessMac.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedmacWebEventFactorymm">trunk/Source/WebKit2/Shared/mac/WebEventFactory.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKViewmm">trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkNetworkProcessProxycpp">trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkmacNetworkProcessProxyMacmm">trunk/Source/WebKit2/UIProcess/Network/mac/NetworkProcessProxyMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxycpp">trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacPageClientImplmm">trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm</a></li>
<li><a href="#trunkSourceWebKit2WebKit2Prefixh">trunk/Source/WebKit2/WebKit2Prefix.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportmacWebSystemInterfacemm">trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcesscomappleWebProcesssbin">trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (179293 => 179294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-01-28 22:20:36 UTC (rev 179293)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-01-28 22:22:16 UTC (rev 179294)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-01-28 Beth Dakin <bdakin@apple.com>
+
+ Remove Mountain Lion code from WebKit and WebKit2
+ https://bugs.webkit.org/show_bug.cgi?id=141010
+
+ Reviewed by Sam Weinig.
+
+ * DOM/WebDOMOperations.mm:
+ (toNSEventPhase):
+ * WebView/WebHTMLView.mm:
+ (isQuickLookEvent):
+
</ins><span class="cx"> 2015-01-28 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><span class="cx"> Move ASan flag settings from DebugRelease.xcconfig to Base.xcconfig
</span></span></pre></div>
<a id="trunkSourceWebKitmacDOMWebDOMOperationsmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/WebDOMOperations.mm (179293 => 179294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/WebDOMOperations.mm 2015-01-28 22:20:36 UTC (rev 179293)
+++ trunk/Source/WebKit/mac/DOM/WebDOMOperations.mm 2015-01-28 22:22:16 UTC (rev 179294)
</span><span class="lines">@@ -242,10 +242,8 @@
</span><span class="cx"> phase |= NSEventPhaseEnded;
</span><span class="cx"> if (platformPhase & PlatformWheelEventPhaseCancelled)
</span><span class="cx"> phase |= NSEventPhaseCancelled;
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</del><span class="cx"> if (platformPhase & PlatformWheelEventPhaseMayBegin)
</span><span class="cx"> phase |= NSEventPhaseMayBegin;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> return static_cast<NSEventPhase>(phase);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (179293 => 179294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-01-28 22:20:36 UTC (rev 179293)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-01-28 22:22:16 UTC (rev 179294)
</span><span class="lines">@@ -1502,12 +1502,8 @@
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> static BOOL isQuickLookEvent(NSEvent *event)
</span><span class="cx"> {
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</del><span class="cx"> const int kCGSEventSystemSubtypeHotKeyCombinationReleased = 9;
</span><span class="cx"> return [event type] == NSSystemDefined && [event subtype] == kCGSEventSystemSubtypeHotKeyCombinationReleased && [event data1] == 'lkup';
</span><del>-#else
- return NO;
-#endif
</del><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -5349,7 +5345,7 @@
</span><span class="cx"> return haveWebCoreFrame;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</del><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> - (BOOL)_automaticFocusRingDisabled
</span><span class="cx"> {
</span><span class="cx"> // The default state for _automaticFocusRingDisabled is NO, which prevents focus rings
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (179293 => 179294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-01-28 22:20:36 UTC (rev 179293)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-28 22:22:16 UTC (rev 179294)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2015-01-28 Beth Dakin <bdakin@apple.com>
+
+ Remove Mountain Lion code from WebKit and WebKit2
+ https://bugs.webkit.org/show_bug.cgi?id=141010
+
+ Reviewed by Sam Weinig.
+
+ * NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in:
+ * PluginProcess/EntryPoint/mac/LegacyProcess/PluginProcessMain.mm:
+ * Shared/mac/ChildProcessMac.mm:
+ (WebKit::ChildProcess::initializeSandbox):
+ * Shared/mac/WebEventFactory.mm:
+ (WebKit::phaseForEvent):
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView quickLookWithEvent:]):
+ (-[WKView updateLayer]):
+ (-[WKView createFullScreenWindow]):
+ * UIProcess/Network/NetworkProcessProxy.cpp:
+ (WebKit::NetworkProcessProxy::didFinishLaunching):
+ * UIProcess/Network/mac/NetworkProcessProxyMac.mm:
+ (WebKit::shouldUseXPC):
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::didFinishLaunching):
+ * UIProcess/mac/PageClientImpl.mm:
+ (WebKit::PageClientImpl::isViewVisible):
+ * WebKit2Prefix.h:
+ * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
+ (InitWebCoreSystemInterface):
+ * WebProcess/com.apple.WebProcess.sb.in:
+
</ins><span class="cx"> 2015-01-28 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Crash when closing inspected page
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessmaccomappleWebKitNetworkProcesssbin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in (179293 => 179294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in 2015-01-28 22:20:36 UTC (rev 179293)
+++ trunk/Source/WebKit2/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in 2015-01-28 22:22:16 UTC (rev 179294)
</span><span class="lines">@@ -71,11 +71,7 @@
</span><span class="cx"> (read-only-and-issue-extensions (extension "com.apple.app-sandbox.read"))
</span><span class="cx"> (read-write-and-issue-extensions (extension "com.apple.app-sandbox.read-write"))
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</del><span class="cx"> (allow file-read* file-write* (subpath (param "DARWIN_USER_CACHE_DIR")))
</span><del>-#else
-(allow file-read* file-write* (subpath (string-append (param "DARWIN_USER_CACHE_DIR") "/mds")))
-#endif
</del><span class="cx">
</span><span class="cx"> (allow file-read* file-write* (subpath (param "DARWIN_USER_TEMP_DIR")))
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessEntryPointmacLegacyProcessPluginProcessMainmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/EntryPoint/mac/LegacyProcess/PluginProcessMain.mm (179293 => 179294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/EntryPoint/mac/LegacyProcess/PluginProcessMain.mm 2015-01-28 22:20:36 UTC (rev 179293)
+++ trunk/Source/WebKit2/PluginProcess/EntryPoint/mac/LegacyProcess/PluginProcessMain.mm 2015-01-28 22:22:16 UTC (rev 179294)
</span><span class="lines">@@ -108,7 +108,6 @@
</span><span class="cx">
</span><span class="cx"> virtual void doPostRunWork() override
</span><span class="cx"> {
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</del><span class="cx"> // If we have private temporary and cache directories, clean them up.
</span><span class="cx"> if (getenv("DIRHELPER_USER_DIR_SUFFIX")) {
</span><span class="cx"> char darwinDirectory[PATH_MAX];
</span><span class="lines">@@ -117,7 +116,6 @@
</span><span class="cx"> if (confstr(_CS_DARWIN_USER_CACHE_DIR, darwinDirectory, sizeof(darwinDirectory)))
</span><span class="cx"> [[NSFileManager defaultManager] removeItemAtPath:[[NSFileManager defaultManager] stringWithFileSystemRepresentation:darwinDirectory length:strlen(darwinDirectory)] error:nil];
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacChildProcessMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/ChildProcessMac.mm (179293 => 179294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/ChildProcessMac.mm 2015-01-28 22:20:36 UTC (rev 179293)
+++ trunk/Source/WebKit2/Shared/mac/ChildProcessMac.mm 2015-01-28 22:22:16 UTC (rev 179294)
</span><span class="lines">@@ -113,7 +113,6 @@
</span><span class="cx"> String osVersion = osVersionParts[0] + '.' + osVersionParts[1];
</span><span class="cx"> sandboxParameters.addParameter("_OS_VERSION", osVersion.utf8().data());
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</del><span class="cx"> // Use private temporary and cache directories.
</span><span class="cx"> setenv("DIRHELPER_USER_DIR_SUFFIX", fileSystemRepresentation(sandboxParameters.systemDirectorySuffix()).data(), 0);
</span><span class="cx"> char temporaryDirectory[PATH_MAX];
</span><span class="lines">@@ -122,7 +121,6 @@
</span><span class="cx"> exit(EX_NOPERM);
</span><span class="cx"> }
</span><span class="cx"> setenv("TMPDIR", temporaryDirectory, 1);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> sandboxParameters.addPathParameter("WEBKIT2_FRAMEWORK_DIR", [[webkit2Bundle bundlePath] stringByDeletingLastPathComponent]);
</span><span class="cx"> sandboxParameters.addConfDirectoryParameter("DARWIN_USER_TEMP_DIR", _CS_DARWIN_USER_TEMP_DIR);
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacWebEventFactorymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/WebEventFactory.mm (179293 => 179294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/WebEventFactory.mm 2015-01-28 22:20:36 UTC (rev 179293)
+++ trunk/Source/WebKit2/Shared/mac/WebEventFactory.mm 2015-01-28 22:22:16 UTC (rev 179294)
</span><span class="lines">@@ -215,10 +215,8 @@
</span><span class="cx"> phase |= WebWheelEvent::PhaseEnded;
</span><span class="cx"> if ([event phase] & NSEventPhaseCancelled)
</span><span class="cx"> phase |= WebWheelEvent::PhaseCancelled;
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</del><span class="cx"> if ([event phase] & NSEventPhaseMayBegin)
</span><span class="cx"> phase |= WebWheelEvent::PhaseMayBegin;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> return static_cast<WebWheelEvent::Phase>(phase);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (179293 => 179294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-01-28 22:20:36 UTC (rev 179293)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-01-28 22:22:16 UTC (rev 179294)
</span><span class="lines">@@ -2850,7 +2850,6 @@
</span><span class="cx"> _data->_resizeScrollOffset = NSZeroSize;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</del><span class="cx"> - (void)quickLookWithEvent:(NSEvent *)event
</span><span class="cx"> {
</span><span class="cx"> if (_data->_ignoresNonWheelEvents)
</span><span class="lines">@@ -2859,7 +2858,6 @@
</span><span class="cx"> NSPoint locationInViewCoordinates = [self convertPoint:[event locationInWindow] fromView:nil];
</span><span class="cx"> _data->_page->performDictionaryLookupAtLocation(FloatPoint(locationInViewCoordinates.x, locationInViewCoordinates.y));
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> - (std::unique_ptr<WebKit::DrawingAreaProxy>)_createDrawingAreaProxy
</span><span class="cx"> {
</span><span class="lines">@@ -3813,7 +3811,6 @@
</span><span class="cx"> return [self initWithFrame:frame processPool:processPool configuration:webPageConfiguration webView:nil];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</del><span class="cx"> - (BOOL)wantsUpdateLayer
</span><span class="cx"> {
</span><span class="cx"> return YES;
</span><span class="lines">@@ -3835,7 +3832,6 @@
</span><span class="cx"> if (DrawingAreaProxy* drawingArea = _data->_page->drawingArea())
</span><span class="cx"> drawingArea->waitForPossibleGeometryUpdate();
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> - (WKPageRef)pageRef
</span><span class="cx"> {
</span><span class="lines">@@ -3996,13 +3992,8 @@
</span><span class="cx"> - (NSWindow *)createFullScreenWindow
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1080
- NSRect contentRect = NSZeroRect;
</del><ins>+ return [[[WebCoreFullScreenWindow alloc] initWithContentRect:[[NSScreen mainScreen] frame] styleMask:(NSBorderlessWindowMask | NSResizableWindowMask) backing:NSBackingStoreBuffered defer:NO] autorelease];
</ins><span class="cx"> #else
</span><del>- NSRect contentRect = [[NSScreen mainScreen] frame];
-#endif
- return [[[WebCoreFullScreenWindow alloc] initWithContentRect:contentRect styleMask:(NSBorderlessWindowMask | NSResizableWindowMask) backing:NSBackingStoreBuffered defer:NO] autorelease];
-#else
</del><span class="cx"> return nil;
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkNetworkProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp (179293 => 179294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2015-01-28 22:20:36 UTC (rev 179293)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2015-01-28 22:22:16 UTC (rev 179294)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> #include "SecItemShimProxy.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) && USE(XPC_SERVICES)
</del><ins>+#if PLATFORM(IOS)
</ins><span class="cx"> #include <wtf/spi/darwin/XPCSPI.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -224,7 +224,7 @@
</span><span class="cx"> setProcessSuppressionEnabled(true);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) && USE(XPC_SERVICES)
</del><ins>+#if PLATFORM(IOS)
</ins><span class="cx"> if (xpc_connection_t connection = this->connection()->xpcConnection())
</span><span class="cx"> m_assertion = std::make_unique<ProcessAssertion>(xpc_connection_get_pid(connection), AssertionState::Foreground);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkmacNetworkProcessProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/mac/NetworkProcessProxyMac.mm (179293 => 179294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/mac/NetworkProcessProxyMac.mm 2015-01-28 22:20:36 UTC (rev 179293)
+++ trunk/Source/WebKit2/UIProcess/Network/mac/NetworkProcessProxyMac.mm 2015-01-28 22:22:16 UTC (rev 179294)
</span><span class="lines">@@ -47,11 +47,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 USE(XPC_SERVICES)
</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 NetworkProcessProxy::platformGetLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (179293 => 179294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2015-01-28 22:20:36 UTC (rev 179293)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2015-01-28 22:22:16 UTC (rev 179294)
</span><span class="lines">@@ -503,7 +503,7 @@
</span><span class="cx">
</span><span class="cx"> m_processPool->processDidFinishLaunching(this);
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) && USE(XPC_SERVICES)
</del><ins>+#if PLATFORM(IOS)
</ins><span class="cx"> xpc_connection_t xpcConnection = connection()->xpcConnection();
</span><span class="cx"> ASSERT(xpcConnection);
</span><span class="cx"> m_throttler->didConnnectToProcess(xpc_connection_get_pid(xpcConnection));
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacPageClientImplmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm (179293 => 179294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2015-01-28 22:20:36 UTC (rev 179293)
+++ trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2015-01-28 22:22:16 UTC (rev 179294)
</span><span class="lines">@@ -234,20 +234,11 @@
</span><span class="cx"> if (!activeViewWindow.isVisible)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1080
- // Mountain Lion and previous do not support occlusion notifications, and as such will
- // continue to report as "visible" when not on the active space.
- if (!activeViewWindow.isOnActiveSpace)
- return false;
-#endif
-
</del><span class="cx"> if (activeView.isHiddenOrHasHiddenAncestor)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> if ([m_wkView windowOcclusionDetectionEnabled] && (activeViewWindow.occlusionState & NSWindowOcclusionStateVisible) != NSWindowOcclusionStateVisible)
</span><span class="cx"> return false;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2Prefixh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2Prefix.h (179293 => 179294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2Prefix.h 2015-01-28 22:20:36 UTC (rev 179293)
+++ trunk/Source/WebKit2/WebKit2Prefix.h 2015-01-28 22:22:16 UTC (rev 179294)
</span><span class="lines">@@ -56,20 +56,6 @@
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !(defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED == 1080)
-#define WTF_USE_XPC_SERVICES 1
-#endif
-
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED == 1080 && defined(__OBJC__)
-@interface NSKeyedArchiver (WKDetails)
-- (void)setRequiresSecureCoding:(BOOL)requiresSecureCoding;
-@end
-
-@interface NSKeyedUnarchiver (WKDetails)
-- (void)setRequiresSecureCoding:(BOOL)requiresSecureCoding;
-@end
-#endif
-
</del><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> #define ENABLE_NETWORK_PROCESS 1
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportmacWebSystemInterfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm (179293 => 179294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2015-01-28 22:20:36 UTC (rev 179293)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2015-01-28 22:22:16 UTC (rev 179294)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> INIT(CGContextGetShouldSmoothFonts);
</span><span class="cx"> INIT(CGPatternCreateWithImageAndTransform);
</span><span class="cx"> INIT(CGContextResetClip);
</span><del>-#if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</del><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> INIT(CGContextDrawsWithCorrectShadowOffsets);
</span><span class="cx"> #endif
</span><span class="cx"> INIT(CopyCONNECTProxyResponse);
</span><span class="lines">@@ -166,7 +166,7 @@
</span><span class="cx">
</span><span class="cx"> INIT(DestroyRenderingResources);
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</del><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> INIT(ExecutableWasLinkedOnOrBeforeLion);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -185,7 +185,7 @@
</span><span class="cx"> INIT(GetVendorNameForNavigator);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</del><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> INIT(NSElasticDeltaForTimeDelta);
</span><span class="cx"> INIT(NSElasticDeltaForReboundDelta);
</span><span class="cx"> INIT(NSReboundDeltaForElasticDelta);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesscomappleWebProcesssbin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in (179293 => 179294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in 2015-01-28 22:20:36 UTC (rev 179293)
+++ trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in 2015-01-28 22:22:16 UTC (rev 179294)
</span><span class="lines">@@ -122,13 +122,8 @@
</span><span class="cx"> (allow file-read* file-write* (home-literal "/Library/Preferences/com.apple.mediaaccessibility.public.plist"))
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</del><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><del>-#else
-(if (positive? (string-length (param "DARWIN_USER_CACHE_DIR")))
- (allow file* (subpath (string-append (param "DARWIN_USER_CACHE_DIR") "/mds"))))
-#endif
</del><span class="cx">
</span><span class="cx"> (if (positive? (string-length (param "DARWIN_USER_TEMP_DIR")))
</span><span class="cx"> (allow file* (subpath (param "DARWIN_USER_TEMP_DIR"))))
</span><span class="lines">@@ -141,8 +136,6 @@
</span><span class="cx"> (iokit-user-client-class "IOAudioControlUserClient")
</span><span class="cx"> (iokit-user-client-class "IOAudioEngineUserClient"))
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
-
</del><span class="cx"> ;; cookied.
</span><span class="cx"> ;; FIXME: Update for <rdar://problem/13642852>.
</span><span class="cx"> (allow ipc-posix-shm-read-data
</span><span class="lines">@@ -170,8 +163,6 @@
</span><span class="cx"> (allow ipc-posix-shm-read* ipc-posix-shm-write-data
</span><span class="cx"> (ipc-posix-name-regex #"^AudioIO"))
</span><span class="cx">
</span><del>-#endif
-
</del><span class="cx"> ;; Remote Web Inspector
</span><span class="cx"> (allow mach-lookup
</span><span class="cx"> (global-name "com.apple.webinspector"))
</span><span class="lines">@@ -224,10 +215,8 @@
</span><span class="cx"> (home-literal "/Library/Application Support/SyncServices/Local/ClientsWithChanges/com.apple.Keychain")
</span><span class="cx"> (home-literal "/Library/Preferences/com.apple.security.plist")
</span><span class="cx"> (home-literal "/Library/Preferences/com.apple.security.revocation.plist"))
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</del><span class="cx"> (allow ipc-posix-shm-read* ipc-posix-shm-write-data
</span><span class="cx"> (ipc-posix-name "com.apple.AppleDatabaseChanged"))
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> ;; CoreFoundation. We don't import com.apple.corefoundation.sb, because it allows unnecessary access to pasteboard.
</span><span class="cx"> (allow mach-lookup
</span><span class="lines">@@ -290,13 +279,6 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> (deny file-read* file-write* (with no-log)
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1080
- (home-literal "/Library/Caches/Cache.db") ;; <rdar://problem/9422957>
-#endif
-#if __MAC_OS_X_VERSION_MIN_REQUIRED == 1080
- (home-subpath "/Library/Caches/com.apple.WebProcess") ;; <rdar://problem/12656814>
-#endif
-
</del><span class="cx"> ;; FIXME: Should be removed after <rdar://problem/10463881> is fixed.
</span><span class="cx"> (home-literal "/Library/Preferences/com.apple.LaunchServices.QuarantineEventsV2")
</span><span class="cx"> (home-literal "/Library/Preferences/com.apple.LaunchServices.QuarantineEventsV2-journal"))
</span></span></pre>
</div>
</div>
</body>
</html>