<!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>[164358] 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/164358">164358</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2014-02-19 00:12:24 -0800 (Wed, 19 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simplify PLATFORM(MAC) && !PLATFORM(IOS) and similar expressions
https://bugs.webkit.org/show_bug.cgi?id=129029
Reviewed by Mark Rowe.
Source/JavaScriptCore:
* API/JSValueRef.cpp:
(JSValueUnprotect):
* jit/ExecutableAllocatorFixedVMPool.cpp:
Source/WebCore:
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::boundsForVisiblePositionRange):
(WebCore::AccessibilityRenderObject::visiblePositionForPoint):
* config.h:
* editing/Editor.cpp:
(WebCore::Editor::copyURL):
* editing/EditorCommand.cpp:
(WebCore::createCommandMap):
* editing/TypingCommand.cpp:
(WebCore::TypingCommand::markMisspellingsAfterTyping):
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::loadArchive):
* page/AlternativeTextClient.h:
* page/EventHandler.cpp:
* page/PageGroup.cpp:
(WebCore::PageGroup::captionPreferences):
* page/scrolling/ScrollingStateScrollingNode.cpp:
(WebCore::ScrollingStateScrollingNode::ScrollingStateScrollingNode):
* page/scrolling/ScrollingStateScrollingNode.h:
* page/scrolling/ScrollingTree.h:
* page/scrolling/ThreadedScrollingTree.cpp:
* page/scrolling/ThreadedScrollingTree.h:
* platform/DragData.h:
* platform/FileSystem.cpp:
* platform/MemoryPressureHandler.cpp:
* platform/Pasteboard.h:
* platform/PlatformMouseEvent.h:
(WebCore::PlatformMouseEvent::PlatformMouseEvent):
* platform/PlatformPasteboard.h:
* platform/PlatformScreen.h:
* platform/Scrollbar.cpp:
(WebCore::Scrollbar::supportsUpdateOnSecondaryThread):
* platform/SuddenTermination.h:
* platform/ThreadGlobalData.cpp:
(WebCore::ThreadGlobalData::ThreadGlobalData):
(WebCore::ThreadGlobalData::destroy):
* platform/ThreadGlobalData.h:
* platform/audio/mac/AudioDestinationMac.cpp:
* platform/audio/mac/AudioFileReaderMac.cpp:
* platform/audio/mac/AudioSessionMac.cpp:
* platform/graphics/DisplayRefreshMonitor.h:
* platform/graphics/FloatPoint.h:
* platform/graphics/FloatRect.h:
* platform/graphics/FloatSize.h:
* platform/graphics/IntRect.h:
* platform/graphics/IntSize.h:
* platform/graphics/MediaPlayer.cpp:
(WebCore::installedMediaEngines):
* platform/graphics/cg/ImageBufferCG.cpp:
(WebCore::utiFromMIMEType):
* platform/graphics/cg/PDFDocumentImage.h:
* platform/graphics/cocoa/FontPlatformDataCocoa.mm:
* platform/graphics/mac/GraphicsContextMac.mm:
(WebCore::GraphicsContext::drawLineForDocumentMarker):
* platform/graphics/opengl/Extensions3DOpenGL.cpp:
(WebCore::Extensions3DOpenGL::supportsExtension):
(WebCore::Extensions3DOpenGL::drawBuffersEXT):
* platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:
(WebCore::Extensions3DOpenGLCommon::Extensions3DOpenGLCommon):
* platform/mac/KeyEventMac.mm:
* platform/network/NetworkStateNotifier.h:
* platform/network/cf/CookieJarCFNet.cpp:
* platform/network/cf/ResourceRequest.h:
* platform/network/cf/ResourceRequestCFNet.cpp:
* platform/network/cf/SocketStreamHandleCFNet.cpp:
(WebCore::SocketStreamHandle::reportErrorToClient):
* platform/text/TextEncodingRegistry.cpp:
(WebCore::extendTextCodecMaps):
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::allowsIndependentlyCompositedFrames):
(WebCore::RenderLayerCompositor::requiresCompositingForAnimation):
Source/WebKit2:
* PluginProcess/PluginProcess.cpp:
(WebKit::PluginProcess::netscapePluginModule):
* Shared/API/c/WKDeprecatedFunctions.cpp:
* Shared/WebPreferencesStore.h:
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView initWithFrame:configuration:]):
* UIProcess/PageClient.h:
* UIProcess/Scrolling/RemoteScrollingTree.cpp:
* UIProcess/Scrolling/RemoteScrollingTree.h:
* UIProcess/WebContext.h:
* UIProcess/WebInspectorProxy.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::didChangeBackForwardList):
(WebKit::WebPageProxy::pageDidScroll):
(WebKit::WebPageProxy::resetStateAfterProcessExited):
(WebKit::WebPageProxy::creationParameters):
* UIProcess/WebPageProxy.h:
* UIProcess/WebPageProxy.messages.in:
* UIProcess/mac/WebContextMac.mm:
(WebKit::WebContext::platformInitializeWebProcess):
* WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
(WKBundlePageSetTopOverhangImage):
(WKBundlePageSetBottomOverhangImage):
* WebProcess/WebPage/PageBanner.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::setDeviceScaleFactor):
(WebKit::WebPage::mainFrameDidLayout):
(WebKit::WebPage::beginPrinting):
(WebKit::WebPage::drawRectToImage):
(WebKit::WebPage::drawPagesToPDF):
* WebProcess/WebPage/WebPage.messages.in:
* config.h:
Source/WTF:
* wtf/FeatureDefines.h:
* wtf/Platform.h:
* wtf/Threading.cpp:
* wtf/text/cf/StringImplCF.cpp:
(garbageCollectionEnabled):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreAPIJSValueRefcpp">trunk/Source/JavaScriptCore/API/JSValueRef.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorejitExecutableAllocatorFixedVMPoolcpp">trunk/Source/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfFeatureDefinesh">trunk/Source/WTF/wtf/FeatureDefines.h</a></li>
<li><a href="#trunkSourceWTFwtfPlatformh">trunk/Source/WTF/wtf/Platform.h</a></li>
<li><a href="#trunkSourceWTFwtfThreadingcpp">trunk/Source/WTF/wtf/Threading.cpp</a></li>
<li><a href="#trunkSourceWTFwtftextcfStringImplCFcpp">trunk/Source/WTF/wtf/text/cf/StringImplCF.cpp</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreconfigh">trunk/Source/WebCore/config.h</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorcpp">trunk/Source/WebCore/editing/Editor.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorCommandcpp">trunk/Source/WebCore/editing/EditorCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingTypingCommandcpp">trunk/Source/WebCore/editing/TypingCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkSourceWebCorepageAlternativeTextClienth">trunk/Source/WebCore/page/AlternativeTextClient.h</a></li>
<li><a href="#trunkSourceWebCorepageEventHandlercpp">trunk/Source/WebCore/page/EventHandler.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageGroupcpp">trunk/Source/WebCore/page/PageGroup.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingStateScrollingNodecpp">trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingStateScrollingNodeh">trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingTreeh">trunk/Source/WebCore/page/scrolling/ScrollingTree.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingThreadedScrollingTreecpp">trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingThreadedScrollingTreeh">trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.h</a></li>
<li><a href="#trunkSourceWebCoreplatformDragDatah">trunk/Source/WebCore/platform/DragData.h</a></li>
<li><a href="#trunkSourceWebCoreplatformFileSystemcpp">trunk/Source/WebCore/platform/FileSystem.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformMemoryPressureHandlercpp">trunk/Source/WebCore/platform/MemoryPressureHandler.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformPasteboardh">trunk/Source/WebCore/platform/Pasteboard.h</a></li>
<li><a href="#trunkSourceWebCoreplatformPlatformMouseEventh">trunk/Source/WebCore/platform/PlatformMouseEvent.h</a></li>
<li><a href="#trunkSourceWebCoreplatformPlatformPasteboardh">trunk/Source/WebCore/platform/PlatformPasteboard.h</a></li>
<li><a href="#trunkSourceWebCoreplatformPlatformScreenh">trunk/Source/WebCore/platform/PlatformScreen.h</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollbarcpp">trunk/Source/WebCore/platform/Scrollbar.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformSuddenTerminationh">trunk/Source/WebCore/platform/SuddenTermination.h</a></li>
<li><a href="#trunkSourceWebCoreplatformThreadGlobalDatacpp">trunk/Source/WebCore/platform/ThreadGlobalData.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformThreadGlobalDatah">trunk/Source/WebCore/platform/ThreadGlobalData.h</a></li>
<li><a href="#trunkSourceWebCoreplatformaudiomacAudioDestinationMaccpp">trunk/Source/WebCore/platform/audio/mac/AudioDestinationMac.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformaudiomacAudioFileReaderMaccpp">trunk/Source/WebCore/platform/audio/mac/AudioFileReaderMac.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformaudiomacAudioSessionMaccpp">trunk/Source/WebCore/platform/audio/mac/AudioSessionMac.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsDisplayRefreshMonitorh">trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitor.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFloatPointh">trunk/Source/WebCore/platform/graphics/FloatPoint.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFloatRecth">trunk/Source/WebCore/platform/graphics/FloatRect.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFloatSizeh">trunk/Source/WebCore/platform/graphics/FloatSize.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsIntRecth">trunk/Source/WebCore/platform/graphics/IntRect.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsIntSizeh">trunk/Source/WebCore/platform/graphics/IntSize.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayercpp">trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgImageBufferCGcpp">trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgPDFDocumentImageh">trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaFontPlatformDataCocoamm">trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacGraphicsContextMacmm">trunk/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsopenglExtensions3DOpenGLcpp">trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsopenglExtensions3DOpenGLCommoncpp">trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmacKeyEventMacmm">trunk/Source/WebCore/platform/mac/KeyEventMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkNetworkStateNotifierh">trunk/Source/WebCore/platform/network/NetworkStateNotifier.h</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="#trunkSourceWebCoreplatformnetworkcfResourceRequestCFNetcpp">trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfSocketStreamHandleCFNetcpp">trunk/Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformtextTextEncodingRegistrycpp">trunk/Source/WebCore/platform/text/TextEncodingRegistry.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorcpp">trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessPluginProcesscpp">trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKDeprecatedFunctionscpp">trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPreferencesStoreh">trunk/Source/WebKit2/Shared/WebPreferencesStore.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPageClienth">trunk/Source/WebKit2/UIProcess/PageClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessScrollingRemoteScrollingTreecpp">trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessScrollingRemoteScrollingTreeh">trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContexth">trunk/Source/WebKit2/UIProcess/WebContext.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebInspectorProxyh">trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxymessagesin">trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebContextMacmm">trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePagecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagePageBannerh">trunk/Source/WebKit2/WebProcess/WebPage/PageBanner.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagemessagesin">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in</a></li>
<li><a href="#trunkSourceWebKit2configh">trunk/Source/WebKit2/config.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreAPIJSValueRefcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/JSValueRef.cpp (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/JSValueRef.cpp 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/JavaScriptCore/API/JSValueRef.cpp 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -44,13 +44,13 @@
</span><span class="cx">
</span><span class="cx"> #include <algorithm> // for std::min
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> #include <mach-o/dyld.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> using namespace JSC;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> static bool evernoteHackNeeded()
</span><span class="cx"> {
</span><span class="cx"> static const int32_t webkitLastVersionWithEvernoteHack = 35133959;
</span><span class="lines">@@ -443,7 +443,7 @@
</span><span class="cx">
</span><span class="cx"> void JSValueUnprotect(JSContextRef ctx, JSValueRef value)
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> if ((!value || !ctx) && evernoteHackNeeded())
</span><span class="cx"> return;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-02-19 Dan Bernstein <mitz@apple.com>
+
+ Simplify PLATFORM(MAC) && !PLATFORM(IOS) and similar expressions
+ https://bugs.webkit.org/show_bug.cgi?id=129029
+
+ Reviewed by Mark Rowe.
+
+ * API/JSValueRef.cpp:
+ (JSValueUnprotect):
+ * jit/ExecutableAllocatorFixedVMPool.cpp:
+
</ins><span class="cx"> 2014-02-18 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Correctly install libllvmForJSC.dylib in production builds
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitExecutableAllocatorFixedVMPoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> #include <stdio.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS) && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 1090
</del><ins>+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 1090
</ins><span class="cx"> // MADV_FREE_REUSABLE does not work for JIT memory on older OSes so use MADV_FREE in that case.
</span><span class="cx"> #define WTF_USE_MADV_FREE_FOR_JIT_MEMORY 1
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WTF/ChangeLog 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-02-19 Dan Bernstein <mitz@apple.com>
+
+ Simplify PLATFORM(MAC) && !PLATFORM(IOS) and similar expressions
+ https://bugs.webkit.org/show_bug.cgi?id=129029
+
+ Reviewed by Mark Rowe.
+
+ * wtf/FeatureDefines.h:
+ * wtf/Platform.h:
+ * wtf/Threading.cpp:
+ * wtf/text/cf/StringImplCF.cpp:
+ (garbageCollectionEnabled):
+
</ins><span class="cx"> 2014-02-18 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> PLATFORM(MAC) is true when building for iOS
</span></span></pre></div>
<a id="trunkSourceWTFwtfFeatureDefinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/FeatureDefines.h (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/FeatureDefines.h 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WTF/wtf/FeatureDefines.h 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx"> #endif /* PLATFORM(IOS) */
</span><span class="cx">
</span><span class="cx"> /* --------- Apple MAC port (not IOS) --------- */
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> #if !defined(ENABLE_CSS_IMAGE_SET)
</span><span class="cx"> #define ENABLE_CSS_IMAGE_SET 1
</span><span class="lines">@@ -236,7 +236,7 @@
</span><span class="cx"> #define ENABLE_MEDIA_SOURCE 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#endif /* PLATFORM(MAC) && !PLATFORM(IOS) */
</del><ins>+#endif /* PLATFORM(MAC) */
</ins><span class="cx">
</span><span class="cx"> /* --------- Apple Windows port --------- */
</span><span class="cx"> #if PLATFORM(WIN) && !OS(WINCE) && !PLATFORM(WIN_CAIRO)
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Platform.h (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Platform.h 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WTF/wtf/Platform.h 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -466,7 +466,7 @@
</span><span class="cx"> #define HAVE_OUT_OF_PROCESS_LAYER_HOSTING 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> #define WTF_USE_APPKIT 1
</span><span class="cx"> #define HAVE_RUNLOOP_TIMER 1
</span><span class="lines">@@ -483,7 +483,7 @@
</span><span class="cx"> #undef __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES
</span><span class="cx"> #define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
</span><span class="cx">
</span><del>-#endif /* PLATFORM(MAC) && !PLATFORM(IOS) */
</del><ins>+#endif /* PLATFORM(MAC) */
</ins><span class="cx">
</span><span class="cx"> #if OS(DARWIN) && !PLATFORM(GTK)
</span><span class="cx"> #define ENABLE_PURGEABLE_MEMORY 1
</span><span class="lines">@@ -939,25 +939,25 @@
</span><span class="cx"> #define WTF_USE_AVFOUNDATION 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 60000) || ((PLATFORM(MAC) && !PLATFORM(IOS)) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080)
</del><ins>+#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 60000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080)
</ins><span class="cx"> #define WTF_USE_COREMEDIA 1
</span><span class="cx"> #define HAVE_AVFOUNDATION_VIDEO_OUTPUT 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 50000) || ((PLATFORM(MAC) && !PLATFORM(IOS)) || (OS(WINDOWS) && USE(CG)) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080)
</del><ins>+#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 50000) || (PLATFORM(MAC) || (OS(WINDOWS) && USE(CG)) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080)
</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) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 70000) || (((PLATFORM(MAC) && !PLATFORM(IOS)) || (OS(WINDOWS) && USE(CG))) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
</del><ins>+#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 70000) || ((PLATFORM(MAC) || (OS(WINDOWS) && USE(CG))) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
</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="cx">
</span><del>-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 60000) || ((PLATFORM(MAC) && !PLATFORM(IOS)) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
</del><ins>+#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 60000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
</ins><span class="cx"> #define HAVE_AVFOUNDATION_LOADER_DELEGATE 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if (PLATFORM(MAC) && !PLATFORM(IOS)) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</del><ins>+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</ins><span class="cx"> #define WTF_USE_VIDEOTOOLBOX 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -969,7 +969,7 @@
</span><span class="cx"> #define WTF_USE_REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> #define WTF_USE_COREAUDIO 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -987,11 +987,11 @@
</span><span class="cx"> #if PLATFORM(COCOA) || PLATFORM(EFL)
</span><span class="cx"> #define WTF_USE_UNIFIED_TEXT_CHECKING 1
</span><span class="cx"> #endif
</span><del>-#if !PLATFORM(IOS) && PLATFORM(MAC)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> #define WTF_USE_AUTOMATIC_TEXT_REPLACEMENT 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> /* Some platforms provide UI for suggesting autocorrection. */
</span><span class="cx"> #define WTF_USE_AUTOCORRECTION_PANEL 1
</span><span class="cx"> #endif
</span><span class="lines">@@ -1029,7 +1029,7 @@
</span><span class="cx"> #define _HAS_EXCEPTIONS 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><ins>+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</ins><span class="cx"> #define HAVE_NS_ACTIVITY 1
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfThreadingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Threading.cpp (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Threading.cpp 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WTF/wtf/Threading.cpp 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> return createThreadInternal(threadEntryPoint, context, name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS) || PLATFORM(WIN)
</del><ins>+#if PLATFORM(MAC) || PLATFORM(WIN)
</ins><span class="cx">
</span><span class="cx"> // For ABI compatibility with Safari on Mac / Windows: Safari uses the private
</span><span class="cx"> // createThread() and waitForThreadCompletion() functions directly and we need
</span></span></pre></div>
<a id="trunkSourceWTFwtftextcfStringImplCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/cf/StringImplCF.cpp (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/cf/StringImplCF.cpp 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WTF/wtf/text/cf/StringImplCF.cpp 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -29,13 +29,13 @@
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #include <wtf/Threading.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> #include <objc/objc-auto.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> static inline bool garbageCollectionEnabled()
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> return objc_collectingEnabled();
</span><span class="cx"> #else
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/ChangeLog 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -1,3 +1,82 @@
</span><ins>+2014-02-19 Dan Bernstein <mitz@apple.com>
+
+ Simplify PLATFORM(MAC) && !PLATFORM(IOS) and similar expressions
+ https://bugs.webkit.org/show_bug.cgi?id=129029
+
+ Reviewed by Mark Rowe.
+
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::boundsForVisiblePositionRange):
+ (WebCore::AccessibilityRenderObject::visiblePositionForPoint):
+ * config.h:
+ * editing/Editor.cpp:
+ (WebCore::Editor::copyURL):
+ * editing/EditorCommand.cpp:
+ (WebCore::createCommandMap):
+ * editing/TypingCommand.cpp:
+ (WebCore::TypingCommand::markMisspellingsAfterTyping):
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::loadArchive):
+ * page/AlternativeTextClient.h:
+ * page/EventHandler.cpp:
+ * page/PageGroup.cpp:
+ (WebCore::PageGroup::captionPreferences):
+ * page/scrolling/ScrollingStateScrollingNode.cpp:
+ (WebCore::ScrollingStateScrollingNode::ScrollingStateScrollingNode):
+ * page/scrolling/ScrollingStateScrollingNode.h:
+ * page/scrolling/ScrollingTree.h:
+ * page/scrolling/ThreadedScrollingTree.cpp:
+ * page/scrolling/ThreadedScrollingTree.h:
+ * platform/DragData.h:
+ * platform/FileSystem.cpp:
+ * platform/MemoryPressureHandler.cpp:
+ * platform/Pasteboard.h:
+ * platform/PlatformMouseEvent.h:
+ (WebCore::PlatformMouseEvent::PlatformMouseEvent):
+ * platform/PlatformPasteboard.h:
+ * platform/PlatformScreen.h:
+ * platform/Scrollbar.cpp:
+ (WebCore::Scrollbar::supportsUpdateOnSecondaryThread):
+ * platform/SuddenTermination.h:
+ * platform/ThreadGlobalData.cpp:
+ (WebCore::ThreadGlobalData::ThreadGlobalData):
+ (WebCore::ThreadGlobalData::destroy):
+ * platform/ThreadGlobalData.h:
+ * platform/audio/mac/AudioDestinationMac.cpp:
+ * platform/audio/mac/AudioFileReaderMac.cpp:
+ * platform/audio/mac/AudioSessionMac.cpp:
+ * platform/graphics/DisplayRefreshMonitor.h:
+ * platform/graphics/FloatPoint.h:
+ * platform/graphics/FloatRect.h:
+ * platform/graphics/FloatSize.h:
+ * platform/graphics/IntRect.h:
+ * platform/graphics/IntSize.h:
+ * platform/graphics/MediaPlayer.cpp:
+ (WebCore::installedMediaEngines):
+ * platform/graphics/cg/ImageBufferCG.cpp:
+ (WebCore::utiFromMIMEType):
+ * platform/graphics/cg/PDFDocumentImage.h:
+ * platform/graphics/cocoa/FontPlatformDataCocoa.mm:
+ * platform/graphics/mac/GraphicsContextMac.mm:
+ (WebCore::GraphicsContext::drawLineForDocumentMarker):
+ * platform/graphics/opengl/Extensions3DOpenGL.cpp:
+ (WebCore::Extensions3DOpenGL::supportsExtension):
+ (WebCore::Extensions3DOpenGL::drawBuffersEXT):
+ * platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:
+ (WebCore::Extensions3DOpenGLCommon::Extensions3DOpenGLCommon):
+ * platform/mac/KeyEventMac.mm:
+ * platform/network/NetworkStateNotifier.h:
+ * platform/network/cf/CookieJarCFNet.cpp:
+ * platform/network/cf/ResourceRequest.h:
+ * platform/network/cf/ResourceRequestCFNet.cpp:
+ * platform/network/cf/SocketStreamHandleCFNet.cpp:
+ (WebCore::SocketStreamHandle::reportErrorToClient):
+ * platform/text/TextEncodingRegistry.cpp:
+ (WebCore::extendTextCodecMaps):
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::allowsIndependentlyCompositedFrames):
+ (WebCore::RenderLayerCompositor::requiresCompositingForAnimation):
+
</ins><span class="cx"> 2014-02-18 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> PLATFORM(MAC) is true when building for iOS
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -1963,7 +1963,7 @@
</span><span class="cx"> ourrect = boundingBox;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> return m_renderer->view().frameView().contentsToScreen(pixelSnappedIntRect(ourrect));
</span><span class="cx"> #else
</span><span class="cx"> return pixelSnappedIntRect(ourrect);
</span><span class="lines">@@ -2004,7 +2004,7 @@
</span><span class="cx"> LayoutPoint pointResult;
</span><span class="cx"> while (1) {
</span><span class="cx"> LayoutPoint ourpoint;
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> ourpoint = frameView->screenToContents(point);
</span><span class="cx"> #else
</span><span class="cx"> ourpoint = point;
</span></span></pre></div>
<a id="trunkSourceWebCoreconfigh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/config.h (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/config.h 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/config.h 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> #define WTF_USE_NEW_THEME 1
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.cpp (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.cpp 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/editing/Editor.cpp 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -553,7 +553,7 @@
</span><span class="cx"> return plainTextFromPasteboard(text);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !(PLATFORM(MAC) && !PLATFORM(IOS))
</del><ins>+#if !PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> String Editor::plainTextFromPasteboard(const PasteboardPlainText& text)
</span><span class="cx"> {
</span><span class="lines">@@ -1402,7 +1402,7 @@
</span><span class="cx"> pasteboardURL.url = url;
</span><span class="cx"> pasteboardURL.title = title;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> fillInUserVisibleForm(pasteboardURL);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/EditorCommand.cpp (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/EditorCommand.cpp 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/editing/EditorCommand.cpp 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -1101,7 +1101,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> static bool executeTakeFindStringFromSelection(Frame& frame, Event*, EditorCommandSource, const String&)
</span><span class="cx"> {
</span><span class="cx"> frame.editor().takeFindStringFromSelection();
</span><span class="lines">@@ -1321,7 +1321,7 @@
</span><span class="cx"> return frame.editor().canRedo();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> static bool enabledTakeFindStringFromSelection(Frame& frame, Event*, EditorCommandSource)
</span><span class="cx"> {
</span><span class="cx"> return frame.editor().canCopyExcludingStandaloneImages();
</span><span class="lines">@@ -1628,7 +1628,7 @@
</span><span class="cx"> { "PasteGlobalSelection", { executePasteGlobalSelection, supportedFromMenuOrKeyBinding, enabledPaste, stateNone, valueNull, notTextInsertion, allowExecutionWhenDisabled } },
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> { "TakeFindStringFromSelection", { executeTakeFindStringFromSelection, supportedFromMenuOrKeyBinding, enabledTakeFindStringFromSelection, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
</span><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingTypingCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/TypingCommand.cpp (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/TypingCommand.cpp 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/editing/TypingCommand.cpp 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -291,7 +291,7 @@
</span><span class="cx"> {
</span><span class="cx"> Frame& frame = this->frame();
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> if (!frame.editor().isContinuousSpellCheckingEnabled()
</span><span class="cx"> && !frame.editor().isAutomaticQuoteSubstitutionEnabled()
</span><span class="cx"> && !frame.editor().isAutomaticLinkDetectionEnabled()
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -923,7 +923,7 @@
</span><span class="cx"> SubstituteData substituteData(mainResource->data(), mainResource->mimeType(), mainResource->textEncoding(), URL());
</span><span class="cx">
</span><span class="cx"> ResourceRequest request(mainResource->url());
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> request.applyWebArchiveHackForMail();
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageAlternativeTextClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/AlternativeTextClient.h (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/AlternativeTextClient.h 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/page/AlternativeTextClient.h 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -31,10 +31,10 @@
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS) && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</del><ins>+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</ins><span class="cx"> // Some platforms provide UI for suggesting alternative dictation text.
</span><span class="cx"> #define WTF_USE_DICTATION_ALTERNATIVES 1
</span><del>-#endif // !PLATFORM(IOS) && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</del><ins>+#endif // PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.cpp (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.cpp 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -2447,7 +2447,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC) || PLATFORM(IOS)
</del><ins>+#if !PLATFORM(MAC)
</ins><span class="cx"> void EventHandler::platformPrepareForWheelEvents(const PlatformWheelEvent&, const HitTestResult&, Element*&, ContainerNode*&, ScrollableArea*&, bool&)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -2784,7 +2784,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC) || PLATFORM(IOS)
</del><ins>+#if !PLATFORM(MAC)
</ins><span class="cx"> bool EventHandler::needsKeyboardEventDisambiguationQuirks() const
</span><span class="cx"> {
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageGroupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageGroup.cpp (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageGroup.cpp 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/page/PageGroup.cpp 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><del>-#if (PLATFORM(MAC) && !PLATFORM(IOS)) || HAVE(MEDIA_ACCESSIBILITY_FRAMEWORK)
</del><ins>+#if PLATFORM(MAC) || HAVE(MEDIA_ACCESSIBILITY_FRAMEWORK)
</ins><span class="cx"> #include "CaptionUserPreferencesMediaAF.h"
</span><span class="cx"> #else
</span><span class="cx"> #include "CaptionUserPreferences.h"
</span><span class="lines">@@ -321,7 +321,7 @@
</span><span class="cx"> CaptionUserPreferences* PageGroup::captionPreferences()
</span><span class="cx"> {
</span><span class="cx"> if (!m_captionPreferences) {
</span><del>-#if (PLATFORM(MAC) && !PLATFORM(IOS)) || HAVE(MEDIA_ACCESSIBILITY_FRAMEWORK)
</del><ins>+#if PLATFORM(MAC) || HAVE(MEDIA_ACCESSIBILITY_FRAMEWORK)
</ins><span class="cx"> m_captionPreferences = std::make_unique<CaptionUserPreferencesMediaAF>(*this);
</span><span class="cx"> #else
</span><span class="cx"> m_captionPreferences = std::make_unique<CaptionUserPreferences>(*this);
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingStateScrollingNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx">
</span><span class="cx"> ScrollingStateScrollingNode::ScrollingStateScrollingNode(ScrollingStateTree& stateTree, ScrollingNodeID nodeID)
</span><span class="cx"> : ScrollingStateNode(ScrollingNode, stateTree, nodeID)
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> , m_verticalScrollbarPainter(0)
</span><span class="cx"> , m_horizontalScrollbarPainter(0)
</span><span class="cx"> #endif
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx">
</span><span class="cx"> ScrollingStateScrollingNode::ScrollingStateScrollingNode(const ScrollingStateScrollingNode& stateNode, ScrollingStateTree& adoptiveTree)
</span><span class="cx"> : ScrollingStateNode(stateNode, adoptiveTree)
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> , m_verticalScrollbarPainter(stateNode.verticalScrollbarPainter())
</span><span class="cx"> , m_horizontalScrollbarPainter(stateNode.horizontalScrollbarPainter())
</span><span class="cx"> #endif
</span><span class="lines">@@ -251,7 +251,7 @@
</span><span class="cx"> setPropertyChanged(FooterLayer);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !(PLATFORM(MAC) && !PLATFORM(IOS))
</del><ins>+#if !PLATFORM(MAC)
</ins><span class="cx"> void ScrollingStateScrollingNode::setScrollbarPaintersFromScrollbars(Scrollbar*, Scrollbar*)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingStateScrollingNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> const LayerRepresentation& footerLayer() const { return m_footerLayer; }
</span><span class="cx"> void setFooterLayer(const LayerRepresentation&);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> ScrollbarPainter verticalScrollbarPainter() const { return m_verticalScrollbarPainter.get(); }
</span><span class="cx"> ScrollbarPainter horizontalScrollbarPainter() const { return m_horizontalScrollbarPainter.get(); }
</span><span class="cx"> #endif
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx"> LayerRepresentation m_headerLayer;
</span><span class="cx"> LayerRepresentation m_footerLayer;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> RetainPtr<ScrollbarPainter> m_verticalScrollbarPainter;
</span><span class="cx"> RetainPtr<ScrollbarPainter> m_horizontalScrollbarPainter;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTree.h (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTree.h 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTree.h 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx">
</span><span class="cx"> bool isPointInNonFastScrollableRegion(IntPoint);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> virtual void handleWheelEventPhase(PlatformWheelEventPhase) = 0;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingThreadedScrollingTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.cpp (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.cpp 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.cpp 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> callOnMainThread(bind(&AsyncScrollingCoordinator::scheduleUpdateScrollPositionAfterAsyncScroll, m_scrollingCoordinator.get(), nodeID, scrollPosition, isHandlingProgrammaticScroll(), scrollingLayerPositionAction));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> void ThreadedScrollingTree::handleWheelEventPhase(PlatformWheelEventPhase phase)
</span><span class="cx"> {
</span><span class="cx"> if (!m_scrollingCoordinator)
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingThreadedScrollingTreeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.h (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.h 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.h 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> virtual PassOwnPtr<ScrollingTreeNode> createNode(ScrollingNodeType, ScrollingNodeID) override;
</span><span class="cx">
</span><span class="cx"> virtual void scrollingTreeNodeDidScroll(ScrollingNodeID, const FloatPoint& scrollPosition, SetOrSyncScrollingLayerPosition = SyncScrollingLayerPosition) override;
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> virtual void handleWheelEventPhase(PlatformWheelEventPhase) override;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformDragDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/DragData.h (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/DragData.h 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/platform/DragData.h 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> bool containsFiles() const;
</span><span class="cx"> unsigned numberOfFiles() const;
</span><span class="cx"> int modifierKeyState() const;
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> const String& pasteboardName() const { return m_pasteboardName; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> DragDataRef m_platformDragData;
</span><span class="cx"> DragOperation m_draggingSourceOperationMask;
</span><span class="cx"> DragApplicationFlags m_applicationFlags;
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> String m_pasteboardName;
</span><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(WIN)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformFileSystemcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/FileSystem.cpp (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/FileSystem.cpp 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/platform/FileSystem.cpp 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> return result.toString();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC) || PLATFORM(IOS)
</del><ins>+#if !PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> void setMetadataURL(String&, const String&, const String&)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformMemoryPressureHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/MemoryPressureHandler.cpp (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/MemoryPressureHandler.cpp 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/platform/MemoryPressureHandler.cpp 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC) || PLATFORM(IOS)
</del><ins>+#if !PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> void MemoryPressureHandler::install() { }
</span><span class="cx"> void MemoryPressureHandler::uninstall() { }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformPasteboardh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Pasteboard.h (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Pasteboard.h 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/platform/Pasteboard.h 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> struct PasteboardURL {
</span><span class="cx"> URL url;
</span><span class="cx"> String title;
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> String userVisibleForm;
</span><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx">
</span><span class="cx"> struct PasteboardPlainText {
</span><span class="cx"> String text;
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> bool isURL;
</span><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="lines">@@ -180,7 +180,7 @@
</span><span class="cx"> static String resourceMIMEType(const NSString *mimeType);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> explicit Pasteboard(const String& pasteboardName);
</span><span class="cx"> static PassOwnPtr<Pasteboard> create(const String& pasteboardName);
</span><span class="cx">
</span><span class="lines">@@ -223,7 +223,7 @@
</span><span class="cx"> long m_changeCount;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> String m_pasteboardName;
</span><span class="cx"> long m_changeCount;
</span><span class="cx"> #endif
</span><span class="lines">@@ -240,7 +240,7 @@
</span><span class="cx"> extern NSString *WebArchivePboardType;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> extern const char* const WebArchivePboardType;
</span><span class="cx"> extern const char* const WebURLNamePboardType;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformPlatformMouseEventh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/PlatformMouseEvent.h (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/PlatformMouseEvent.h 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/platform/PlatformMouseEvent.h 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> , m_button(NoButton)
</span><span class="cx"> , m_clickCount(0)
</span><span class="cx"> , m_modifierFlags(0)
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> , m_eventNumber(0)
</span><span class="cx"> #elif PLATFORM(WIN)
</span><span class="cx"> , m_didActivateWebView(false)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> , m_button(button)
</span><span class="cx"> , m_clickCount(clickCount)
</span><span class="cx"> , m_modifierFlags(0)
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> , m_eventNumber(0)
</span><span class="cx"> #elif PLATFORM(WIN)
</span><span class="cx"> , m_didActivateWebView(false)
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> PlatformMouseEvent(const Evas_Event_Mouse_Move*, IntPoint);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> int eventNumber() const { return m_eventNumber; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx"> int m_clickCount;
</span><span class="cx"> unsigned m_modifierFlags;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> int m_eventNumber;
</span><span class="cx"> #elif PLATFORM(WIN)
</span><span class="cx"> bool m_didActivateWebView;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformPlatformPasteboardh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/PlatformPasteboard.h (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/PlatformPasteboard.h 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/platform/PlatformPasteboard.h 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> OBJC_CLASS NSPasteboard;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> int count();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> RetainPtr<NSPasteboard> m_pasteboard;
</span><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformPlatformScreenh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/PlatformScreen.h (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/PlatformScreen.h 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/platform/PlatformScreen.h 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> OBJC_CLASS NSScreen;
</span><span class="cx"> OBJC_CLASS NSWindow;
</span><span class="cx"> #ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> FloatRect screenAvailableRect(Widget*);
</span><span class="cx"> void screenColorProfile(ColorProfile&);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> NSScreen *screenForWindow(NSWindow *);
</span><span class="cx">
</span><span class="cx"> FloatRect toUserSpace(const NSRect&, NSWindow *destination);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollbarcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Scrollbar.cpp (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Scrollbar.cpp 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/platform/Scrollbar.cpp 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -549,7 +549,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(IOS) && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><ins>+#if ENABLE(ASYNC_SCROLLING) && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</ins><span class="cx"> return m_scrollableArea ? !m_scrollableArea->updatesScrollLayerPositionOnMainThread() : false;
</span><span class="cx"> #else
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformSuddenTerminationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/SuddenTermination.h (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/SuddenTermination.h 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/platform/SuddenTermination.h 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> void disableSuddenTermination();
</span><span class="cx"> void enableSuddenTermination();
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) || !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(MAC)
</ins><span class="cx"> inline void disableSuddenTermination() { }
</span><span class="cx"> inline void enableSuddenTermination() { }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformThreadGlobalDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ThreadGlobalData.cpp (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ThreadGlobalData.cpp 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/platform/ThreadGlobalData.cpp 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> #include <wtf/WTFThreadData.h>
</span><span class="cx"> #include <wtf/text/StringImpl.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> #include "TextCodeCMac.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> , m_isMainThread(isMainThread())
</span><span class="cx"> #endif
</span><span class="cx"> , m_cachedConverterICU(adoptPtr(new ICUConverterWrapper))
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> , m_cachedConverterTEC(adoptPtr(new TECConverterWrapper))
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx">
</span><span class="cx"> void ThreadGlobalData::destroy()
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> m_cachedConverterTEC.clear();
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformThreadGlobalDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ThreadGlobalData.h (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ThreadGlobalData.h 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/platform/ThreadGlobalData.h 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx">
</span><span class="cx"> ICUConverterWrapper& cachedConverterICU() { return *m_cachedConverterICU; }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> TECConverterWrapper& cachedConverterTEC() { return *m_cachedConverterTEC; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx">
</span><span class="cx"> OwnPtr<ICUConverterWrapper> m_cachedConverterICU;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> OwnPtr<TECConverterWrapper> m_cachedConverterTEC;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudiomacAudioDestinationMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/mac/AudioDestinationMac.cpp (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/mac/AudioDestinationMac.cpp 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/platform/audio/mac/AudioDestinationMac.cpp 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_AUDIO)
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> #include "AudioDestinationMac.h"
</span><span class="cx">
</span><span class="lines">@@ -183,6 +183,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#endif // PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> #endif // ENABLE(WEB_AUDIO)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudiomacAudioFileReaderMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/mac/AudioFileReaderMac.cpp (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/mac/AudioFileReaderMac.cpp 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/platform/audio/mac/AudioFileReaderMac.cpp 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_AUDIO)
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> #include "AudioFileReaderMac.h"
</span><span class="cx">
</span><span class="lines">@@ -249,6 +249,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#endif // PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> #endif // ENABLE(WEB_AUDIO)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudiomacAudioSessionMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/mac/AudioSessionMac.cpp (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/mac/AudioSessionMac.cpp 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/platform/audio/mac/AudioSessionMac.cpp 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "AudioSession.h"
</span><span class="cx">
</span><del>-#if USE(AUDIO_SESSION) && PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if USE(AUDIO_SESSION) && PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> #include "FloatConversion.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="lines">@@ -164,4 +164,4 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // USE(AUDIO_SESSION) && PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#endif // USE(AUDIO_SESSION) && PLATFORM(MAC)
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsDisplayRefreshMonitorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitor.h (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitor.h 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitor.h 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> HashSet<DisplayRefreshMonitorClient*> m_clients;
</span><span class="cx"> HashSet<DisplayRefreshMonitorClient*>* m_clientsToBeNotified;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> public:
</span><span class="cx"> void displayLinkFired(double nowSeconds, double outputTimeSeconds);
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFloatPointh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FloatPoint.h (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FloatPoint.h 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/platform/graphics/FloatPoint.h 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -35,13 +35,13 @@
</span><span class="cx"> typedef struct CGPoint CGPoint;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> #ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
</span><span class="cx"> typedef struct CGPoint NSPoint;
</span><span class="cx"> #else
</span><span class="cx"> typedef struct _NSPoint NSPoint;
</span><span class="cx"> #endif
</span><del>-#endif // PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#endif // PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> operator CGPoint() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
</del><ins>+#if PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
</ins><span class="cx"> FloatPoint(const NSPoint&);
</span><span class="cx"> operator NSPoint() const;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFloatRecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FloatRect.h (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FloatRect.h 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/platform/graphics/FloatRect.h 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -38,13 +38,13 @@
</span><span class="cx"> typedef struct CGRect CGRect;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> #ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
</span><span class="cx"> typedef struct CGRect NSRect;
</span><span class="cx"> #else
</span><span class="cx"> typedef struct _NSRect NSRect;
</span><span class="cx"> #endif
</span><del>-#endif // PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#endif // PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> #if USE(CAIRO)
</span><span class="cx"> typedef struct _cairo_rectangle cairo_rectangle_t;
</span><span class="lines">@@ -171,7 +171,7 @@
</span><span class="cx"> operator CGRect() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
</del><ins>+#if PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
</ins><span class="cx"> FloatRect(const NSRect&);
</span><span class="cx"> operator NSRect() const;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFloatSizeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FloatSize.h (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FloatSize.h 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/platform/graphics/FloatSize.h 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -39,13 +39,13 @@
</span><span class="cx"> typedef struct CGSize CGSize;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> #ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
</span><span class="cx"> typedef struct CGSize NSSize;
</span><span class="cx"> #else
</span><span class="cx"> typedef struct _NSSize NSSize;
</span><span class="cx"> #endif
</span><del>-#endif // PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#endif // PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> operator CGSize() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
</del><ins>+#if PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
</ins><span class="cx"> explicit FloatSize(const NSSize &); // don't do this implicitly since it's lossy
</span><span class="cx"> operator NSSize() const;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsIntRecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/IntRect.h (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/IntRect.h 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/platform/graphics/IntRect.h 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> typedef struct CGRect CGRect;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> #ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
</span><span class="cx"> typedef struct CGRect NSRect;
</span><span class="cx"> #else
</span><span class="lines">@@ -193,7 +193,7 @@
</span><span class="cx"> operator CGRect() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
</del><ins>+#if PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
</ins><span class="cx"> operator NSRect() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -248,7 +248,7 @@
</span><span class="cx"> IntRect enclosingIntRect(const CGRect&);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
</del><ins>+#if PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
</ins><span class="cx"> IntRect enclosingIntRect(const NSRect&);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsIntSizeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/IntSize.h (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/IntSize.h 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/platform/graphics/IntSize.h 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> typedef struct CGSize CGSize;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> #ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
</span><span class="cx"> typedef struct CGSize NSSize;
</span><span class="cx"> #else
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> operator CGSize() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
</del><ins>+#if PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
</ins><span class="cx"> explicit IntSize(const NSSize &); // don't do this implicitly since it's lossy
</span><span class="cx"> operator NSSize() const;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -224,7 +224,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> if (Settings::isQTKitEnabled())
</span><span class="cx"> MediaPlayerPrivateQTKit::registerMediaEngine(addMediaEngine);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgImageBufferCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -405,7 +405,7 @@
</span><span class="cx">
</span><span class="cx"> static RetainPtr<CFStringRef> utiFromMIMEType(const String& mimeType)
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> return adoptCF(UTTypeCreatePreferredIdentifierForTag(kUTTagClassMIMEType, mimeType.createCFString().get(), 0));
</span><span class="cx"> #else
</span><span class="cx"> ASSERT(isMainThread()); // It is unclear if CFSTR is threadsafe.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgPDFDocumentImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.h (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.h 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.h 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> #if USE(CG)
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> #define WTF_USE_PDFKIT_FOR_PDFDOCUMENTIMAGE 1
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaFontPlatformDataCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -39,13 +39,13 @@
</span><span class="cx"> // These CoreText Text Spacing feature selectors are not defined in CoreText.
</span><span class="cx"> enum TextSpacingCTFeatureSelector { TextSpacingProportional, TextSpacingFullWidth, TextSpacingHalfWidth, TextSpacingThirdWidth, TextSpacingQuarterWidth };
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> void FontPlatformData::loadFont(NSFont* nsFont, float, NSFont*& outNSFont, CGFontRef& cgFont)
</span><span class="cx"> {
</span><span class="cx"> outNSFont = nsFont;
</span><span class="cx"> cgFont = CTFontCopyGraphicsFont(toCTFontRef(nsFont), 0);
</span><span class="cx"> }
</span><del>-#endif // PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#endif // PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> FontPlatformData::FontPlatformData(NSFont *nsFont, float size, bool isPrinterFont, bool syntheticBold, bool syntheticOblique, FontOrientation orientation, FontWidthVariant widthVariant)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacGraphicsContextMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -186,7 +186,7 @@
</span><span class="cx"> return;
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><del>-#if !PLATFORM(IOS) && PLATFORM(MAC)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> // To support correction panel.
</span><span class="cx"> case DocumentMarkerAutocorrectionReplacementLineStyle:
</span><span class="cx"> case DocumentMarkerDictationAlternativesLineStyle:
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsopenglExtensions3DOpenGLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -209,7 +209,7 @@
</span><span class="cx"> return m_availableExtensions.contains("GL_EXT_texture_filter_anisotropic");
</span><span class="cx">
</span><span class="cx"> if (name == "GL_EXT_draw_buffers") {
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> return m_availableExtensions.contains("GL_ARB_draw_buffers");
</span><span class="cx"> #else
</span><span class="cx"> // FIXME: implement support for other platforms.
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx"> void Extensions3DOpenGL::drawBuffersEXT(GC3Dsizei n, const GC3Denum* bufs)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: implement support for other platforms.
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> ::glDrawBuffersARB(n, bufs);
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(n);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsopenglExtensions3DOpenGLCommoncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> if (vendorComponents.contains("intel"))
</span><span class="cx"> m_isIntel = true;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> if (m_isAMD || m_isIntel)
</span><span class="cx"> m_requiresBuiltInFunctionEmulation = true;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacKeyEventMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/KeyEventMac.mm (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/KeyEventMac.mm 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/platform/mac/KeyEventMac.mm 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "PlatformKeyboardEvent.h"
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> #import "KeyEventCocoa.h"
</span><span class="cx"> #import "Logging.h"
</span><span class="lines">@@ -78,4 +78,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#endif // PLATFORM(MAC)
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkNetworkStateNotifierh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/NetworkStateNotifier.h (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/NetworkStateNotifier.h 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/platform/network/NetworkStateNotifier.h 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #include "Timer.h"
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> void notifyNetworkStateChange();
</span><span class="cx"> void updateState();
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> void networkStateChangeTimerFired(Timer<NetworkStateNotifier>&);
</span><span class="cx">
</span><span class="cx"> static void dynamicStoreCallback(SCDynamicStoreRef, CFArrayRef changedKeys, void *info);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfCookieJarCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> #include <windows.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(WIN) || (!PLATFORM(IOS) && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090)
</del><ins>+#if PLATFORM(WIN) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090)
</ins><span class="cx"> enum {
</span><span class="cx"> CFHTTPCookieStorageAcceptPolicyExclusivelyFromMainDocumentDomain = 3
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequest.h (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceRequest.h 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/platform/network/cf/ResourceRequest.h 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx">
</span><span class="cx"> void updateFromDelegatePreservingOldHTTPBody(const ResourceRequest&);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> void applyWebArchiveHackForMail();
</span><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(COCOA)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceRequestCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -337,7 +337,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> void ResourceRequest::applyWebArchiveHackForMail()
</span><span class="cx"> {
</span><span class="cx"> // Hack because Mail checks for this property to detect data / archive loads
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfSocketStreamHandleCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -578,7 +578,7 @@
</span><span class="cx"> CFIndex errorCode = CFErrorGetCode(error);
</span><span class="cx"> String description;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> #if COMPILER(CLANG)
</span><span class="cx"> #pragma clang diagnostic push
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextTextEncodingRegistrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/TextEncodingRegistry.cpp (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/TextEncodingRegistry.cpp 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/platform/text/TextEncodingRegistry.cpp 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="cx"> #include <wtf/StringExtras.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> #include "TextCodecMac.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -279,7 +279,7 @@
</span><span class="cx"> TextCodecICU::registerEncodingNames(addToTextEncodingNameMap);
</span><span class="cx"> TextCodecICU::registerCodecs(addToTextCodecMap);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> TextCodecMac::registerEncodingNames(addToTextEncodingNameMap);
</span><span class="cx"> TextCodecMac::registerCodecs(addToTextCodecMap);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -1912,7 +1912,7 @@
</span><span class="cx">
</span><span class="cx"> bool RenderLayerCompositor::allowsIndependentlyCompositedFrames(const FrameView* view)
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> // frames are only independently composited in Mac pre-WebKit2.
</span><span class="cx"> return view->platformWidget();
</span><span class="cx"> #else
</span><span class="lines">@@ -2383,10 +2383,7 @@
</span><span class="cx"> return (animController.isRunningAnimationOnRenderer(&renderer, CSSPropertyOpacity)
</span><span class="cx"> && (inCompositingMode() || (m_compositingTriggers & ChromeClient::AnimatedOpacityTrigger)))
</span><span class="cx"> #if ENABLE(CSS_FILTERS)
</span><del>-#if PLATFORM(IOS) || !PLATFORM(MAC) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
- // <rdar://problem/10907251> - WebKit2 doesn't support CA animations of CI filters on Lion and below
</del><span class="cx"> || animController.isRunningAnimationOnRenderer(&renderer, CSSPropertyWebkitFilter)
</span><del>-#endif // PLATFORM(IOS) || !PLATFORM(MAC) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</del><span class="cx"> #endif // CSS_FILTERS
</span><span class="cx"> || animController.isRunningAnimationOnRenderer(&renderer, CSSPropertyWebkitTransform);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -1,3 +1,43 @@
</span><ins>+2014-02-19 Dan Bernstein <mitz@apple.com>
+
+ Simplify PLATFORM(MAC) && !PLATFORM(IOS) and similar expressions
+ https://bugs.webkit.org/show_bug.cgi?id=129029
+
+ Reviewed by Mark Rowe.
+
+ * PluginProcess/PluginProcess.cpp:
+ (WebKit::PluginProcess::netscapePluginModule):
+ * Shared/API/c/WKDeprecatedFunctions.cpp:
+ * Shared/WebPreferencesStore.h:
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView initWithFrame:configuration:]):
+ * UIProcess/PageClient.h:
+ * UIProcess/Scrolling/RemoteScrollingTree.cpp:
+ * UIProcess/Scrolling/RemoteScrollingTree.h:
+ * UIProcess/WebContext.h:
+ * UIProcess/WebInspectorProxy.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didChangeBackForwardList):
+ (WebKit::WebPageProxy::pageDidScroll):
+ (WebKit::WebPageProxy::resetStateAfterProcessExited):
+ (WebKit::WebPageProxy::creationParameters):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+ * UIProcess/mac/WebContextMac.mm:
+ (WebKit::WebContext::platformInitializeWebProcess):
+ * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
+ (WKBundlePageSetTopOverhangImage):
+ (WKBundlePageSetBottomOverhangImage):
+ * WebProcess/WebPage/PageBanner.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::setDeviceScaleFactor):
+ (WebKit::WebPage::mainFrameDidLayout):
+ (WebKit::WebPage::beginPrinting):
+ (WebKit::WebPage::drawRectToImage):
+ (WebKit::WebPage::drawPagesToPDF):
+ * WebProcess/WebPage/WebPage.messages.in:
+ * config.h:
+
</ins><span class="cx"> 2014-02-18 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> PLATFORM(MAC) is true when building for iOS
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessPluginProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> #include <WebCore/NotImplemented.h>
</span><span class="cx"> #include <wtf/RunLoop.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> #include <crt_externs.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> ASSERT(!m_pluginPath.isNull());
</span><span class="cx"> m_pluginModule = NetscapePluginModule::getOrCreate(m_pluginPath);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> if (m_pluginModule) {
</span><span class="cx"> if (m_pluginModule->pluginQuirks().contains(PluginQuirks::PrognameShouldBeWebKitPluginHost))
</span><span class="cx"> *const_cast<const char**>(_NSGetProgname()) = "WebKitPluginHost";
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKDeprecatedFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include "WKMutableDictionary.h"
</span><span class="cx"> #include "WKSharedAPICast.h"
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> #include "WKContextPrivateMac.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> WK_EXPORT bool WKDictionaryIsMutable(WKDictionaryRef dictionary);
</span><span class="cx"> WK_EXPORT void WKDictionaryRemoveItem(WKMutableDictionaryRef dictionary, WKStringRef key);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> WK_EXPORT CGContextRef WKGraphicsContextGetCGContext(WKGraphicsContextRef graphicsContext);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> toImpl(dictionaryRef)->remove(toImpl(keyRef)->string());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> CGContextRef WKGraphicsContextGetCGContext(WKGraphicsContextRef graphicsContext)
</span><span class="cx"> {
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPreferencesStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPreferencesStore.h (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPreferencesStore.h 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebKit2/Shared/WebPreferencesStore.h 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> #define DEFAULT_WEBKIT_SCROLL_ANIMATOR_ENABLED false
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS) && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><ins>+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</ins><span class="cx"> #define DEFAULT_SCREEN_FONT_SUBSTITUTION_ENABLED false
</span><span class="cx"> #else
</span><span class="cx"> #define DEFAULT_SCREEN_FONT_SUBSTITUTION_ENABLED true
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> #import "WKViewInternal.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> bool _isChangingObscuredInsetsInteractively;
</span><span class="cx"> CGFloat _lastAdjustmentForScroller;
</span><span class="cx"> #endif
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> RetainPtr<WKView> _wkView;
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx"> [center addObserver:self selector:@selector(_keyboardWillHide:) name:UIKeyboardWillHideNotification object:nil];
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> _wkView = [[WKView alloc] initWithFrame:bounds context:context configuration:std::move(webPageConfiguration)];
</span><span class="cx"> [self addSubview:_wkView.get()];
</span><span class="cx"> _page = WebKit::toImpl([_wkView pageRef]);
</span><span class="lines">@@ -431,7 +431,7 @@
</span><span class="cx">
</span><span class="cx"> #pragma mark OS X-specific methods
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> - (void)resizeSubviewsWithOldSize:(NSSize)oldSize
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPageClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/PageClient.h (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/PageClient.h 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebKit2/UIProcess/PageClient.h 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -213,7 +213,7 @@
</span><span class="cx"> virtual void exitAcceleratedCompositingMode() = 0;
</span><span class="cx"> virtual void updateAcceleratedCompositingMode(const LayerTreeContext&) = 0;
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS) && PLATFORM(MAC)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> virtual void pluginFocusOrWindowFocusChanged(uint64_t pluginComplexTextInputIdentifier, bool pluginHasFocusAndWindowHasFocus) = 0;
</span><span class="cx"> virtual void setPluginComplexTextInputState(uint64_t pluginComplexTextInputIdentifier, PluginComplexTextInputState) = 0;
</span><span class="cx"> virtual void didPerformDictionaryLookup(const AttributedString&, const DictionaryPopupInfo&) = 0;
</span><span class="lines">@@ -236,7 +236,7 @@
</span><span class="cx"> virtual Vector<String> dictationAlternatives(uint64_t dictationContext) = 0;
</span><span class="cx"> #endif // USE(DICTATION_ALTERNATIVES)
</span><span class="cx"> #endif // USE(APPKIT)
</span><del>-#endif // !PLATFORM(IOS) && PLATFORM(MAC)
</del><ins>+#endif // PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> virtual void didGetTapHighlightGeometries(uint64_t requestID, const WebCore::Color&, const Vector<WebCore::FloatQuad>& highlightedQuads, const WebCore::IntSize& topLeftRadius, const WebCore::IntSize& topRightRadius, const WebCore::IntSize& bottomLeftRadius, const WebCore::IntSize& bottomRightRadius) = 0;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessScrollingRemoteScrollingTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.cpp (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.cpp 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.cpp 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> return DidHandleEvent;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> void RemoteScrollingTree::handleWheelEventPhase(PlatformWheelEventPhase phase)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: hand off to m_scrollingCoordinatorProxy?
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessScrollingRemoteScrollingTreeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.h (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.h 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.h 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> private:
</span><span class="cx"> explicit RemoteScrollingTree(RemoteScrollingCoordinatorProxy&);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> virtual void handleWheelEventPhase(WebCore::PlatformWheelEventPhase) override;
</span><span class="cx"> #endif
</span><span class="cx"> virtual void scrollingTreeNodeDidScroll(WebCore::ScrollingNodeID, const WebCore::FloatPoint& scrollPosition, WebCore::SetOrSyncScrollingLayerPosition = WebCore::SyncScrollingLayerPosition) override;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.h (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.h 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebKit2/UIProcess/WebContext.h 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -488,7 +488,7 @@
</span><span class="cx"> HTTPCookieAcceptPolicy m_initialHTTPCookieAcceptPolicy;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> RetainPtr<NSObject> m_enhancedAccessibilityObserver;
</span><span class="cx"> RetainPtr<NSObject> m_automaticTextReplacementNotificationObserver;
</span><span class="cx"> RetainPtr<NSObject> m_automaticSpellingCorrectionNotificationObserver;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebInspectorProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> #include "WKGeometry.h"
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> void hide();
</span><span class="cx"> void close();
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> void createInspectorWindow();
</span><span class="cx"> void updateInspectorWindowTitle() const;
</span><span class="cx"> void inspectedViewFrameDidChange(CGFloat = 0);
</span><span class="lines">@@ -224,7 +224,7 @@
</span><span class="cx">
</span><span class="cx"> AttachmentSide m_attachmentSide;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> RetainPtr<WKWebInspectorWKView> m_inspectorView;
</span><span class="cx"> RetainPtr<NSWindow> m_inspectorWindow;
</span><span class="cx"> RetainPtr<NSButton> m_dockBottomButton;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -857,7 +857,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_loaderClient->didChangeBackForwardList(this, added, std::move(removed));
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> m_pageClient.clearCustomSwipeViews();
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -2836,7 +2836,7 @@
</span><span class="cx"> void WebPageProxy::pageDidScroll()
</span><span class="cx"> {
</span><span class="cx"> m_uiClient->pageDidScroll(this);
</span><del>-#if !PLATFORM(IOS) && PLATFORM(MAC)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> dismissCorrectionPanel(ReasonForDismissingAlternativeTextIgnored);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -3925,7 +3925,7 @@
</span><span class="cx"> // FIXME: Notify input methods about abandoned composition.
</span><span class="cx"> m_temporarilyClosedComposition = false;
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS) && PLATFORM(MAC)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> dismissCorrectionPanel(ReasonForDismissingAlternativeTextIgnored);
</span><span class="cx"> m_pageClient.dismissDictionaryLookupPanel();
</span><span class="cx"> #endif
</span><span class="lines">@@ -3965,7 +3965,7 @@
</span><span class="cx"> parameters.backgroundExtendsBeyondPage = m_backgroundExtendsBeyondPage;
</span><span class="cx"> parameters.layerHostingMode = m_layerHostingMode;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> parameters.colorSpace = m_pageClient.colorSpace();
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -4358,7 +4358,7 @@
</span><span class="cx"> m_process->send(Messages::WebPage::SetAutoSizingShouldExpandToViewHeight(shouldExpand), m_pageID, 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS) && PLATFORM(MAC)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> void WebPageProxy::substitutionsPanelIsShowing(bool& isShowing)
</span><span class="cx"> {
</span><span class="lines">@@ -4408,7 +4408,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#endif // !PLATFORM(IOS) && PLATFORM(MAC)
</del><ins>+#endif // PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> RetainPtr<CGImageRef> WebPageProxy::takeViewSnapshot()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -1139,7 +1139,7 @@
</span><span class="cx">
</span><span class="cx"> bool maybeInitializeSandboxExtensionHandle(const WebCore::URL&, SandboxExtension::Handle&);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> void substitutionsPanelIsShowing(bool&);
</span><span class="cx"> void showCorrectionPanel(int32_t panelType, const WebCore::FloatRect& boundingBoxOfReplacedString, const String& replacedString, const String& replacementString, const Vector<String>& alternativeReplacementStrings);
</span><span class="cx"> void dismissCorrectionPanel(int32_t reason);
</span><span class="lines">@@ -1151,7 +1151,7 @@
</span><span class="cx"> void removeDictationAlternatives(uint64_t dictationContext);
</span><span class="cx"> void dictationAlternatives(uint64_t dictationContext, Vector<String>& result);
</span><span class="cx"> #endif
</span><del>-#endif // PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#endif // PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> void didGetTapHighlightGeometries(uint64_t requestID, const WebCore::Color& color, const Vector<WebCore::FloatQuad>& geometries, const WebCore::IntSize& topLeftRadius, const WebCore::IntSize& topRightRadius, const WebCore::IntSize& bottomLeftRadius, const WebCore::IntSize& bottomRightRadius);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -281,7 +281,7 @@
</span><span class="cx"> #if USE(APPKIT)
</span><span class="cx"> SubstitutionsPanelIsShowing() -> (bool isShowing)
</span><span class="cx"> #endif
</span><del>-#if !PLATFORM(IOS) && PLATFORM(MAC)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> # Autocorrection messages
</span><span class="cx"> ShowCorrectionPanel(int32_t panelType, WebCore::FloatRect boundingBoxOfReplacedString, String replacedString, String replacementString, Vector<String> alternativeReplacementStrings)
</span><span class="cx"> DismissCorrectionPanel(int32_t reason)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebContextMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx"> {
</span><span class="cx"> parameters.presenterApplicationPid = getpid();
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> parameters.accessibilityEnhancedUserInterfaceEnabled = [[NSApp accessibilityAttributeValue:@"AXEnhancedUserInterface"] boolValue];
</span><span class="cx"> #else
</span><span class="cx"> parameters.accessibilityEnhancedUserInterfaceEnabled = false;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -356,7 +356,7 @@
</span><span class="cx">
</span><span class="cx"> void WKBundlePageSetTopOverhangImage(WKBundlePageRef pageRef, WKImageRef imageRef)
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> toImpl(pageRef)->setTopOverhangImage(toImpl(imageRef));
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(pageRef);
</span><span class="lines">@@ -366,7 +366,7 @@
</span><span class="cx">
</span><span class="cx"> void WKBundlePageSetBottomOverhangImage(WKBundlePageRef pageRef, WKImageRef imageRef)
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> toImpl(pageRef)->setBottomOverhangImage(toImpl(imageRef));
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(pageRef);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagePageBannerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/PageBanner.h (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/PageBanner.h 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebKit2/WebProcess/WebPage/PageBanner.h 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include "WebEvent.h"
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> OBJC_CLASS CALayer;
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #endif
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> virtual bool mouseEvent(PageBanner*, WebEvent::Type, WebMouseEvent::Button, const WebCore::IntPoint&) = 0;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> static PassRefPtr<PageBanner> create(CALayer *, int height, Client*);
</span><span class="cx"> CALayer *layer();
</span><span class="cx"> #endif
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> void didAddParentLayer(WebCore::GraphicsLayer*);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> explicit PageBanner(CALayer *, int height, Client*);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> bool m_mouseDownInBanner;
</span><span class="cx"> bool m_isHidden;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> RetainPtr<CALayer> m_layer;
</span><span class="cx"> int m_height;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -1279,7 +1279,7 @@
</span><span class="cx"> m_page->setDeviceScaleFactor(scaleFactor);
</span><span class="cx">
</span><span class="cx"> // Tell all our plug-in views that the device scale factor changed.
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> for (auto* pluginView : m_pluginViews)
</span><span class="cx"> pluginView->setDeviceScaleFactor(scaleFactor);
</span><span class="cx">
</span><span class="lines">@@ -2028,7 +2028,7 @@
</span><span class="cx"> m_page->setCanStartMedia(true);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC) || PLATFORM(IOS)
</del><ins>+#if !PLATFORM(MAC)
</ins><span class="cx"> void WebPage::didUpdateViewStateTimerFired()
</span><span class="cx"> {
</span><span class="cx"> send(Messages::WebPageProxy::DidUpdateViewState());
</span><span class="lines">@@ -3074,7 +3074,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> m_viewGestureGeometryCollector.mainFrameDidLayout();
</span><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -3360,7 +3360,7 @@
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> RetainPtr<PDFDocument> WebPage::pdfDocumentForPrintingFrame(Frame* coreFrame)
</span><span class="cx"> {
</span><span class="cx"> Document* document = coreFrame->document();
</span><span class="lines">@@ -3376,7 +3376,7 @@
</span><span class="cx">
</span><span class="cx"> return pluginView->pdfDocumentForPrinting();
</span><span class="cx"> }
</span><del>-#endif // PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#endif // PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> void WebPage::beginPrinting(uint64_t frameID, const PrintInfo& printInfo)
</span><span class="cx"> {
</span><span class="lines">@@ -3388,10 +3388,10 @@
</span><span class="cx"> if (!coreFrame)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> if (pdfDocumentForPrintingFrame(coreFrame))
</span><span class="cx"> return;
</span><del>-#endif // PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#endif // PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> if (!m_printContext)
</span><span class="cx"> m_printContext = adoptPtr(new PrintContext(coreFrame));
</span><span class="lines">@@ -3450,7 +3450,7 @@
</span><span class="cx">
</span><span class="cx"> #if USE(CG)
</span><span class="cx"> if (coreFrame) {
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> ASSERT(coreFrame->document()->printing() || pdfDocumentForPrintingFrame(coreFrame));
</span><span class="cx"> #else
</span><span class="cx"> ASSERT(coreFrame->document()->printing());
</span><span class="lines">@@ -3462,7 +3462,7 @@
</span><span class="cx"> float printingScale = static_cast<float>(imageSize.width()) / rect.width();
</span><span class="cx"> graphicsContext->scale(FloatSize(printingScale, printingScale));
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> if (RetainPtr<PDFDocument> pdfDocument = pdfDocumentForPrintingFrame(coreFrame)) {
</span><span class="cx"> ASSERT(!m_printContext);
</span><span class="cx"> graphicsContext->scale(FloatSize(1, -1));
</span><span class="lines">@@ -3496,7 +3496,7 @@
</span><span class="cx"> #if USE(CG)
</span><span class="cx"> if (coreFrame) {
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> ASSERT(coreFrame->document()->printing() || pdfDocumentForPrintingFrame(coreFrame));
</span><span class="cx"> #else
</span><span class="cx"> ASSERT(coreFrame->document()->printing());
</span><span class="lines">@@ -3508,7 +3508,7 @@
</span><span class="cx"> CGRect mediaBox = (m_printContext && m_printContext->pageCount()) ? m_printContext->pageRect(0) : CGRectMake(0, 0, printInfo.availablePaperWidth, printInfo.availablePaperHeight);
</span><span class="cx"> RetainPtr<CGContextRef> context = adoptCF(CGPDFContextCreate(pdfDataConsumer.get(), &mediaBox, 0));
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> if (RetainPtr<PDFDocument> pdfDocument = pdfDocumentForPrintingFrame(coreFrame)) {
</span><span class="cx"> ASSERT(!m_printContext);
</span><span class="cx"> drawPagesToPDFFromPDFDocument(context.get(), pdfDocument.get(), printInfo, first, count);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -291,7 +291,7 @@
</span><span class="cx"> AcceptsFirstMouse(int eventNumber, WebKit::WebMouseEvent event) -> (bool result)
</span><span class="cx"> InsertDictatedText(String text, uint64_t replacementRangeStart, uint64_t replacementRangeEnd, Vector<WebCore::DictationAlternative> dictationAlternatives) -> (bool handled, WebKit::EditorState newState)
</span><span class="cx"> #endif
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> InsertText(String text, uint64_t replacementRangeStart, uint64_t replacementRangeEnd) -> (bool handled, WebKit::EditorState newState)
</span><span class="cx"> SetComposition(String text, Vector<WebCore::CompositionUnderline> underlines, uint64_t selectionStart, uint64_t selectionEnd, uint64_t replacementRangeStart, uint64_t replacementRangeEnd) -> (WebKit::EditorState newState)
</span><span class="cx"> ConfirmComposition() -> (WebKit::EditorState newState)
</span></span></pre></div>
<a id="trunkSourceWebKit2configh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/config.h (164357 => 164358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/config.h 2014-02-19 06:15:59 UTC (rev 164357)
+++ trunk/Source/WebKit2/config.h 2014-02-19 08:12:24 UTC (rev 164358)
</span><span class="lines">@@ -76,13 +76,13 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #ifndef ENABLE_SEC_ITEM_SHIM
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> #define ENABLE_SEC_ITEM_SHIM 1
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #ifndef HAVE_WINDOW_SERVER_OCCLUSION_NOTIFICATIONS
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><ins>+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</ins><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>