<!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>[163725] trunk/Source/WebCore</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/163725">163725</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2014-02-08 14:26:50 -0800 (Sat, 08 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Stop using PLATFORM(MAC) in WebCore except where it means “OS X but not iOS”
https://bugs.webkit.org/show_bug.cgi?id=128464
Reviewed by Anders Carlsson.
* Modules/webaudio/AudioContext.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
(WebCore::AudioContext::constructCommon):
* accessibility/AccessibilityNodeObject.cpp: Ditto.
(WebCore::AccessibilityNodeObject::visibleText):
* accessibility/AccessibilityObject.h: Ditto.
* accessibility/AccessibilityRenderObject.cpp: Ditto.
(WebCore::AccessibilityRenderObject::clickPoint):
(WebCore::AccessibilityRenderObject::visiblePositionForPoint):
(WebCore::AccessibilityRenderObject::addChildren):
* accessibility/AccessibilityRenderObject.h: Ditto.
* bindings/js/JSInspectorFrontendHostCustom.cpp:
(WebCore::JSInspectorFrontendHost::platform): Made it explicit that this function returns
"mac" when built for iOS.
* bindings/js/ScriptController.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
(WebCore::ScriptController::ScriptController):
* bindings/js/ScriptController.h: Ditto.
* crypto/CryptoKey.cpp: Changed PLATFORM(MAC) to OS(DARWIN) && !PLATFORM(EFL) &&
!PLATFORM(GTK) when checking for whether to use CoreCrypto.
* crypto/keys/CryptoKeyRSA.h: Ditto.
* dom/Clipboard.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
* dom/Document.cpp: Ditto.
(WebCore::Document::implicitClose):
* dom/KeyboardEvent.h: Ditto.
* editing/Editor.cpp: Ditto.
(WebCore::Editor::cut):
(WebCore::Editor::copy):
(WebCore::Editor::copyImage):
* editing/Editor.h: Ditto.
* editing/FrameSelection.h: Ditto.
* editing/TypingCommand.cpp: Ditto.
(WebCore::TypingCommand::typingAddedToOpenCommand):
* history/HistoryItem.h: Ditto.
* html/HTMLMediaElement.cpp: Ditto.
(WebCore::HTMLMediaElement::parseAttribute):
* html/HTMLMediaElement.h: Ditto.
* html/HTMLPlugInElement.cpp: Ditto.
(WebCore::registeredPluginReplacements):
* html/HTMLPlugInImageElement.cpp: Ditto.
(WebCore::HTMLPlugInImageElement::setDisplayState):
* html/HTMLSelectElement.cpp: Ditto.
(WebCore::HTMLSelectElement::listBoxDefaultEventHandler):
* html/shadow/MediaControlElements.cpp: Ditto.
(WebCore::MediaControlToggleClosedCaptionsButtonElement::MediaControlToggleClosedCaptionsButtonElement):
(WebCore::MediaControlToggleClosedCaptionsButtonElement::defaultEventHandler):
* html/shadow/MediaControlElements.h: Ditto.
* inspector/InspectorIndexedDBAgent.cpp: Ditto.
* loader/CookieJar.cpp: Ditto.
* loader/DocumentLoader.cpp: Ditto.
(WebCore::DocumentLoader::dataReceived):
* loader/DocumentLoader.h: Ditto.
(WebCore::DocumentLoader::didTellClientAboutLoad):
* loader/EmptyClients.h: Ditto.
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::loadArchive): Added !PLATFORM(IOS) around Mac-only workaround.
(WebCore::FrameLoader::defaultObjectContentType): Changed PLATFORM(MAC) to PLATFORM(COCOA).
(WebCore::FrameLoader::subresourceCachePolicy): Ditto.
* loader/ResourceBuffer.h: Changed PLATFORM(MAC) to USE(FOUNDATION) around functions that
are implemented using Foundation.
* loader/ResourceLoadScheduler.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
(WebCore::ResourceLoadScheduler::scheduleLoad):
* loader/ResourceLoader.cpp: Ditto.
(WebCore::ResourceLoader::didReceiveAuthenticationChallenge):
* loader/ResourceLoader.h: Ditto.
* loader/archive/cf/LegacyWebArchive.cpp: Ditto.
* loader/cache/CachedResource.cpp: Changed PLATFORM(MAC) to USE(FOUNDATION) around function
that is implemented using other USE(FOUNDATION)-guarded code.
* loader/cache/CachedResource.h: Ditto.
* page/Chrome.h: Changed PLATFORM(MAC) to PLATFORM(COCOA).
* page/ChromeClient.h: Ditto.
* page/ContextMenuClient.h: Ditto.
* page/ContextMenuController.cpp: Ditto.
(WebCore::ContextMenuController::contextMenuItemSelected):
(WebCore::ContextMenuController::createAndAppendFontSubMenu):
(WebCore::ContextMenuController::createAndAppendSpellingAndGrammarSubMenu):
(WebCore::ContextMenuController::populate):
(WebCore::ContextMenuController::checkOrEnableIfNeeded):
* page/DragClient.h: Ditto.
* page/DragController.cpp: Ditto.
(WebCore::dragLocForDHTMLDrag):
(WebCore::dragLocForSelectionDrag):
(WebCore::DragController::startDrag):
(WebCore::DragController::doImageDrag):
* page/EditorClient.h: Ditto.
* page/EventHandler.cpp: Ditto.
(WebCore::EventHandler::EventHandler):
(WebCore::EventHandler::handleMouseDraggedEvent):
(WebCore::EventHandler::logicalScrollRecursively):
(WebCore::EventHandler::clearDragState):
(WebCore::EventHandler::handleWheelEvent):
(WebCore::EventHandler::defaultWheelEventHandler):
(WebCore::EventHandler::keyEvent):
(WebCore::EventHandler::eventInvertsTabsToLinksClientCallResult):
* page/EventHandler.h: Ditto.
* page/FrameView.cpp: Ditto.
(WebCore::FrameView::layout):
* page/Page.h: Ditto.
* page/Settings.cpp: Ditto.
* page/Settings.h: Ditto.
* page/scrolling/ScrollingCoordinator.cpp: Ditto.
* page/scrolling/ScrollingCoordinator.h: Ditto.
* page/scrolling/ScrollingStateNode.h: Removed unused #include.
* page/scrolling/ScrollingThread.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
(WebCore::ScrollingThread::createThreadIfNeeded):
* page/scrolling/ScrollingThread.h: Ditto.
* platform/network/cf/ResourceRequest.h: Added !PLATFORM(IOS) around
applyWebArchiveHackForMail.
* platform/network/cf/ResourceRequestCFNet.cpp:
(WebCore::ResourceRequest::applyWebArchiveHackForMail): Ditto.
* platform/network/mac/ResourceRequestMac.mm:
(WebCore::ResourceRequest::applyWebArchiveHackForMail): Ditto.
* plugins/PluginViewNone.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA)
* rendering/RenderBox.cpp: Ditto.
(WebCore::RenderBox::logicalScroll):
* rendering/RenderLayerBacking.cpp: Ditto.
(WebCore::RenderLayerBacking::createGraphicsLayer):
(WebCore::RenderLayerBacking::createPrimaryGraphicsLayer):
* rendering/RenderMenuList.h: Ditto.
* rendering/RenderText.cpp: Ditto.
(WebCore::RenderText::previousOffsetForBackwardDeletion):
* rendering/break_lines.cpp: Removed unused #include.
* testing/js/WebCoreTestSupport.h: Changed PLATFORM(MAC) to PLATFORM(COCOA).
* xml/XSLStyleSheetLibxslt.cpp: Changed PLATFORM(MAC) to OS(DARWIN) && !PLATFORM(EFL) &&
!PLATFORM(GTK) around soft-linking libxslt.
* xml/XSLTExtensions.cpp: Ditto.
* xml/XSLTProcessorLibxslt.cpp: Ditto.
* xml/XSLTUnicodeSort.cpp: Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioAudioContextcpp">trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityNodeObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityObjecth">trunk/Source/WebCore/accessibility/AccessibilityObject.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityRenderObjecth">trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSInspectorFrontendHostCustomcpp">trunk/Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsScriptControllercpp">trunk/Source/WebCore/bindings/js/ScriptController.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsScriptControllerh">trunk/Source/WebCore/bindings/js/ScriptController.h</a></li>
<li><a href="#trunkSourceWebCorecryptoCryptoKeycpp">trunk/Source/WebCore/crypto/CryptoKey.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptokeysCryptoKeyRSAh">trunk/Source/WebCore/crypto/keys/CryptoKeyRSA.h</a></li>
<li><a href="#trunkSourceWebCoredomClipboardcpp">trunk/Source/WebCore/dom/Clipboard.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomKeyboardEventh">trunk/Source/WebCore/dom/KeyboardEvent.h</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorcpp">trunk/Source/WebCore/editing/Editor.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorh">trunk/Source/WebCore/editing/Editor.h</a></li>
<li><a href="#trunkSourceWebCoreeditingFrameSelectionh">trunk/Source/WebCore/editing/FrameSelection.h</a></li>
<li><a href="#trunkSourceWebCoreeditingTypingCommandcpp">trunk/Source/WebCore/editing/TypingCommand.cpp</a></li>
<li><a href="#trunkSourceWebCorehistoryHistoryItemh">trunk/Source/WebCore/history/HistoryItem.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementh">trunk/Source/WebCore/html/HTMLMediaElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLPlugInElementcpp">trunk/Source/WebCore/html/HTMLPlugInElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLPlugInImageElementcpp">trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLSelectElementcpp">trunk/Source/WebCore/html/HTMLSelectElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowMediaControlElementscpp">trunk/Source/WebCore/html/shadow/MediaControlElements.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowMediaControlElementsh">trunk/Source/WebCore/html/shadow/MediaControlElements.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorIndexedDBAgentcpp">trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderCookieJarcpp">trunk/Source/WebCore/loader/CookieJar.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentLoadercpp">trunk/Source/WebCore/loader/DocumentLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentLoaderh">trunk/Source/WebCore/loader/DocumentLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderEmptyClientsh">trunk/Source/WebCore/loader/EmptyClients.h</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceBufferh">trunk/Source/WebCore/loader/ResourceBuffer.h</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoadSchedulercpp">trunk/Source/WebCore/loader/ResourceLoadScheduler.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoadercpp">trunk/Source/WebCore/loader/ResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoaderh">trunk/Source/WebCore/loader/ResourceLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderarchivecfLegacyWebArchivecpp">trunk/Source/WebCore/loader/archive/cf/LegacyWebArchive.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourcecpp">trunk/Source/WebCore/loader/cache/CachedResource.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceh">trunk/Source/WebCore/loader/cache/CachedResource.h</a></li>
<li><a href="#trunkSourceWebCorepageChromeh">trunk/Source/WebCore/page/Chrome.h</a></li>
<li><a href="#trunkSourceWebCorepageChromeClienth">trunk/Source/WebCore/page/ChromeClient.h</a></li>
<li><a href="#trunkSourceWebCorepageContextMenuClienth">trunk/Source/WebCore/page/ContextMenuClient.h</a></li>
<li><a href="#trunkSourceWebCorepageContextMenuControllercpp">trunk/Source/WebCore/page/ContextMenuController.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDragClienth">trunk/Source/WebCore/page/DragClient.h</a></li>
<li><a href="#trunkSourceWebCorepageDragControllercpp">trunk/Source/WebCore/page/DragController.cpp</a></li>
<li><a href="#trunkSourceWebCorepageEditorClienth">trunk/Source/WebCore/page/EditorClient.h</a></li>
<li><a href="#trunkSourceWebCorepageEventHandlercpp">trunk/Source/WebCore/page/EventHandler.cpp</a></li>
<li><a href="#trunkSourceWebCorepageEventHandlerh">trunk/Source/WebCore/page/EventHandler.h</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageh">trunk/Source/WebCore/page/Page.h</a></li>
<li><a href="#trunkSourceWebCorepageSettingscpp">trunk/Source/WebCore/page/Settings.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSettingsh">trunk/Source/WebCore/page/Settings.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingCoordinatorcpp">trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingCoordinatorh">trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingStateNodeh">trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingThreadcpp">trunk/Source/WebCore/page/scrolling/ScrollingThread.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingThreadh">trunk/Source/WebCore/page/scrolling/ScrollingThread.h</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="#trunkSourceWebCoreplatformnetworkmacResourceRequestMacmm">trunk/Source/WebCore/platform/network/mac/ResourceRequestMac.mm</a></li>
<li><a href="#trunkSourceWebCorepluginsPluginViewNonecpp">trunk/Source/WebCore/plugins/PluginViewNone.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMenuListh">trunk/Source/WebCore/rendering/RenderMenuList.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextcpp">trunk/Source/WebCore/rendering/RenderText.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingbreak_linescpp">trunk/Source/WebCore/rendering/break_lines.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingjsWebCoreTestSupporth">trunk/Source/WebCore/testing/js/WebCoreTestSupport.h</a></li>
<li><a href="#trunkSourceWebCorexmlXSLStyleSheetLibxsltcpp">trunk/Source/WebCore/xml/XSLStyleSheetLibxslt.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlXSLTExtensionscpp">trunk/Source/WebCore/xml/XSLTExtensions.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlXSLTProcessorLibxsltcpp">trunk/Source/WebCore/xml/XSLTProcessorLibxslt.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlXSLTUnicodeSortcpp">trunk/Source/WebCore/xml/XSLTUnicodeSort.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/ChangeLog 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -1,3 +1,137 @@
</span><ins>+2014-02-08 Dan Bernstein <mitz@apple.com>
+
+ Stop using PLATFORM(MAC) in WebCore except where it means “OS X but not iOS”
+ https://bugs.webkit.org/show_bug.cgi?id=128464
+
+ Reviewed by Anders Carlsson.
+
+ * Modules/webaudio/AudioContext.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
+ (WebCore::AudioContext::constructCommon):
+ * accessibility/AccessibilityNodeObject.cpp: Ditto.
+ (WebCore::AccessibilityNodeObject::visibleText):
+ * accessibility/AccessibilityObject.h: Ditto.
+ * accessibility/AccessibilityRenderObject.cpp: Ditto.
+ (WebCore::AccessibilityRenderObject::clickPoint):
+ (WebCore::AccessibilityRenderObject::visiblePositionForPoint):
+ (WebCore::AccessibilityRenderObject::addChildren):
+ * accessibility/AccessibilityRenderObject.h: Ditto.
+ * bindings/js/JSInspectorFrontendHostCustom.cpp:
+ (WebCore::JSInspectorFrontendHost::platform): Made it explicit that this function returns
+ "mac" when built for iOS.
+ * bindings/js/ScriptController.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
+ (WebCore::ScriptController::ScriptController):
+ * bindings/js/ScriptController.h: Ditto.
+ * crypto/CryptoKey.cpp: Changed PLATFORM(MAC) to OS(DARWIN) && !PLATFORM(EFL) &&
+ !PLATFORM(GTK) when checking for whether to use CoreCrypto.
+ * crypto/keys/CryptoKeyRSA.h: Ditto.
+ * dom/Clipboard.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
+ * dom/Document.cpp: Ditto.
+ (WebCore::Document::implicitClose):
+ * dom/KeyboardEvent.h: Ditto.
+ * editing/Editor.cpp: Ditto.
+ (WebCore::Editor::cut):
+ (WebCore::Editor::copy):
+ (WebCore::Editor::copyImage):
+ * editing/Editor.h: Ditto.
+ * editing/FrameSelection.h: Ditto.
+ * editing/TypingCommand.cpp: Ditto.
+ (WebCore::TypingCommand::typingAddedToOpenCommand):
+ * history/HistoryItem.h: Ditto.
+ * html/HTMLMediaElement.cpp: Ditto.
+ (WebCore::HTMLMediaElement::parseAttribute):
+ * html/HTMLMediaElement.h: Ditto.
+ * html/HTMLPlugInElement.cpp: Ditto.
+ (WebCore::registeredPluginReplacements):
+ * html/HTMLPlugInImageElement.cpp: Ditto.
+ (WebCore::HTMLPlugInImageElement::setDisplayState):
+ * html/HTMLSelectElement.cpp: Ditto.
+ (WebCore::HTMLSelectElement::listBoxDefaultEventHandler):
+ * html/shadow/MediaControlElements.cpp: Ditto.
+ (WebCore::MediaControlToggleClosedCaptionsButtonElement::MediaControlToggleClosedCaptionsButtonElement):
+ (WebCore::MediaControlToggleClosedCaptionsButtonElement::defaultEventHandler):
+ * html/shadow/MediaControlElements.h: Ditto.
+ * inspector/InspectorIndexedDBAgent.cpp: Ditto.
+ * loader/CookieJar.cpp: Ditto.
+ * loader/DocumentLoader.cpp: Ditto.
+ (WebCore::DocumentLoader::dataReceived):
+ * loader/DocumentLoader.h: Ditto.
+ (WebCore::DocumentLoader::didTellClientAboutLoad):
+ * loader/EmptyClients.h: Ditto.
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::loadArchive): Added !PLATFORM(IOS) around Mac-only workaround.
+ (WebCore::FrameLoader::defaultObjectContentType): Changed PLATFORM(MAC) to PLATFORM(COCOA).
+ (WebCore::FrameLoader::subresourceCachePolicy): Ditto.
+ * loader/ResourceBuffer.h: Changed PLATFORM(MAC) to USE(FOUNDATION) around functions that
+ are implemented using Foundation.
+ * loader/ResourceLoadScheduler.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
+ (WebCore::ResourceLoadScheduler::scheduleLoad):
+ * loader/ResourceLoader.cpp: Ditto.
+ (WebCore::ResourceLoader::didReceiveAuthenticationChallenge):
+ * loader/ResourceLoader.h: Ditto.
+ * loader/archive/cf/LegacyWebArchive.cpp: Ditto.
+ * loader/cache/CachedResource.cpp: Changed PLATFORM(MAC) to USE(FOUNDATION) around function
+ that is implemented using other USE(FOUNDATION)-guarded code.
+ * loader/cache/CachedResource.h: Ditto.
+ * page/Chrome.h: Changed PLATFORM(MAC) to PLATFORM(COCOA).
+ * page/ChromeClient.h: Ditto.
+ * page/ContextMenuClient.h: Ditto.
+ * page/ContextMenuController.cpp: Ditto.
+ (WebCore::ContextMenuController::contextMenuItemSelected):
+ (WebCore::ContextMenuController::createAndAppendFontSubMenu):
+ (WebCore::ContextMenuController::createAndAppendSpellingAndGrammarSubMenu):
+ (WebCore::ContextMenuController::populate):
+ (WebCore::ContextMenuController::checkOrEnableIfNeeded):
+ * page/DragClient.h: Ditto.
+ * page/DragController.cpp: Ditto.
+ (WebCore::dragLocForDHTMLDrag):
+ (WebCore::dragLocForSelectionDrag):
+ (WebCore::DragController::startDrag):
+ (WebCore::DragController::doImageDrag):
+ * page/EditorClient.h: Ditto.
+ * page/EventHandler.cpp: Ditto.
+ (WebCore::EventHandler::EventHandler):
+ (WebCore::EventHandler::handleMouseDraggedEvent):
+ (WebCore::EventHandler::logicalScrollRecursively):
+ (WebCore::EventHandler::clearDragState):
+ (WebCore::EventHandler::handleWheelEvent):
+ (WebCore::EventHandler::defaultWheelEventHandler):
+ (WebCore::EventHandler::keyEvent):
+ (WebCore::EventHandler::eventInvertsTabsToLinksClientCallResult):
+ * page/EventHandler.h: Ditto.
+ * page/FrameView.cpp: Ditto.
+ (WebCore::FrameView::layout):
+ * page/Page.h: Ditto.
+ * page/Settings.cpp: Ditto.
+ * page/Settings.h: Ditto.
+ * page/scrolling/ScrollingCoordinator.cpp: Ditto.
+ * page/scrolling/ScrollingCoordinator.h: Ditto.
+ * page/scrolling/ScrollingStateNode.h: Removed unused #include.
+ * page/scrolling/ScrollingThread.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
+ (WebCore::ScrollingThread::createThreadIfNeeded):
+ * page/scrolling/ScrollingThread.h: Ditto.
+ * platform/network/cf/ResourceRequest.h: Added !PLATFORM(IOS) around
+ applyWebArchiveHackForMail.
+ * platform/network/cf/ResourceRequestCFNet.cpp:
+ (WebCore::ResourceRequest::applyWebArchiveHackForMail): Ditto.
+ * platform/network/mac/ResourceRequestMac.mm:
+ (WebCore::ResourceRequest::applyWebArchiveHackForMail): Ditto.
+ * plugins/PluginViewNone.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA)
+ * rendering/RenderBox.cpp: Ditto.
+ (WebCore::RenderBox::logicalScroll):
+ * rendering/RenderLayerBacking.cpp: Ditto.
+ (WebCore::RenderLayerBacking::createGraphicsLayer):
+ (WebCore::RenderLayerBacking::createPrimaryGraphicsLayer):
+ * rendering/RenderMenuList.h: Ditto.
+ * rendering/RenderText.cpp: Ditto.
+ (WebCore::RenderText::previousOffsetForBackwardDeletion):
+ * rendering/break_lines.cpp: Removed unused #include.
+ * testing/js/WebCoreTestSupport.h: Changed PLATFORM(MAC) to PLATFORM(COCOA).
+ * xml/XSLStyleSheetLibxslt.cpp: Changed PLATFORM(MAC) to OS(DARWIN) && !PLATFORM(EFL) &&
+ !PLATFORM(GTK) around soft-linking libxslt.
+ * xml/XSLTExtensions.cpp: Ditto.
+ * xml/XSLTProcessorLibxslt.cpp: Ditto.
+ * xml/XSLTUnicodeSort.cpp: Ditto.
+
</ins><span class="cx"> 2014-02-08 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove unused ChromeClient::formStateDidChange().
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioAudioContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -196,7 +196,7 @@
</span><span class="cx"> m_restrictions = NoRestrictions;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> addBehaviorRestriction(RequirePageConsentForAudioStartRestriction);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityNodeObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -1350,7 +1350,7 @@
</span><span class="cx"> case CheckBoxRole:
</span><span class="cx"> case ListBoxOptionRole:
</span><span class="cx"> // MacOS does not expect native <li> elements to expose label information, it only expects leaf node elements to do that.
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx"> case ListItemRole:
</span><span class="cx"> #endif
</span><span class="cx"> case MenuButtonRole:
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.h (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.h 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.h 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -40,14 +40,14 @@
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #elif PLATFORM(WIN)
</span><span class="cx"> #include "AccessibilityObjectWrapperWin.h"
</span><span class="cx"> #include "COMPtr.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx">
</span><span class="cx"> typedef struct _NSRange NSRange;
</span><span class="cx">
</span><span class="lines">@@ -732,7 +732,7 @@
</span><span class="cx"> virtual void updateChildrenIfNecessary();
</span><span class="cx"> virtual void setNeedsToUpdateChildren() { }
</span><span class="cx"> virtual void clearChildren();
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> virtual void detachFromParent();
</span><span class="cx"> #else
</span><span class="cx"> virtual void detachFromParent() { }
</span><span class="lines">@@ -911,7 +911,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void overrideAttachmentParent(AccessibilityObject* parent);
</span><span class="cx"> #else
</span><span class="cx"> void overrideAttachmentParent(AccessibilityObject*) { }
</span><span class="lines">@@ -963,7 +963,7 @@
</span><span class="cx"> unsigned getLengthForTextRange() const { return text().length(); }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> RetainPtr<WebAccessibilityObjectWrapper> m_wrapper;
</span><span class="cx"> #elif PLATFORM(WIN)
</span><span class="cx"> COMPtr<AccessibilityObjectWrapper> m_wrapper;
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -910,7 +910,7 @@
</span><span class="cx"> VisibleSelection visSelection = selection();
</span><span class="cx"> VisiblePositionRange range = VisiblePositionRange(visSelection.visibleStart(), visSelection.visibleEnd());
</span><span class="cx"> IntRect bounds = boundsForVisiblePositionRange(range);
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> bounds.setLocation(m_renderer->view().frameView().screenToContents(bounds.location()));
</span><span class="cx"> #endif
</span><span class="cx"> return IntPoint(bounds.x() + (bounds.width() / 2), bounds.y() - (bounds.height() / 2));
</span><span class="lines">@@ -1994,7 +1994,7 @@
</span><span class="cx"> if (!renderView)
</span><span class="cx"> return VisiblePosition();
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> FrameView* frameView = &renderView->frameView();
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -2033,7 +2033,7 @@
</span><span class="cx"> break;
</span><span class="cx"> Frame& frame = toFrameView(widget)->frame();
</span><span class="cx"> renderView = frame.document()->renderView();
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> frameView = toFrameView(widget);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -2913,7 +2913,7 @@
</span><span class="cx"> m_children.append(axWidget);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void AccessibilityRenderObject::updateAttachmentViewParents()
</span><span class="cx"> {
</span><span class="cx"> // Only the unignored parent should set the attachment parent, because that's what is reflected in the AX
</span><span class="lines">@@ -3002,7 +3002,7 @@
</span><span class="cx"> addCanvasChildren();
</span><span class="cx"> addRemoteSVGChildren();
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> updateAttachmentViewParents();
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityRenderObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -264,7 +264,7 @@
</span><span class="cx"> void addCanvasChildren();
</span><span class="cx"> void addAttachmentChildren();
</span><span class="cx"> void addRemoteSVGChildren();
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void updateAttachmentViewParents();
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSInspectorFrontendHostCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx">
</span><span class="cx"> JSValue JSInspectorFrontendHost::platform(ExecState* execState)
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(MAC) || PLATFORM(IOS)
</ins><span class="cx"> DEFINE_STATIC_LOCAL(const String, platform, (ASCIILiteral("mac")));
</span><span class="cx"> #elif OS(WINDOWS)
</span><span class="cx"> DEFINE_STATIC_LOCAL(const String, platform, (ASCIILiteral("windows")));
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsScriptControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ScriptController.cpp (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ScriptController.cpp 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/bindings/js/ScriptController.cpp 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> , m_windowScriptNPObject(0)
</span><span class="cx"> #endif
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> , m_windowScriptObject(0)
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="lines">@@ -379,7 +379,7 @@
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx"> PassRefPtr<JSC::Bindings::Instance> ScriptController::createScriptInstanceForWidget(Widget* widget)
</span><span class="cx"> {
</span><span class="cx"> if (!widget->isPluginView())
</span><span class="lines">@@ -406,7 +406,7 @@
</span><span class="cx"> return jsElementValue.getObject();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx">
</span><span class="cx"> void ScriptController::updatePlatformScriptObjects()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsScriptControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ScriptController.h (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ScriptController.h 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/bindings/js/ScriptController.h 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/text/TextPosition.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> OBJC_CLASS WebScriptObject;
</span><span class="cx"> OBJC_CLASS JSContext;
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx"> void collectIsolatedContexts(Vector<std::pair<JSC::ExecState*, SecurityOrigin*>>&);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> WebScriptObject* windowScriptObject();
</span><span class="cx"> JSContext *javaScriptContext();
</span><span class="cx"> #endif
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> NPObject* m_windowScriptNPObject;
</span><span class="cx"> #endif
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> RetainPtr<WebScriptObject> m_windowScriptObject;
</span><span class="cx"> #endif
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoCryptoKeycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/CryptoKey.cpp (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/CryptoKey.cpp 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/crypto/CryptoKey.cpp 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !OS(DARWIN) || PLATFORM(EFL) || PLATFORM(GTK)
</ins><span class="cx"> Vector<uint8_t> CryptoKey::randomData(size_t size)
</span><span class="cx"> {
</span><span class="cx"> Vector<uint8_t> result(size);
</span></span></pre></div>
<a id="trunkSourceWebCorecryptokeysCryptoKeyRSAh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/keys/CryptoKeyRSA.h (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/keys/CryptoKeyRSA.h 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/crypto/keys/CryptoKeyRSA.h 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SUBTLE_CRYPTO)
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) || PLATFORM(IOS)
</del><ins>+#if OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK)
</ins><span class="cx"> typedef struct _CCRSACryptor *CCRSACryptorRef;
</span><span class="cx"> typedef CCRSACryptorRef PlatformRSAKey;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoredomClipboardcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Clipboard.cpp (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Clipboard.cpp 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/dom/Clipboard.cpp 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -266,7 +266,7 @@
</span><span class="cx"> m_pasteboard->setDragImage(computedImage, computedHotSpot);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx">
</span><span class="cx"> DragImageRef Clipboard::createDragImage(IntPoint& location) const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -2424,7 +2424,7 @@
</span><span class="cx">
</span><span class="cx"> m_processingLoadEvent = false;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) || PLATFORM(WIN) || PLATFORM(GTK) || PLATFORM(EFL)
</del><ins>+#if PLATFORM(COCOA) || PLATFORM(WIN) || PLATFORM(GTK) || PLATFORM(EFL)
</ins><span class="cx"> if (f && hasLivingRenderTree() && AXObjectCache::accessibilityEnabled()) {
</span><span class="cx"> // The AX cache may have been cleared at this point, but we need to make sure it contains an
</span><span class="cx"> // AX object to send the notification to. getOrCreate will make sure that an valid AX object
</span></span></pre></div>
<a id="trunkSourceWebCoredomKeyboardEventh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/KeyboardEvent.h (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/KeyboardEvent.h 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/dom/KeyboardEvent.h 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> class Node;
</span><span class="cx"> class PlatformKeyboardEvent;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> struct KeypressCommand {
</span><span class="cx"> KeypressCommand() { }
</span><span class="cx"> explicit KeypressCommand(const String& commandName) : commandName(commandName) { ASSERT(isASCIILower(commandName[0U])); }
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> virtual bool isKeyboardEvent() const override;
</span><span class="cx"> virtual int which() const override;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> // We only have this need to store keypress command info on the Mac.
</span><span class="cx"> Vector<KeypressCommand>& keypressCommands() { return m_keypressCommands; }
</span><span class="cx"> #endif
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> unsigned m_location;
</span><span class="cx"> bool m_altGraphKey : 1;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> // Commands that were sent by AppKit when interpreting the event. Doesn't include input method commands.
</span><span class="cx"> Vector<KeypressCommand> m_keypressCommands;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.cpp (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.cpp 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/editing/Editor.cpp 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -1284,7 +1284,7 @@
</span><span class="cx"> if (enclosingTextFormControl(m_frame.selection().selection().start()))
</span><span class="cx"> Pasteboard::createForCopyAndPaste()->writePlainText(selectedTextForClipboard(), canSmartCopyOrDelete() ? Pasteboard::CanSmartReplace : Pasteboard::CannotSmartReplace);
</span><span class="cx"> else {
</span><del>-#if PLATFORM(MAC) || PLATFORM(EFL)
</del><ins>+#if PLATFORM(COCOA) || PLATFORM(EFL)
</ins><span class="cx"> writeSelectionToPasteboard(*Pasteboard::createForCopyAndPaste());
</span><span class="cx"> #else
</span><span class="cx"> // FIXME: Convert all other platforms to match Mac and delete this.
</span><span class="lines">@@ -1311,13 +1311,13 @@
</span><span class="cx"> canSmartCopyOrDelete() ? Pasteboard::CanSmartReplace : Pasteboard::CannotSmartReplace);
</span><span class="cx"> } else {
</span><span class="cx"> if (HTMLImageElement* imageElement = imageElementFromImageDocument(document())) {
</span><del>-#if PLATFORM(MAC) || PLATFORM(EFL)
</del><ins>+#if PLATFORM(COCOA) || PLATFORM(EFL)
</ins><span class="cx"> writeImageToPasteboard(*Pasteboard::createForCopyAndPaste(), *imageElement, document().url(), document().title());
</span><span class="cx"> #else
</span><span class="cx"> Pasteboard::createForCopyAndPaste()->writeImage(*imageElement, document().url(), document().title());
</span><span class="cx"> #endif
</span><span class="cx"> } else {
</span><del>-#if PLATFORM(MAC) || PLATFORM(EFL)
</del><ins>+#if PLATFORM(COCOA) || PLATFORM(EFL)
</ins><span class="cx"> writeSelectionToPasteboard(*Pasteboard::createForCopyAndPaste());
</span><span class="cx"> #else
</span><span class="cx"> // FIXME: Convert all other platforms to match Mac and delete this.
</span><span class="lines">@@ -1421,7 +1421,7 @@
</span><span class="cx"> if (url.isEmpty())
</span><span class="cx"> url = result.absoluteImageURL();
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) || PLATFORM(EFL)
</del><ins>+#if PLATFORM(COCOA) || PLATFORM(EFL)
</ins><span class="cx"> writeImageToPasteboard(*Pasteboard::createForCopyAndPaste(), *element, url, result.altDisplayString());
</span><span class="cx"> #else
</span><span class="cx"> Pasteboard::createForCopyAndPaste()->writeImage(*element, url, result.altDisplayString());
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.h (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.h 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/editing/Editor.h 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> #include "VisibleSelection.h"
</span><span class="cx"> #include "WritingDirection.h"
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> OBJC_CLASS NSAttributedString;
</span><span class="cx"> OBJC_CLASS NSDictionary;
</span><span class="cx"> #endif
</span><span class="lines">@@ -419,7 +419,7 @@
</span><span class="cx"> DeleteButtonController& deleteButtonController() const { return *m_deleteButtonController; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> bool insertParagraphSeparatorInQuotedContent();
</span><span class="cx"> const SimpleFontData* fontForSelection(bool&) const;
</span><span class="cx"> NSDictionary* fontAttributesForSelectionStart() const;
</span><span class="lines">@@ -434,7 +434,7 @@
</span><span class="cx"> #endif // !PLATFORM(IOS)
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) || PLATFORM(EFL)
</del><ins>+#if PLATFORM(COCOA) || PLATFORM(EFL)
</ins><span class="cx"> void writeSelectionToPasteboard(Pasteboard&);
</span><span class="cx"> void writeImageToPasteboard(Pasteboard&, Element& imageElement, const URL&, const String& title);
</span><span class="cx"> #endif
</span><span class="lines">@@ -469,7 +469,7 @@
</span><span class="cx">
</span><span class="cx"> bool unifiedTextCheckerEnabled() const;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> PassRefPtr<SharedBuffer> selectionInWebArchiveFormat();
</span><span class="cx"> PassRefPtr<Range> adjustedSelectionRange();
</span><span class="cx"> PassRefPtr<DocumentFragment> createFragmentForImageResourceAndAddResource(PassRefPtr<ArchiveResource>);
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingFrameSelectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/FrameSelection.h (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/FrameSelection.h 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/editing/FrameSelection.h 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -366,7 +366,7 @@
</span><span class="cx"> m_typingStyle = style;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !(PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(EFL))
</del><ins>+#if !(PLATFORM(COCOA) || PLATFORM(GTK) || PLATFORM(EFL))
</ins><span class="cx"> #if HAVE(ACCESSIBILITY)
</span><span class="cx"> inline void FrameSelection::notifyAccessibilityForSelectionChange()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingTypingCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/TypingCommand.cpp (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/TypingCommand.cpp 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/editing/TypingCommand.cpp 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -345,7 +345,7 @@
</span><span class="cx">
</span><span class="cx"> updatePreservesTypingStyle(commandTypeForAddedTyping);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> frame.editor().appliedEditing(this);
</span><span class="cx"> // Since the spellchecking code may also perform corrections and other replacements, it should happen after the typing changes.
</span><span class="cx"> if (!m_shouldPreventSpellChecking)
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryHistoryItemh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/HistoryItem.h (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/HistoryItem.h 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/history/HistoryItem.h 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> #include "ViewportArguments.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx"> typedef struct objc_object* id;
</span><span class="cx"> #endif
</span><span class="lines">@@ -164,7 +164,7 @@
</span><span class="cx">
</span><span class="cx"> bool isCurrentDocument(Document*) const;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> id viewState() const;
</span><span class="cx"> void setViewState(id);
</span><span class="cx">
</span><span class="lines">@@ -263,7 +263,7 @@
</span><span class="cx"> String m_sharedLinkUniqueIdentifier;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> RetainPtr<id> m_viewState;
</span><span class="cx"> std::unique_ptr<HashMap<String, RetainPtr<id>>> m_transientProperties;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> #include "WebKitPlaybackTargetAvailabilityEvent.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include "DisplaySleepDisabler.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -5476,7 +5476,7 @@
</span><span class="cx">
</span><span class="cx"> void HTMLMediaElement::updateSleepDisabling()
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> if (!shouldDisableSleep() && m_sleepDisabler)
</span><span class="cx"> m_sleepDisabler = nullptr;
</span><span class="cx"> else if (shouldDisableSleep() && !m_sleepDisabler)
</span><span class="lines">@@ -5484,7 +5484,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> bool HTMLMediaElement::shouldDisableSleep() const
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(PAGE_VISIBILITY_API)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.h 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> #if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
</span><span class="cx"> class Widget;
</span><span class="cx"> #endif
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> class DisplaySleepDisabler;
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(ENCRYPTED_MEDIA_V2)
</span><span class="lines">@@ -659,7 +659,7 @@
</span><span class="cx"> bool isAutoplaying() const { return m_autoplaying; }
</span><span class="cx">
</span><span class="cx"> void updateSleepDisabling();
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> bool shouldDisableSleep() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -811,7 +811,7 @@
</span><span class="cx"> friend class MediaController;
</span><span class="cx"> RefPtr<MediaController> m_mediaController;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> OwnPtr<DisplaySleepDisabler> m_sleepDisabler;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLPlugInElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLPlugInElement.cpp (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLPlugInElement.cpp 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/html/HTMLPlugInElement.cpp 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> #include "npruntime_impl.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include "QuickTimePluginReplacement.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -313,7 +313,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> static void registrar(const ReplacementPlugin&);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -326,14 +326,14 @@
</span><span class="cx"> return registeredReplacements;
</span><span class="cx"> enginesQueried = true;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> QuickTimePluginReplacement::registerPluginReplacement(registrar);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> return registeredReplacements;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> static void registrar(const ReplacementPlugin& replacement)
</span><span class="cx"> {
</span><span class="cx"> registeredPluginReplacements().append(new ReplacementPlugin(replacement));
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLPlugInImageElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx">
</span><span class="cx"> void HTMLPlugInImageElement::setDisplayState(DisplayState state)
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> if (state == RestartingWithPendingMouseClick || state == Restarting) {
</span><span class="cx"> m_isRestartedPlugin = true;
</span><span class="cx"> m_snapshotDecision = NeverSnapshot;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLSelectElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLSelectElement.cpp (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLSelectElement.cpp 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/html/HTMLSelectElement.cpp 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -1351,7 +1351,7 @@
</span><span class="cx"> int listIndex = toRenderListBox(renderer())->listIndexAtOffset(toIntSize(localOffset));
</span><span class="cx"> if (listIndex >= 0) {
</span><span class="cx"> if (!isDisabledFormControl()) {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> updateSelectedState(listIndex, mouseEvent->metaKey(), mouseEvent->shiftKey());
</span><span class="cx"> #else
</span><span class="cx"> updateSelectedState(listIndex, mouseEvent->ctrlKey(), mouseEvent->shiftKey());
</span><span class="lines">@@ -1456,7 +1456,7 @@
</span><span class="cx"> ASSERT_UNUSED(listItems, !listItems.size() || static_cast<size_t>(endIndex) < listItems.size());
</span><span class="cx"> setActiveSelectionEndIndex(endIndex);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> m_allowsNonContiguousSelection = m_multiple && isSpatialNavigationEnabled(document().frame());
</span><span class="cx"> #else
</span><span class="cx"> m_allowsNonContiguousSelection = m_multiple && (isSpatialNavigationEnabled(document().frame()) || static_cast<KeyboardEvent*>(event)->ctrlKey());
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowMediaControlElementscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/MediaControlElements.cpp (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -673,11 +673,11 @@
</span><span class="cx">
</span><span class="cx"> MediaControlToggleClosedCaptionsButtonElement::MediaControlToggleClosedCaptionsButtonElement(Document& document, MediaControls* controls)
</span><span class="cx"> : MediaControlInputElement(document, MediaShowClosedCaptionsButton)
</span><del>-#if PLATFORM(MAC) || PLATFORM(WIN) || PLATFORM(GTK)
</del><ins>+#if PLATFORM(COCOA) || PLATFORM(WIN) || PLATFORM(GTK)
</ins><span class="cx"> , m_controls(controls)
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><del>-#if !PLATFORM(MAC) && !PLATFORM(WIN) || !PLATFORM(GTK)
</del><ins>+#if !PLATFORM(COCOA) && !PLATFORM(WIN) || !PLATFORM(GTK)
</ins><span class="cx"> UNUSED_PARAM(controls);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -707,7 +707,7 @@
</span><span class="cx"> // UI. Not all ports may want the closed captions button to toggle a list of tracks, so
</span><span class="cx"> // we have to use #if.
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=101877
</span><del>-#if !PLATFORM(MAC) && !PLATFORM(WIN) && !PLATFORM(GTK)
</del><ins>+#if !PLATFORM(COCOA) && !PLATFORM(WIN) && !PLATFORM(GTK)
</ins><span class="cx"> mediaController()->setClosedCaptionsVisible(!mediaController()->closedCaptionsVisible());
</span><span class="cx"> setChecked(mediaController()->closedCaptionsVisible());
</span><span class="cx"> updateDisplayType();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowMediaControlElementsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/MediaControlElements.h (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/MediaControlElements.h 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/html/shadow/MediaControlElements.h 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -295,7 +295,7 @@
</span><span class="cx"> virtual const AtomicString& shadowPseudoId() const override;
</span><span class="cx"> virtual void defaultEventHandler(Event*) override;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) || PLATFORM(WIN) || PLATFORM(GTK)
</del><ins>+#if PLATFORM(COCOA) || PLATFORM(WIN) || PLATFORM(GTK)
</ins><span class="cx"> MediaControls* m_controls;
</span><span class="cx"> #endif
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorIndexedDBAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -238,7 +238,7 @@
</span><span class="cx"> return idbIndex;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx"> static PassRefPtr<KeyPath> keyPathFromIDBKeyPath(const IDBKeyPath& idbKeyPath)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<KeyPath> keyPath;
</span><span class="lines">@@ -265,7 +265,7 @@
</span><span class="cx">
</span><span class="cx"> return keyPath.release();
</span><span class="cx"> }
</span><del>-#endif // !PLATFORM(MAC)
</del><ins>+#endif // !PLATFORM(COCOA)
</ins><span class="cx">
</span><span class="cx"> class DatabaseLoader : public ExecutableWithDatabase {
</span><span class="cx"> public:
</span><span class="lines">@@ -278,7 +278,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void execute(PassRefPtr<IDBDatabase> prpDatabase) override
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> ASSERT_UNUSED(prpDatabase, prpDatabase);
</span><span class="cx"> #else
</span><span class="cx"> RefPtr<IDBDatabase> idbDatabase = prpDatabase;
</span><span class="lines">@@ -319,7 +319,7 @@
</span><span class="cx"> .setObjectStores(objectStores);
</span><span class="cx">
</span><span class="cx"> m_requestCallback->sendSuccess(result);
</span><del>-#endif // PLATFORM(MAC)
</del><ins>+#endif // PLATFORM(COCOA)
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual RequestCallback* requestCallback() override { return m_requestCallback.get(); }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderCookieJarcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/CookieJar.cpp (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/CookieJar.cpp 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/loader/CookieJar.cpp 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> return frame->loader().networkingContext();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) || USE(CFNETWORK) || USE(SOUP)
</del><ins>+#if PLATFORM(COCOA) || USE(CFNETWORK) || USE(SOUP)
</ins><span class="cx"> inline NetworkStorageSession& storageSession(const Document* document)
</span><span class="cx"> {
</span><span class="cx"> NetworkingContext* context = networkingContext(document);
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -850,7 +850,7 @@
</span><span class="cx"> ASSERT_UNUSED(resource, resource == m_mainResource);
</span><span class="cx"> ASSERT(!m_response.isNull());
</span><span class="cx">
</span><del>-#if USE(CFNETWORK) || PLATFORM(MAC)
</del><ins>+#if USE(CFNETWORK) || PLATFORM(COCOA)
</ins><span class="cx"> // Workaround for <rdar://problem/6060782>
</span><span class="cx"> if (m_response.isNull())
</span><span class="cx"> m_response = ResourceResponse(URL(), "text/html", 0, String(), String());
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.h (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.h 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/loader/DocumentLoader.h 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx"> void setTitle(const StringWithDirection&);
</span><span class="cx"> const String& overrideEncoding() const { return m_overrideEncoding; }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void schedule(WTF::SchedulePair*);
</span><span class="cx"> void unschedule(WTF::SchedulePair*);
</span><span class="cx"> #endif
</span><span class="lines">@@ -238,7 +238,7 @@
</span><span class="cx">
</span><span class="cx"> void didTellClientAboutLoad(const String& url)
</span><span class="cx"> {
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx"> // Don't include data urls here, as if a lot of data is loaded
</span><span class="cx"> // that way, we hold on to the (large) url string for too long.
</span><span class="cx"> if (protocolIs(url, "data"))
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderEmptyClientsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/EmptyClients.h (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/EmptyClients.h 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/loader/EmptyClients.h 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -382,7 +382,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void registerForIconNotification(bool) override { }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> virtual RemoteAXObjectRef accessibilityRemoteObject() override { return 0; }
</span><span class="cx"> virtual NSCachedURLResponse* willCacheResponse(DocumentLoader*, unsigned long, NSCachedURLResponse* response) const override { return response; }
</span><span class="cx"> #endif
</span><span class="lines">@@ -484,7 +484,7 @@
</span><span class="cx"> virtual int pasteboardChangeCount() override { return 0; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> virtual NSString* userVisibleString(NSURL*) override { return 0; }
</span><span class="cx"> virtual DocumentFragment* documentFragmentFromAttributedString(NSAttributedString*, Vector<RefPtr<ArchiveResource>>&) override { return 0; };
</span><span class="cx"> virtual void setInsertionPasteboard(const String&) override { };
</span><span class="lines">@@ -557,7 +557,7 @@
</span><span class="cx"> virtual void speak(const String&) override { }
</span><span class="cx"> virtual void stopSpeaking() override { }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> virtual void searchWithSpotlight() override { }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -924,7 +924,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)
</del><ins>+#if PLATFORM(MAC) && !PLATFORM(IOS)
</ins><span class="cx"> request.applyWebArchiveHackForMail();
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -941,7 +941,7 @@
</span><span class="cx"> if (mimeType.isEmpty())
</span><span class="cx"> mimeType = mimeTypeFromURL(url);
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC) && !PLATFORM(EFL) // Mac has no PluginDatabase, nor does EFL
</del><ins>+#if !PLATFORM(COCOA) && !PLATFORM(EFL) // Mac has no PluginDatabase, nor does EFL
</ins><span class="cx"> if (mimeType.isEmpty()) {
</span><span class="cx"> String decodedPath = decodeURLEscapeSequences(url.path());
</span><span class="cx"> mimeType = PluginDatabase::installedPlugins()->MIMETypeForExtension(decodedPath.substring(decodedPath.reverseFind('.') + 1));
</span><span class="lines">@@ -951,7 +951,7 @@
</span><span class="cx"> if (mimeType.isEmpty())
</span><span class="cx"> return ObjectContentFrame; // Go ahead and hope that we can display the content.
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC) && !PLATFORM(EFL) // Mac has no PluginDatabase, nor does EFL
</del><ins>+#if !PLATFORM(COCOA) && !PLATFORM(EFL) // Mac has no PluginDatabase, nor does EFL
</ins><span class="cx"> bool plugInSupportsMIMEType = PluginDatabase::installedPlugins()->isMIMETypeRegistered(mimeType);
</span><span class="cx"> #else
</span><span class="cx"> bool plugInSupportsMIMEType = false;
</span><span class="lines">@@ -2157,7 +2157,7 @@
</span><span class="cx"> return CachePolicyRevalidate;
</span><span class="cx">
</span><span class="cx"> const ResourceRequest& request(documentLoader()->request());
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> if (request.cachePolicy() == ReloadIgnoringCacheData && !equalIgnoringCase(request.httpMethod(), "post") && ResourceRequest::useQuickLookResourceCachingQuirks())
</span><span class="cx"> return CachePolicyRevalidate;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceBufferh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceBuffer.h (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceBuffer.h 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/loader/ResourceBuffer.h 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if USE(FOUNDATION)
</ins><span class="cx"> OBJC_CLASS NSData;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> unsigned getSomeData(const char*& data, unsigned position = 0) const;
</span><span class="cx">
</span><span class="cx"> SharedBuffer* sharedBuffer() const;
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if USE(FOUNDATION)
</ins><span class="cx"> void tryReplaceSharedBufferContents(SharedBuffer*);
</span><span class="cx"> #endif
</span><span class="cx"> PassRefPtr<ResourceBuffer> copy() const;
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> // Ensure this buffer has no other clients before calling this.
</span><span class="cx"> PassOwnPtr<PurgeableBuffer> releasePurgeableBuffer();
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if USE(FOUNDATION)
</ins><span class="cx"> SharedBuffer::NSDataRetainPtrWithoutImplicitConversionOperator createNSData();
</span><span class="cx"> #endif
</span><span class="cx"> #if USE(CF)
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoadSchedulercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoadScheduler.cpp (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoadScheduler.cpp 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/loader/ResourceLoadScheduler.cpp 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -162,7 +162,7 @@
</span><span class="cx"> bool hadRequests = host->hasRequests();
</span><span class="cx"> host->schedule(resourceLoader, priority);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) || USE(CFNETWORK)
</del><ins>+#if PLATFORM(COCOA) || USE(CFNETWORK)
</ins><span class="cx"> if (!isSuspendingPendingRequests()) {
</span><span class="cx"> // Serve all requests at once to keep the pipeline full at the network layer.
</span><span class="cx"> // FIXME: Does this code do anything useful, given that we also set maxRequestsInFlightPerHost to effectively unlimited on these platforms?
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoader.cpp (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoader.cpp 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/loader/ResourceLoader.cpp 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -559,7 +559,7 @@
</span><span class="cx"> }
</span><span class="cx"> // Only these platforms provide a way to continue without credentials.
</span><span class="cx"> // If we can't continue with credentials, we need to cancel the load altogether.
</span><del>-#if PLATFORM(MAC) || USE(CFNETWORK) || USE(CURL) || PLATFORM(GTK) || PLATFORM(EFL)
</del><ins>+#if PLATFORM(COCOA) || USE(CFNETWORK) || USE(CURL) || PLATFORM(GTK) || PLATFORM(EFL)
</ins><span class="cx"> challenge.authenticationClient()->receivedRequestToContinueWithoutCredential(challenge);
</span><span class="cx"> ASSERT(!handle() || !handle()->hasAuthenticationChallenge());
</span><span class="cx"> #else
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoader.h (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoader.h 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/loader/ResourceLoader.h 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx"> virtual void didFail(ResourceHandle*, const ResourceError&) override;
</span><span class="cx"> virtual void wasBlocked(ResourceHandle*) override;
</span><span class="cx"> virtual void cannotShowURL(ResourceHandle*) override;
</span><del>-#if PLATFORM(MAC) && !USE(CFNETWORK)
</del><ins>+#if PLATFORM(COCOA) && !USE(CFNETWORK)
</ins><span class="cx"> virtual void willStopBufferingData(ResourceHandle*, const char* data, unsigned length) override { willStopBufferingData(data, length); }
</span><span class="cx"> #endif
</span><span class="cx"> virtual bool shouldUseCredentialStorage(ResourceHandle*) override { return shouldUseCredentialStorage(); }
</span><span class="lines">@@ -133,13 +133,13 @@
</span><span class="cx"> virtual bool canAuthenticateAgainstProtectionSpace(ResourceHandle*, const ProtectionSpace& protectionSpace) override { return canAuthenticateAgainstProtectionSpace(protectionSpace); }
</span><span class="cx"> #endif
</span><span class="cx"> virtual void receivedCancellation(ResourceHandle*, const AuthenticationChallenge& challenge) override { receivedCancellation(challenge); }
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #if USE(CFNETWORK)
</span><span class="cx"> virtual CFCachedURLResponseRef willCacheResponse(ResourceHandle*, CFCachedURLResponseRef) override;
</span><span class="cx"> #else
</span><span class="cx"> virtual NSCachedURLResponse* willCacheResponse(ResourceHandle*, NSCachedURLResponse*) override;
</span><span class="cx"> #endif
</span><del>-#endif // PLATFORM(MAC)
</del><ins>+#endif // PLATFORM(COCOA)
</ins><span class="cx"> #if PLATFORM(WIN) && USE(CFNETWORK)
</span><span class="cx"> // FIXME: Windows should use willCacheResponse - <https://bugs.webkit.org/show_bug.cgi?id=57257>.
</span><span class="cx"> virtual bool shouldCacheResponse(ResourceHandle*, CFCachedURLResponseRef) override;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderarchivecfLegacyWebArchivecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/archive/cf/LegacyWebArchive.cpp (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/archive/cf/LegacyWebArchive.cpp 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/loader/archive/cf/LegacyWebArchive.cpp 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -406,7 +406,7 @@
</span><span class="cx"> return plistData;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx">
</span><span class="cx"> ResourceResponse LegacyWebArchive::createResourceResponseFromMacArchivedData(CFDataRef responseData)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResource.cpp (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResource.cpp 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/loader/cache/CachedResource.cpp 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -888,7 +888,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if USE(FOUNDATION)
</ins><span class="cx"> void CachedResource::tryReplaceEncodedData(PassRefPtr<SharedBuffer> newBuffer)
</span><span class="cx"> {
</span><span class="cx"> if (!m_data)
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResource.h (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResource.h 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/loader/cache/CachedResource.h 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -256,7 +256,7 @@
</span><span class="cx">
</span><span class="cx"> virtual bool canReuse(const ResourceRequest&) const { return true; }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if USE(FOUNDATION)
</ins><span class="cx"> void tryReplaceEncodedData(PassRefPtr<SharedBuffer>);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageChromeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Chrome.h (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Chrome.h 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/page/Chrome.h 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #ifndef __OBJC__
</span><span class="cx"> class NSView;
</span><span class="cx"> #endif
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx">
</span><span class="cx"> bool requiresFullscreenForVideoPlayback();
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void focusNSView(NSView*);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ChromeClient.h (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ChromeClient.h 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/page/ChromeClient.h 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -330,7 +330,7 @@
</span><span class="cx"> virtual IntRect visibleRectForTiledBackingStore() const { return IntRect(); }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> virtual NSResponder *firstResponder() { return 0; }
</span><span class="cx"> virtual void makeFirstResponder(NSResponder *) { }
</span><span class="cx"> // Focuses on the containing view associated with this page.
</span></span></pre></div>
<a id="trunkSourceWebCorepageContextMenuClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ContextMenuClient.h (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ContextMenuClient.h 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/page/ContextMenuClient.h 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> virtual void speak(const String&) = 0;
</span><span class="cx"> virtual void stopSpeaking() = 0;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> virtual void searchWithSpotlight() = 0;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageContextMenuControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ContextMenuController.cpp (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ContextMenuController.cpp 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/page/ContextMenuController.cpp 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -428,7 +428,7 @@
</span><span class="cx"> case ContextMenuItemTagTextDirectionRightToLeft:
</span><span class="cx"> frame->editor().command("MakeTextWritingDirectionRightToLeft").execute();
</span><span class="cx"> break;
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> case ContextMenuItemTagSearchInSpotlight:
</span><span class="cx"> m_client.searchWithSpotlight();
</span><span class="cx"> break;
</span><span class="lines">@@ -445,7 +445,7 @@
</span><span class="cx"> case ContextMenuItemTagCheckGrammarWithSpelling:
</span><span class="cx"> frame->editor().toggleGrammarChecking();
</span><span class="cx"> break;
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> case ContextMenuItemTagShowFonts:
</span><span class="cx"> frame->editor().showFontPanel();
</span><span class="cx"> break;
</span><span class="lines">@@ -467,7 +467,7 @@
</span><span class="cx"> frame->editor().capitalizeWord();
</span><span class="cx"> break;
</span><span class="cx"> #endif
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> case ContextMenuItemTagChangeBack:
</span><span class="cx"> frame->editor().changeBackToReplacedString(m_hitTestResult.replacedString());
</span><span class="cx"> break;
</span><span class="lines">@@ -520,26 +520,26 @@
</span><span class="cx"> {
</span><span class="cx"> ContextMenu fontMenu;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> ContextMenuItem showFonts(ActionType, ContextMenuItemTagShowFonts, contextMenuItemTagShowFonts());
</span><span class="cx"> #endif
</span><span class="cx"> ContextMenuItem bold(CheckableActionType, ContextMenuItemTagBold, contextMenuItemTagBold());
</span><span class="cx"> ContextMenuItem italic(CheckableActionType, ContextMenuItemTagItalic, contextMenuItemTagItalic());
</span><span class="cx"> ContextMenuItem underline(CheckableActionType, ContextMenuItemTagUnderline, contextMenuItemTagUnderline());
</span><span class="cx"> ContextMenuItem outline(ActionType, ContextMenuItemTagOutline, contextMenuItemTagOutline());
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> ContextMenuItem styles(ActionType, ContextMenuItemTagStyles, contextMenuItemTagStyles());
</span><span class="cx"> ContextMenuItem showColors(ActionType, ContextMenuItemTagShowColors, contextMenuItemTagShowColors());
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> appendItem(showFonts, &fontMenu);
</span><span class="cx"> #endif
</span><span class="cx"> appendItem(bold, &fontMenu);
</span><span class="cx"> appendItem(italic, &fontMenu);
</span><span class="cx"> appendItem(underline, &fontMenu);
</span><span class="cx"> appendItem(outline, &fontMenu);
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> appendItem(styles, &fontMenu);
</span><span class="cx"> appendItem(*separatorItem(), &fontMenu);
</span><span class="cx"> appendItem(showColors, &fontMenu);
</span><span class="lines">@@ -563,19 +563,19 @@
</span><span class="cx"> contextMenuItemTagCheckSpellingWhileTyping());
</span><span class="cx"> ContextMenuItem grammarWithSpelling(CheckableActionType, ContextMenuItemTagCheckGrammarWithSpelling,
</span><span class="cx"> contextMenuItemTagCheckGrammarWithSpelling());
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> ContextMenuItem correctSpelling(CheckableActionType, ContextMenuItemTagCorrectSpellingAutomatically,
</span><span class="cx"> contextMenuItemTagCorrectSpellingAutomatically());
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> appendItem(showSpellingPanel, &spellingAndGrammarMenu);
</span><span class="cx"> appendItem(checkSpelling, &spellingAndGrammarMenu);
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> appendItem(*separatorItem(), &spellingAndGrammarMenu);
</span><span class="cx"> #endif
</span><span class="cx"> appendItem(checkAsYouType, &spellingAndGrammarMenu);
</span><span class="cx"> appendItem(grammarWithSpelling, &spellingAndGrammarMenu);
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> appendItem(correctSpelling, &spellingAndGrammarMenu);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -585,7 +585,7 @@
</span><span class="cx"> #endif // !PLATFORM(GTK)
</span><span class="cx">
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx">
</span><span class="cx"> void ContextMenuController::createAndAppendSpeechSubMenu(ContextMenuItem& speechMenuItem)
</span><span class="cx"> {
</span><span class="lines">@@ -668,7 +668,7 @@
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx">
</span><span class="cx"> void ContextMenuController::createAndAppendSubstitutionsSubMenu(ContextMenuItem& substitutionsMenuItem)
</span><span class="cx"> {
</span><span class="lines">@@ -722,13 +722,13 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #define SUPPORTS_TOGGLE_VIDEO_FULLSCREEN 1
</span><span class="cx"> #else
</span><span class="cx"> #define SUPPORTS_TOGGLE_VIDEO_FULLSCREEN 0
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #define SUPPORTS_TOGGLE_SHOW_HIDE_MEDIA_CONTROLS 1
</span><span class="cx"> #else
</span><span class="cx"> #define SUPPORTS_TOGGLE_SHOW_HIDE_MEDIA_CONTROLS 0
</span><span class="lines">@@ -773,7 +773,7 @@
</span><span class="cx"> contextMenuItemTagEnterVideoFullscreen());
</span><span class="cx"> ContextMenuItem ToggleVideoFullscreen(ActionType, ContextMenuItemTagToggleVideoFullscreen,
</span><span class="cx"> contextMenuItemTagEnterVideoFullscreen());
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> ContextMenuItem SearchSpotlightItem(ActionType, ContextMenuItemTagSearchInSpotlight,
</span><span class="cx"> contextMenuItemTagSearchInSpotlight());
</span><span class="cx"> #endif
</span><span class="lines">@@ -865,7 +865,7 @@
</span><span class="cx"> if (imageURL.isEmpty() && linkURL.isEmpty() && mediaURL.isEmpty()) {
</span><span class="cx"> if (m_hitTestResult.isSelected()) {
</span><span class="cx"> if (selectionContainsPossibleWord(frame)) {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> String selectedString = frame->displayStringModifiedByEncoding(frame->editor().selectedText());
</span><span class="cx"> ContextMenuItem LookUpInDictionaryItem(ActionType, ContextMenuItemTagLookUpInDictionary, contextMenuItemTagLookUpInDictionary(selectedString));
</span><span class="cx">
</span><span class="lines">@@ -879,7 +879,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> appendItem(CopyItem, m_contextMenu.get());
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> appendItem(*separatorItem(), m_contextMenu.get());
</span><span class="cx">
</span><span class="cx"> ContextMenuItem SpeechMenuItem(SubmenuType, ContextMenuItemTagSpeechMenu, contextMenuItemTagSpeechMenu());
</span><span class="lines">@@ -956,7 +956,7 @@
</span><span class="cx"> appendItem(IgnoreGrammarItem, m_contextMenu.get());
</span><span class="cx"> appendItem(*separatorItem(), m_contextMenu.get());
</span><span class="cx"> haveContextMenuItemsForMisspellingOrGrammer = true;
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> } else {
</span><span class="cx"> // If the string was autocorrected, generate a contextual menu item allowing it to be changed back.
</span><span class="cx"> String replacedString = m_hitTestResult.replacedString();
</span><span class="lines">@@ -996,7 +996,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_hitTestResult.isSelected() && !inPasswordField && selectionContainsPossibleWord(frame)) {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> String selectedString = frame->displayStringModifiedByEncoding(frame->editor().selectedText());
</span><span class="cx"> ContextMenuItem LookUpInDictionaryItem(ActionType, ContextMenuItemTagLookUpInDictionary, contextMenuItemTagLookUpInDictionary(selectedString));
</span><span class="cx">
</span><span class="lines">@@ -1028,7 +1028,7 @@
</span><span class="cx"> createAndAppendSpellingAndGrammarSubMenu(SpellingAndGrammarMenuItem);
</span><span class="cx"> appendItem(SpellingAndGrammarMenuItem, m_contextMenu.get());
</span><span class="cx"> #endif
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> ContextMenuItem substitutionsMenuItem(SubmenuType, ContextMenuItemTagSubstitutionsMenu,
</span><span class="cx"> contextMenuItemTagSubstitutionsMenu());
</span><span class="cx"> createAndAppendSubstitutionsSubMenu(substitutionsMenuItem);
</span><span class="lines">@@ -1049,7 +1049,7 @@
</span><span class="cx"> createAndAppendFontSubMenu(FontMenuItem);
</span><span class="cx"> appendItem(FontMenuItem, m_contextMenu.get());
</span><span class="cx"> }
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> ContextMenuItem SpeechMenuItem(SubmenuType, ContextMenuItemTagSpeechMenu, contextMenuItemTagSpeechMenu());
</span><span class="cx"> createAndAppendSpeechSubMenu(SpeechMenuItem);
</span><span class="cx"> appendItem(SpeechMenuItem, m_contextMenu.get());
</span><span class="lines">@@ -1232,7 +1232,7 @@
</span><span class="cx"> case ContextMenuItemTagCheckSpellingWhileTyping:
</span><span class="cx"> shouldCheck = frame->editor().isContinuousSpellCheckingEnabled();
</span><span class="cx"> break;
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> case ContextMenuItemTagSubstitutionsMenu:
</span><span class="cx"> case ContextMenuItemTagTransformationsMenu:
</span><span class="cx"> break;
</span><span class="lines">@@ -1270,7 +1270,7 @@
</span><span class="cx"> case ContextMenuItemTagStopSpeaking:
</span><span class="cx"> shouldEnable = m_client.isSpeaking();
</span><span class="cx"> break;
</span><del>-#else // PLATFORM(MAC) ends here
</del><ins>+#else // PLATFORM(COCOA) ends here
</ins><span class="cx"> case ContextMenuItemTagStopSpeaking:
</span><span class="cx"> break;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorepageDragClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DragClient.h (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DragClient.h 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/page/DragClient.h 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -51,9 +51,9 @@
</span><span class="cx"> virtual void startDrag(DragImageRef, const IntPoint& dragImageOrigin, const IntPoint& eventPos, Clipboard&, Frame&, bool linkDrag = false) = 0;
</span><span class="cx"> virtual void dragEnded() { }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> // Mac-specific helper function to allow access to web archives and NSPasteboard extras in WebKit.
</span><del>- // This is not abstract as that would require another #if PLATFORM(MAC) for the SVGImage client empty implentation.
</del><ins>+ // This is not abstract as that would require another #if PLATFORM(COCOA) for the SVGImage client empty implentation.
</ins><span class="cx"> virtual void declareAndWriteDragImage(const String&, Element&, const URL&, const String&, Frame*) { }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageDragControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DragController.cpp (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DragController.cpp 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/page/DragController.cpp 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -682,7 +682,7 @@
</span><span class="cx"> static IntPoint dragLocForDHTMLDrag(const IntPoint& mouseDraggedPoint, const IntPoint& dragOrigin, const IntPoint& dragImageOffset, bool isLinkImage)
</span><span class="cx"> {
</span><span class="cx"> // dragImageOffset is the cursor position relative to the lower-left corner of the image.
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> // We add in the Y dimension because we are a flipped view, so adding moves the image down.
</span><span class="cx"> const int yOffset = dragImageOffset.y();
</span><span class="cx"> #else
</span><span class="lines">@@ -701,7 +701,7 @@
</span><span class="cx"> int xpos = draggingRect.maxX();
</span><span class="cx"> xpos = draggingRect.x() < xpos ? draggingRect.x() : xpos;
</span><span class="cx"> int ypos = draggingRect.maxY();
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> // Deal with flipped coordinates on Mac
</span><span class="cx"> ypos = draggingRect.y() > ypos ? draggingRect.y() : ypos;
</span><span class="cx"> #else
</span><span class="lines">@@ -769,7 +769,7 @@
</span><span class="cx"> if (enclosingTextFormControl(src.selection().selection().start()))
</span><span class="cx"> clipboard.pasteboard().writePlainText(src.editor().selectedTextForClipboard(), Pasteboard::CannotSmartReplace);
</span><span class="cx"> else {
</span><del>-#if PLATFORM(MAC) || PLATFORM(EFL)
</del><ins>+#if PLATFORM(COCOA) || PLATFORM(EFL)
</ins><span class="cx"> src.editor().writeSelectionToPasteboard(clipboard.pasteboard());
</span><span class="cx"> #else
</span><span class="cx"> // FIXME: Convert all other platforms to match Mac and delete this.
</span><span class="lines">@@ -880,7 +880,7 @@
</span><span class="cx"> float scale = fittedSize.width() / (float)layoutRect.width();
</span><span class="cx"> float dx = scale * (layoutRect.x() - mouseDownPoint.x());
</span><span class="cx"> float originY = layoutRect.y();
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> // Compensate for accursed flipped coordinates in Cocoa.
</span><span class="cx"> originY += layoutRect.height();
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorepageEditorClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EditorClient.h (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EditorClient.h 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/page/EditorClient.h 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> OBJC_CLASS NSAttributedString;
</span><span class="cx"> OBJC_CLASS NSString;
</span><span class="cx"> OBJC_CLASS NSURL;
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> virtual int pasteboardChangeCount() = 0;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> virtual NSString* userVisibleString(NSURL*) = 0;
</span><span class="cx"> virtual DocumentFragment* documentFragmentFromAttributedString(NSAttributedString*, Vector< RefPtr<ArchiveResource>>&) = 0;
</span><span class="cx"> virtual void setInsertionPasteboard(const String& pasteboardName) = 0;
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.cpp (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.cpp 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -298,7 +298,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx">
</span><span class="cx"> inline bool EventHandler::eventLoopHandleMouseUp(const MouseEventWithHitTestResults&)
</span><span class="cx"> {
</span><span class="lines">@@ -350,7 +350,7 @@
</span><span class="cx"> , m_mouseDownTimestamp(0)
</span><span class="cx"> , m_recentWheelEventDeltaTracker(adoptPtr(new WheelEventDeltaTracker))
</span><span class="cx"> , m_widgetIsLatched(false)
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> , m_mouseDownView(nil)
</span><span class="cx"> , m_sendingEventToSubview(false)
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="lines">@@ -759,7 +759,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) // FIXME: Why does this assertion fire on other platforms?
</del><ins>+#if PLATFORM(COCOA) // FIXME: Why does this assertion fire on other platforms?
</ins><span class="cx"> ASSERT(m_mouseDownMayStartSelect || m_mouseDownMayStartAutoscroll);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -1155,7 +1155,7 @@
</span><span class="cx"> FrameView* view = frame->view();
</span><span class="cx">
</span><span class="cx"> bool scrolled = false;
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> // Mac also resets the scroll position in the inline direction.
</span><span class="cx"> if (granularity == ScrollByDocument && view && view->logicalScroll(ScrollInlineDirectionBackward, ScrollByDocument))
</span><span class="cx"> scrolled = true;
</span><span class="lines">@@ -2217,7 +2217,7 @@
</span><span class="cx"> m_dragTarget = nullptr;
</span><span class="cx"> m_capturingMouseEventsElement = nullptr;
</span><span class="cx"> m_shouldOnlyFireDragOverEvent = false;
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> m_sendingEventToSubview = false;
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -2492,7 +2492,7 @@
</span><span class="cx"> if (m_baseEventType == PlatformEvent::NoType && shouldTurnVerticalTicksIntoHorizontal(result, e))
</span><span class="cx"> event = event.copyTurningVerticalTicksIntoHorizontalTicks();
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> switch (event.phase()) {
</span><span class="cx"> case PlatformWheelEventPhaseBegan:
</span><span class="cx"> m_recentWheelEventDeltaTracker->beginTrackingDeltas();
</span><span class="lines">@@ -2543,7 +2543,7 @@
</span><span class="cx"> DominantScrollGestureDirection dominantDirection = DominantScrollGestureDirection::None;
</span><span class="cx">
</span><span class="cx"> // Workaround for scrolling issues <rdar://problem/14758615>.
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> if (m_recentWheelEventDeltaTracker->isTrackingDeltas())
</span><span class="cx"> dominantDirection = m_recentWheelEventDeltaTracker->dominantScrollGestureDirection();
</span><span class="cx"> #endif
</span><span class="lines">@@ -2926,7 +2926,7 @@
</span><span class="cx"> keypress->setTarget(element);
</span><span class="cx"> if (keydownResult)
</span><span class="cx"> keypress->setDefaultPrevented(true);
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> keypress->keypressCommands() = keydown->keypressCommands();
</span><span class="cx"> #endif
</span><span class="cx"> element->dispatchEvent(keypress, IGNORE_EXCEPTION);
</span><span class="lines">@@ -3293,7 +3293,7 @@
</span><span class="cx">
</span><span class="cx"> bool EventHandler::eventInvertsTabsToLinksClientCallResult(KeyboardEvent* event)
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC) || PLATFORM(EFL)
</del><ins>+#if PLATFORM(COCOA) || PLATFORM(EFL)
</ins><span class="cx"> return EventHandler::isKeyboardOptionTab(event);
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(event);
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.h (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.h 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/page/EventHandler.h 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif // PLATFORM(IOS)
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !defined(__OBJC__)
</del><ins>+#if PLATFORM(COCOA) && !defined(__OBJC__)
</ins><span class="cx"> class NSView;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -246,7 +246,7 @@
</span><span class="cx">
</span><span class="cx"> void sendScrollEvent(); // Ditto
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && defined(__OBJC__)
</del><ins>+#if PLATFORM(COCOA) && defined(__OBJC__)
</ins><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> void mouseDown(NSEvent *);
</span><span class="cx"> void mouseDragged(NSEvent *);
</span><span class="lines">@@ -279,7 +279,7 @@
</span><span class="cx"> #else
</span><span class="cx"> static WebEvent *currentEvent();
</span><span class="cx"> #endif // !PLATFORM(IOS)
</span><del>-#endif // PLATFORM(MAC) && defined(__OBJC__)
</del><ins>+#endif // PLATFORM(COCOA) && defined(__OBJC__)
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> void invalidateClick();
</span><span class="lines">@@ -413,7 +413,7 @@
</span><span class="cx">
</span><span class="cx"> bool capturesDragging() const { return m_capturesDragging; }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && defined(__OBJC__)
</del><ins>+#if PLATFORM(COCOA) && defined(__OBJC__)
</ins><span class="cx"> NSView *mouseDownViewIfStillGood();
</span><span class="cx">
</span><span class="cx"> PlatformMouseEvent currentPlatformMouseEvent() const;
</span><span class="lines">@@ -518,7 +518,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<Element> m_previousWheelScrolledElement;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) || PLATFORM(IOS)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> NSView *m_mouseDownView;
</span><span class="cx"> bool m_sendingEventToSubview;
</span><span class="cx"> #if !PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/page/FrameView.cpp 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -1296,7 +1296,7 @@
</span><span class="cx">
</span><span class="cx"> m_layoutCount++;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) || PLATFORM(WIN) || PLATFORM(GTK) || PLATFORM(EFL)
</del><ins>+#if PLATFORM(COCOA) || PLATFORM(WIN) || PLATFORM(GTK) || PLATFORM(EFL)
</ins><span class="cx"> if (AXObjectCache* cache = root->document().existingAXObjectCache())
</span><span class="cx"> cache->postNotification(root, AXObjectCache::AXLayoutComplete);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.h (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.h 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/page/Page.h 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> #include <sys/time.h> // For time_t structure.
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include <wtf/SchedulePair.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -249,7 +249,7 @@
</span><span class="cx"> // NoMatchAfterUserSelection if there is no matching text after the user selection.
</span><span class="cx"> enum { NoMatchAfterUserSelection = -1 };
</span><span class="cx"> void findStringMatchingRanges(const String&, FindOptions, int maxCount, Vector<RefPtr<Range>>*, int& indexForSelection);
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void addSchedulePair(PassRefPtr<SchedulePair>);
</span><span class="cx"> void removeSchedulePair(PassRefPtr<SchedulePair>);
</span><span class="cx"> SchedulePairHashSet* scheduledRunLoopPairs() { return m_scheduledRunLoopPairs.get(); }
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.cpp (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.cpp 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/page/Settings.cpp 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> bool Settings::gAVFoundationEnabled = false;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> bool Settings::gQTKitEnabled = true;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -239,14 +239,14 @@
</span><span class="cx"> return gHiddenPageDOMTimerAlignmentInterval;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx"> bool Settings::shouldEnableScreenFontSubstitutionByDefault()
</span><span class="cx"> {
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx"> void Settings::initializeDefaultFontFamilies()
</span><span class="cx"> {
</span><span class="cx"> // Other platforms can set up fonts from a client, but on Mac, we want it in WebCore to share code between WebKit1 and WebKit2.
</span><span class="lines">@@ -620,7 +620,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void Settings::setQTKitEnabled(bool enabled)
</span><span class="cx"> {
</span><span class="cx"> if (gQTKitEnabled == enabled)
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.h (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.h 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/page/Settings.h 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -240,7 +240,7 @@
</span><span class="cx"> static bool isAVFoundationEnabled() { return gAVFoundationEnabled; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> static void setQTKitEnabled(bool flag);
</span><span class="cx"> static bool isQTKitEnabled() { return gQTKitEnabled; }
</span><span class="cx"> #endif
</span><span class="lines">@@ -388,7 +388,7 @@
</span><span class="cx"> static bool gAVFoundationEnabled;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> static bool gQTKitEnabled;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingCoordinatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx"> PassRefPtr<ScrollingCoordinator> ScrollingCoordinator::create(Page* page)
</span><span class="cx"> {
</span><span class="cx"> #if USE(COORDINATED_GRAPHICS)
</span><span class="lines">@@ -255,7 +255,7 @@
</span><span class="cx"> updateSynchronousScrollingReasons();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void ScrollingCoordinator::handleWheelEventPhase(PlatformWheelEventPhase phase)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingCoordinatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> #include <wtf/Threading.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx"> // containers while scrolling.
</span><span class="cx"> virtual bool supportsFixedPositionLayers() const { return false; }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> // Dispatched by the scrolling tree during handleWheelEvent. This is required as long as scrollbars are painted on the main thread.
</span><span class="cx"> void handleWheelEventPhase(PlatformWheelEventPhase);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingStateNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -34,10 +34,6 @@
</span><span class="cx"> #include <wtf/PassOwnPtr.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
-#include <wtf/RetainPtr.h>
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class GraphicsLayer;
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingThread.cpp (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingThread.cpp 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/page/scrolling/ScrollingThread.cpp 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx">
</span><span class="cx"> m_threadIdentifier = createThread(threadCallback, this, "WebCore: Scrolling");
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> m_initializeRunLoopConditionVariable.wait(lock, [this]{ return m_threadRunLoop; });
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingThread.h (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingThread.h 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/page/scrolling/ScrollingThread.h 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> #include <wtf/Threading.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> void initializeRunLoop();
</span><span class="cx"> void wakeUpRunLoop();
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> static void threadRunLoopSourceCallback(void* scrollingThread);
</span><span class="cx"> void threadRunLoopSourceCallback();
</span><span class="cx"> #endif
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> std::mutex m_functionsMutex;
</span><span class="cx"> Vector<std::function<void ()>> m_functions;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> // FIXME: We should use WebCore::RunLoop here.
</span><span class="cx"> RetainPtr<CFRunLoopRef> m_threadRunLoop;
</span><span class="cx"> RetainPtr<CFRunLoopSourceRef> m_threadRunLoopSource;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequest.h (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceRequest.h 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/platform/network/cf/ResourceRequest.h 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -104,8 +104,10 @@
</span><span class="cx">
</span><span class="cx"> void updateFromDelegatePreservingOldHTTPBody(const ResourceRequest&);
</span><span class="cx">
</span><ins>+#if PLATFORM(MAC) && !PLATFORM(IOS)
+ void applyWebArchiveHackForMail();
+#endif
</ins><span class="cx"> #if PLATFORM(COCOA)
</span><del>- void applyWebArchiveHackForMail();
</del><span class="cx"> NSURLRequest *nsURLRequest(HTTPBodyUpdatePolicy) const;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceRequestCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -337,13 +337,11 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(COCOA)
</del><ins>+#if PLATFORM(MAC) && !PLATFORM(IOS)
</ins><span class="cx"> void ResourceRequest::applyWebArchiveHackForMail()
</span><span class="cx"> {
</span><del>-#if !PLATFORM(IOS)
</del><span class="cx"> // Hack because Mail checks for this property to detect data / archive loads
</span><span class="cx"> _CFURLRequestSetProtocolProperty(cfURLRequest(DoNotUpdateHTTPBody), CFSTR("WebDataRequest"), CFSTR(""));
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacResourceRequestMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/ResourceRequestMac.mm (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/ResourceRequestMac.mm 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/platform/network/mac/ResourceRequestMac.mm 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -250,13 +250,13 @@
</span><span class="cx"> setHTTPBody(oldHTTPBody.release());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> void ResourceRequest::applyWebArchiveHackForMail()
</span><span class="cx"> {
</span><del>-#if !PLATFORM(IOS)
</del><span class="cx"> // Hack because Mail checks for this property to detect data / archive loads
</span><span class="cx"> [NSURLProtocol setProperty:@"" forKey:@"WebDataRequest" inRequest:(NSMutableURLRequest *)nsURLRequest(DoNotUpdateHTTPBody)];
</span><ins>+}
</ins><span class="cx"> #endif
</span><del>-}
</del><span class="cx">
</span><span class="cx"> void ResourceRequest::setStorageSession(CFURLStorageSessionRef storageSession)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorepluginsPluginViewNonecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/plugins/PluginViewNone.cpp (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/plugins/PluginViewNone.cpp 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/plugins/PluginViewNone.cpp 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> // ports using PluginView, but until then, if new functions like this are
</span><span class="cx"> // added, please make sure they have the proper platform #ifs so that changes
</span><span class="cx"> // do not break ports who compile both this file and PluginView.cpp.
</span><del>-#if PLATFORM(MAC) || PLATFORM(EFL) || OS(WINCE)
</del><ins>+#if PLATFORM(COCOA) || PLATFORM(EFL) || OS(WINCE)
</ins><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> void PluginView::keepAlive(NPP)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -794,7 +794,7 @@
</span><span class="cx">
</span><span class="cx"> RenderLayer* l = layer();
</span><span class="cx"> if (l) {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> // On Mac only we reset the inline direction position when doing a document scroll (e.g., hitting Home/End).
</span><span class="cx"> if (granularity == ScrollByDocument)
</span><span class="cx"> scrolled = l->scroll(logicalToPhysical(ScrollInlineDirectionBackward, isHorizontalWritingMode(), style().isFlippedBlocksWritingMode()), ScrollByDocument, multiplier);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> graphicsLayer->setMaintainsPixelAlignment(compositor().keepLayersPixelAligned());
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && USE(CA)
</del><ins>+#if PLATFORM(COCOA) && USE(CA)
</ins><span class="cx"> graphicsLayer->setAcceleratesDrawing(compositor().acceleratedDrawingEnabled());
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -309,7 +309,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && USE(CA)
</del><ins>+#if PLATFORM(COCOA) && USE(CA)
</ins><span class="cx"> if (!compositor().acceleratedDrawingEnabled() && renderer().isCanvas()) {
</span><span class="cx"> const HTMLCanvasElement* canvas = toHTMLCanvasElement(renderer().element());
</span><span class="cx"> if (canvas->shouldAccelerate(canvas->size()))
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMenuListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMenuList.h (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMenuList.h 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/rendering/RenderMenuList.h 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #include "PopupMenuClient.h"
</span><span class="cx"> #include "RenderFlexibleBox.h"
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #define POPUP_MENU_PULLS_DOWN 0
</span><span class="cx"> #else
</span><span class="cx"> #define POPUP_MENU_PULLS_DOWN 1
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderText.cpp (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderText.cpp 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/rendering/RenderText.cpp 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -1352,7 +1352,7 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) || PLATFORM(EFL)
</del><ins>+#if PLATFORM(COCOA) || PLATFORM(EFL)
</ins><span class="cx">
</span><span class="cx"> #define HANGUL_CHOSEONG_START (0x1100)
</span><span class="cx"> #define HANGUL_CHOSEONG_END (0x115F)
</span><span class="lines">@@ -1394,7 +1394,7 @@
</span><span class="cx">
</span><span class="cx"> int RenderText::previousOffsetForBackwardDeletion(int current) const
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC) || PLATFORM(EFL)
</del><ins>+#if PLATFORM(COCOA) || PLATFORM(EFL)
</ins><span class="cx"> ASSERT(m_text);
</span><span class="cx"> StringImpl& text = *m_text.impl();
</span><span class="cx"> UChar32 character;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingbreak_linescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/break_lines.cpp (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/break_lines.cpp 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/rendering/break_lines.cpp 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -32,10 +32,6 @@
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="cx"> #include <wtf/unicode/CharacterNames.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
-#include <CoreServices/CoreServices.h>
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> // Pack 8 bits into one byte
</span></span></pre></div>
<a id="trunkSourceWebCoretestingjsWebCoreTestSupporth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/js/WebCoreTestSupport.h (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/js/WebCoreTestSupport.h 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/testing/js/WebCoreTestSupport.h 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> typedef const struct OpaqueJSContext* JSContextRef;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #define TEST_SUPPORT_EXPORT WTF_EXPORT_PRIVATE
</span><span class="cx"> #else
</span><span class="cx"> #define TEST_SUPPORT_EXPORT
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXSLStyleSheetLibxsltcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XSLStyleSheetLibxslt.cpp (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XSLStyleSheetLibxslt.cpp 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/xml/XSLStyleSheetLibxslt.cpp 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -37,11 +37,11 @@
</span><span class="cx"> #include <libxml/uri.h>
</span><span class="cx"> #include <libxslt/xsltutils.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK)
</ins><span class="cx"> #include "SoftLinking.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK)
</ins><span class="cx"> SOFT_LINK_LIBRARY(libxslt)
</span><span class="cx"> SOFT_LINK(libxslt, xsltIsBlank, int, (xmlChar *str), (str))
</span><span class="cx"> SOFT_LINK(libxslt, xsltGetNsProp, xmlChar *, (xmlNodePtr node, const xmlChar *name, const xmlChar *nameSpace), (node, name, nameSpace))
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXSLTExtensionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XSLTExtensions.cpp (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XSLTExtensions.cpp 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/xml/XSLTExtensions.cpp 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -35,11 +35,11 @@
</span><span class="cx"> #include <libxslt/extensions.h>
</span><span class="cx"> #include <libxslt/extra.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK)
</ins><span class="cx"> #include "SoftLinking.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK)
</ins><span class="cx"> SOFT_LINK_LIBRARY(libxslt)
</span><span class="cx"> SOFT_LINK(libxslt, xsltRegisterExtFunction, int, (xsltTransformContextPtr ctxt, const xmlChar *name, const xmlChar *URI, xmlXPathFunction function), (ctxt, name, URI, function))
</span><span class="cx"> SOFT_LINK(libxslt, xsltFunctionNodeSet, void, (xmlXPathParserContextPtr ctxt, int nargs), (ctxt, nargs))
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXSLTProcessorLibxsltcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XSLTProcessorLibxslt.cpp (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XSLTProcessorLibxslt.cpp 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/xml/XSLTProcessorLibxslt.cpp 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> #include <wtf/text/StringBuffer.h>
</span><span class="cx"> #include <wtf/unicode/UTF8.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK)
</ins><span class="cx"> #include "SoftLinking.h"
</span><span class="cx">
</span><span class="cx"> SOFT_LINK_LIBRARY(libxslt);
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXSLTUnicodeSortcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XSLTUnicodeSort.cpp (163724 => 163725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XSLTUnicodeSort.cpp 2014-02-08 22:20:07 UTC (rev 163724)
+++ trunk/Source/WebCore/xml/XSLTUnicodeSort.cpp 2014-02-08 22:26:50 UTC (rev 163725)
</span><span class="lines">@@ -36,11 +36,11 @@
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx"> #include <wtf/unicode/Collator.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK)
</ins><span class="cx"> #include "SoftLinking.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK)
</ins><span class="cx">
</span><span class="cx"> SOFT_LINK_LIBRARY(libxslt)
</span><span class="cx"> SOFT_LINK(libxslt, xsltComputeSortResult, xmlXPathObjectPtr*, (xsltTransformContextPtr ctxt, xmlNodePtr sort), (ctxt, sort))
</span></span></pre>
</div>
</div>
</body>
</html>