<!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>[179236] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/179236">179236</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2015-01-27 18:29:06 -0800 (Tue, 27 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>More build fixes for newer clang.
Rubber-stamped by Anders Carlsson.
Source/WebCore:
* loader/icon/IconDatabase.h: Added missing override keywords.
Source/WebKit/mac:
Marked a deprecated accessibility method as such.
* WebView/WebFrame.mm:
(-[WebFrame accessibilityRoot]):
Source/WebKit2:
Added missing override keywords, marked some deprecated accessibility methods as such.
* PluginProcess/EntryPoint/mac/LegacyProcess/PluginProcessMain.mm:
(WebKit::PluginProcessMainDelegate::doPreInitializationWork): Deleted.
(WebKit::PluginProcessMainDelegate::getExtraInitializationData): Deleted.
(WebKit::PluginProcessMainDelegate::doPostRunWork): Deleted.
* PluginProcess/WebProcessConnection.h:
* UIProcess/Cocoa/WebProcessPoolCocoa.mm:
(WebKit::WebProcessPool::platformInitializeWebProcess):
* UIProcess/Plugins/PluginProcessProxy.h:
* UIProcess/WebPageProxy.h:
* UIProcess/mac/PageClientImpl.h:
* WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp:
(PageOverlayClientImpl::actionContextForResultAtPoint): Deleted.
(PageOverlayClientImpl::dataDetectorsDidPresentUI): Deleted.
(PageOverlayClientImpl::dataDetectorsDidChangeUI): Deleted.
(PageOverlayClientImpl::dataDetectorsDidHideUI): Deleted.
* WebProcess/Plugins/Netscape/NetscapePlugin.h:
(WebKit::NetscapePlugin::isBeingAsynchronouslyInitialized): Deleted.
* WebProcess/Plugins/PDF/PDFPlugin.h:
* WebProcess/Plugins/PluginProcessConnection.h:
* WebProcess/Plugins/PluginProxy.h:
(WebKit::PluginProxy::isBeingAsynchronouslyInitialized): Deleted.
* WebProcess/WebCoreSupport/WebContextMenuClient.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloadericonIconDatabaseh">trunk/Source/WebCore/loader/icon/IconDatabase.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebFramemm">trunk/Source/WebKit/mac/WebView/WebFrame.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessEntryPointmacLegacyProcessPluginProcessMainmm">trunk/Source/WebKit2/PluginProcess/EntryPoint/mac/LegacyProcess/PluginProcessMain.mm</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessWebProcessConnectionh">trunk/Source/WebKit2/PluginProcess/WebProcessConnection.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebProcessPoolCocoamm">trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsPluginProcessProxyh">trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacPageClientImplh">trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageOverlaycpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsNetscapeNetscapePluginh">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPDFPDFPluginh">trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginProcessConnectionh">trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginProxyh">trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebContextMenuClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (179235 => 179236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-28 01:54:25 UTC (rev 179235)
+++ trunk/Source/WebCore/ChangeLog 2015-01-28 02:29:06 UTC (rev 179236)
</span><span class="lines">@@ -1,3 +1,11 @@
</span><ins>+2015-01-27 Alexey Proskuryakov <ap@apple.com>
+
+ More build fixes for newer clang.
+
+ Rubber-stamped by Anders Carlsson.
+
+ * loader/icon/IconDatabase.h: Added missing override keywords.
+
</ins><span class="cx"> 2015-01-27 Roger Fong <roger_fong@apple.com>
</span><span class="cx">
</span><span class="cx"> WebGL2: Disable various extensions on WebGL2 context that have been promoted to core.
</span></span></pre></div>
<a id="trunkSourceWebCoreloadericonIconDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/icon/IconDatabase.h (179235 => 179236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/icon/IconDatabase.h 2015-01-28 01:54:25 UTC (rev 179235)
+++ trunk/Source/WebCore/loader/icon/IconDatabase.h 2015-01-28 02:29:06 UTC (rev 179236)
</span><span class="lines">@@ -130,8 +130,8 @@
</span><span class="cx">
</span><span class="cx"> // *** Any Thread ***
</span><span class="cx"> public:
</span><del>- WEBCORE_EXPORT virtual bool isOpen() const;
- WEBCORE_EXPORT virtual String databasePath() const;
</del><ins>+ WEBCORE_EXPORT virtual bool isOpen() const override;
+ WEBCORE_EXPORT virtual String databasePath() const override;
</ins><span class="cx"> WEBCORE_EXPORT static String defaultDatabaseFilename();
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx">
</span><span class="cx"> // *** Sync Thread Only ***
</span><span class="cx"> public:
</span><del>- WEBCORE_EXPORT virtual bool shouldStopThreadActivity() const;
</del><ins>+ WEBCORE_EXPORT virtual bool shouldStopThreadActivity() const override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> static void iconDatabaseSyncThreadStart(void *);
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (179235 => 179236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-01-28 01:54:25 UTC (rev 179235)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-01-28 02:29:06 UTC (rev 179236)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-01-27 Alexey Proskuryakov <ap@apple.com>
+
+ More build fixes for newer clang.
+
+ Rubber-stamped by Anders Carlsson.
+
+ Marked a deprecated accessibility method as such.
+
+ * WebView/WebFrame.mm:
+ (-[WebFrame accessibilityRoot]):
+
</ins><span class="cx"> 2015-01-27 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Immediate action gesture recognizer still doesn't work well with IB
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFramemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFrame.mm (179235 => 179236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFrame.mm 2015-01-28 01:54:25 UTC (rev 179235)
+++ trunk/Source/WebKit/mac/WebView/WebFrame.mm 2015-01-28 02:29:06 UTC (rev 179236)
</span><span class="lines">@@ -2234,7 +2234,10 @@
</span><span class="cx"> if (!AXObjectCache::accessibilityEnabled()) {
</span><span class="cx"> AXObjectCache::enableAccessibility();
</span><span class="cx"> #if !PLATFORM(IOS)
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> AXObjectCache::setEnhancedUserInterfaceAccessibility([[NSApp accessibilityAttributeValue:NSAccessibilityEnhancedUserInterfaceAttribute] boolValue]);
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (179235 => 179236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-01-28 01:54:25 UTC (rev 179235)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-28 02:29:06 UTC (rev 179236)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2015-01-27 Alexey Proskuryakov <ap@apple.com>
+
+ More build fixes for newer clang.
+
+ Rubber-stamped by Anders Carlsson.
+
+ Added missing override keywords, marked some deprecated accessibility methods as such.
+
+ * PluginProcess/EntryPoint/mac/LegacyProcess/PluginProcessMain.mm:
+ (WebKit::PluginProcessMainDelegate::doPreInitializationWork): Deleted.
+ (WebKit::PluginProcessMainDelegate::getExtraInitializationData): Deleted.
+ (WebKit::PluginProcessMainDelegate::doPostRunWork): Deleted.
+ * PluginProcess/WebProcessConnection.h:
+ * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+ (WebKit::WebProcessPool::platformInitializeWebProcess):
+ * UIProcess/Plugins/PluginProcessProxy.h:
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/mac/PageClientImpl.h:
+ * WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp:
+ (PageOverlayClientImpl::actionContextForResultAtPoint): Deleted.
+ (PageOverlayClientImpl::dataDetectorsDidPresentUI): Deleted.
+ (PageOverlayClientImpl::dataDetectorsDidChangeUI): Deleted.
+ (PageOverlayClientImpl::dataDetectorsDidHideUI): Deleted.
+ * WebProcess/Plugins/Netscape/NetscapePlugin.h:
+ (WebKit::NetscapePlugin::isBeingAsynchronouslyInitialized): Deleted.
+ * WebProcess/Plugins/PDF/PDFPlugin.h:
+ * WebProcess/Plugins/PluginProcessConnection.h:
+ * WebProcess/Plugins/PluginProxy.h:
+ (WebKit::PluginProxy::isBeingAsynchronouslyInitialized): Deleted.
+ * WebProcess/WebCoreSupport/WebContextMenuClient.h:
+
</ins><span class="cx"> 2015-01-27 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Immediate action gesture recognizer still doesn't work well with IB
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessEntryPointmacLegacyProcessPluginProcessMainmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/EntryPoint/mac/LegacyProcess/PluginProcessMain.mm (179235 => 179236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/EntryPoint/mac/LegacyProcess/PluginProcessMain.mm 2015-01-28 01:54:25 UTC (rev 179235)
+++ trunk/Source/WebKit2/PluginProcess/EntryPoint/mac/LegacyProcess/PluginProcessMain.mm 2015-01-28 02:29:06 UTC (rev 179236)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void doPreInitializationWork()
</del><ins>+ virtual void doPreInitializationWork() override
</ins><span class="cx"> {
</span><span class="cx"> // Remove the PluginProcess shim from the DYLD_INSERT_LIBRARIES environment variable so any processes
</span><span class="cx"> // spawned by the PluginProcess don't try to insert the shim and crash.
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual bool getExtraInitializationData(HashMap<String, String>& extraInitializationData)
</del><ins>+ virtual bool getExtraInitializationData(HashMap<String, String>& extraInitializationData) override
</ins><span class="cx"> {
</span><span class="cx"> String pluginPath = m_commandLine["plugin-path"];
</span><span class="cx"> if (pluginPath.isEmpty())
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> [NSApp run];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void doPostRunWork()
</del><ins>+ virtual void doPostRunWork() override
</ins><span class="cx"> {
</span><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</span><span class="cx"> // If we have private temporary and cache directories, clean them up.
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessWebProcessConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/WebProcessConnection.h (179235 => 179236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/WebProcessConnection.h 2015-01-28 01:54:25 UTC (rev 179235)
+++ trunk/Source/WebKit2/PluginProcess/WebProcessConnection.h 2015-01-28 02:29:06 UTC (rev 179236)
</span><span class="lines">@@ -67,8 +67,8 @@
</span><span class="cx"> // IPC::Connection::Client
</span><span class="cx"> virtual void didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&) override;
</span><span class="cx"> virtual void didReceiveSyncMessage(IPC::Connection&, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&) override;
</span><del>- virtual void didClose(IPC::Connection&);
- virtual void didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName);
</del><ins>+ virtual void didClose(IPC::Connection&) override;
+ virtual void didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName) override;
</ins><span class="cx">
</span><span class="cx"> // Message handlers.
</span><span class="cx"> void didReceiveWebProcessConnectionMessage(IPC::Connection&, IPC::MessageDecoder&);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebProcessPoolCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm (179235 => 179236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2015-01-28 01:54:25 UTC (rev 179235)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2015-01-28 02:29:06 UTC (rev 179236)
</span><span class="lines">@@ -177,7 +177,10 @@
</span><span class="cx"> parameters.presenterApplicationPid = getpid();
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> parameters.accessibilityEnhancedUserInterfaceEnabled = [[NSApp accessibilityAttributeValue:@"AXEnhancedUserInterface"] boolValue];
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> #else
</span><span class="cx"> parameters.accessibilityEnhancedUserInterfaceEnabled = false;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsPluginProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h (179235 => 179236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h 2015-01-28 01:54:25 UTC (rev 179235)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h 2015-01-28 02:29:06 UTC (rev 179236)
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> virtual void didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName) override;
</span><span class="cx">
</span><span class="cx"> // ProcessLauncher::Client
</span><del>- virtual void didFinishLaunching(ProcessLauncher*, IPC::Connection::Identifier);
</del><ins>+ virtual void didFinishLaunching(ProcessLauncher*, IPC::Connection::Identifier) override;
</ins><span class="cx">
</span><span class="cx"> // Message handlers
</span><span class="cx"> void didCreateWebProcessConnection(const IPC::Attachment&, bool supportsAsynchronousPluginInitialization);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (179235 => 179236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-01-28 01:54:25 UTC (rev 179235)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-01-28 02:29:06 UTC (rev 179236)
</span><span class="lines">@@ -1140,8 +1140,8 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INPUT_TYPE_COLOR)
</span><span class="cx"> void showColorPicker(const WebCore::Color& initialColor, const WebCore::IntRect&);
</span><del>- void didChooseColor(const WebCore::Color&);
- void didEndColorPicker();
</del><ins>+ virtual void didChooseColor(const WebCore::Color&) override;
+ virtual void didEndColorPicker() override;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void editorStateChanged(const EditorState&);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacPageClientImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h (179235 => 179236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h 2015-01-28 01:54:25 UTC (rev 179235)
+++ trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h 2015-01-28 02:29:06 UTC (rev 179236)
</span><span class="lines">@@ -56,45 +56,45 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> // PageClient
</span><del>- virtual std::unique_ptr<DrawingAreaProxy> createDrawingAreaProxy();
- virtual void setViewNeedsDisplay(const WebCore::IntRect&);
- virtual void displayView();
- virtual bool canScrollView();
- virtual void scrollView(const WebCore::IntRect& scrollRect, const WebCore::IntSize& scrollOffset);
- virtual void requestScroll(const WebCore::FloatPoint& scrollPosition, bool isProgrammaticScroll);
</del><ins>+ virtual std::unique_ptr<DrawingAreaProxy> createDrawingAreaProxy() override;
+ virtual void setViewNeedsDisplay(const WebCore::IntRect&) override;
+ virtual void displayView() override;
+ virtual bool canScrollView() override;
+ virtual void scrollView(const WebCore::IntRect& scrollRect, const WebCore::IntSize& scrollOffset) override;
+ virtual void requestScroll(const WebCore::FloatPoint& scrollPosition, bool isProgrammaticScroll) override;
</ins><span class="cx">
</span><del>- virtual WebCore::IntSize viewSize();
- virtual bool isViewWindowActive();
- virtual bool isViewFocused();
- virtual bool isViewVisible();
- virtual bool isViewVisibleOrOccluded();
- virtual bool isViewInWindow();
- virtual bool isVisuallyIdle();
</del><ins>+ virtual WebCore::IntSize viewSize() override;
+ virtual bool isViewWindowActive() override;
+ virtual bool isViewFocused() override;
+ virtual bool isViewVisible() override;
+ virtual bool isViewVisibleOrOccluded() override;
+ virtual bool isViewInWindow() override;
+ virtual bool isVisuallyIdle() override;
</ins><span class="cx"> virtual LayerHostingMode viewLayerHostingMode() override;
</span><span class="cx"> virtual ColorSpaceData colorSpace() override;
</span><span class="cx"> virtual void setAcceleratedCompositingRootLayer(LayerOrView *) override;
</span><span class="cx"> virtual LayerOrView *acceleratedCompositingRootLayer() const override;
</span><span class="cx">
</span><del>- virtual void processDidExit();
- virtual void pageClosed();
- virtual void didRelaunchProcess();
</del><ins>+ virtual void processDidExit() override;
+ virtual void pageClosed() override;
+ virtual void didRelaunchProcess() override;
</ins><span class="cx"> virtual void preferencesDidChange() override;
</span><del>- virtual void toolTipChanged(const String& oldToolTip, const String& newToolTip);
</del><ins>+ virtual void toolTipChanged(const String& oldToolTip, const String& newToolTip) override;
</ins><span class="cx"> virtual void didCommitLoadForMainFrame(const String& mimeType, bool useCustomContentProvider) override;
</span><span class="cx"> virtual void didFinishLoadingDataForCustomContentProvider(const String& suggestedFilename, const IPC::DataReference&) override;
</span><span class="cx"> virtual void handleDownloadRequest(DownloadProxy*) override;
</span><del>- virtual void setCursor(const WebCore::Cursor&);
- virtual void setCursorHiddenUntilMouseMoves(bool);
- virtual void didChangeViewportProperties(const WebCore::ViewportAttributes&);
</del><ins>+ virtual void setCursor(const WebCore::Cursor&) override;
+ virtual void setCursorHiddenUntilMouseMoves(bool) override;
+ virtual void didChangeViewportProperties(const WebCore::ViewportAttributes&) override;
</ins><span class="cx">
</span><del>- virtual void registerEditCommand(PassRefPtr<WebEditCommandProxy>, WebPageProxy::UndoOrRedo);
- virtual void clearAllEditCommands();
- virtual bool canUndoRedo(WebPageProxy::UndoOrRedo);
- virtual void executeUndoRedo(WebPageProxy::UndoOrRedo);
- virtual bool executeSavedCommandBySelector(const String& selector);
- virtual void setDragImage(const WebCore::IntPoint& clientPosition, PassRefPtr<ShareableBitmap> dragImage, bool isLinkDrag);
</del><ins>+ virtual void registerEditCommand(PassRefPtr<WebEditCommandProxy>, WebPageProxy::UndoOrRedo) override;
+ virtual void clearAllEditCommands() override;
+ virtual bool canUndoRedo(WebPageProxy::UndoOrRedo) override;
+ virtual void executeUndoRedo(WebPageProxy::UndoOrRedo) override;
+ virtual bool executeSavedCommandBySelector(const String& selector) override;
+ virtual void setDragImage(const WebCore::IntPoint& clientPosition, PassRefPtr<ShareableBitmap> dragImage, bool isLinkDrag) override;
</ins><span class="cx"> virtual void setPromisedData(const String& pasteboardName, PassRefPtr<WebCore::SharedBuffer> imageBuffer, const String& filename, const String& extension, const String& title,
</span><del>- const String& url, const String& visibleUrl, PassRefPtr<WebCore::SharedBuffer> archiveBuffer);
</del><ins>+ const String& url, const String& visibleUrl, PassRefPtr<WebCore::SharedBuffer> archiveBuffer) override;
</ins><span class="cx"> virtual void updateSecureInputState() override;
</span><span class="cx"> virtual void resetSecureInputState() override;
</span><span class="cx"> virtual void notifyInputContextAboutDiscardedComposition() override;
</span><span class="lines">@@ -102,61 +102,61 @@
</span><span class="cx"> virtual void notifyApplicationAboutInputContextChange() override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- virtual WebCore::FloatRect convertToDeviceSpace(const WebCore::FloatRect&);
- virtual WebCore::FloatRect convertToUserSpace(const WebCore::FloatRect&);
- virtual WebCore::IntPoint screenToRootView(const WebCore::IntPoint&);
- virtual WebCore::IntRect rootViewToScreen(const WebCore::IntRect&);
</del><ins>+ virtual WebCore::FloatRect convertToDeviceSpace(const WebCore::FloatRect&) override;
+ virtual WebCore::FloatRect convertToUserSpace(const WebCore::FloatRect&) override;
+ virtual WebCore::IntPoint screenToRootView(const WebCore::IntPoint&) override;
+ virtual WebCore::IntRect rootViewToScreen(const WebCore::IntRect&) override;
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> virtual WebCore::IntPoint accessibilityScreenToRootView(const WebCore::IntPoint&) = 0;
</span><span class="cx"> virtual WebCore::IntRect rootViewToAccessibilityScreen(const WebCore::IntRect&) = 0;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- CGRect boundsOfLayerInLayerBackedWindowCoordinates(CALayer *layer) const;
</del><ins>+ CGRect boundsOfLayerInLayerBackedWindowCoordinates(CALayer *layer) const override;
</ins><span class="cx">
</span><del>- virtual void doneWithKeyEvent(const NativeWebKeyboardEvent&, bool wasEventHandled);
</del><ins>+ virtual void doneWithKeyEvent(const NativeWebKeyboardEvent&, bool wasEventHandled) override;
</ins><span class="cx">
</span><del>- virtual PassRefPtr<WebPopupMenuProxy> createPopupMenuProxy(WebPageProxy*);
- virtual PassRefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy*);
</del><ins>+ virtual PassRefPtr<WebPopupMenuProxy> createPopupMenuProxy(WebPageProxy*) override;
+ virtual PassRefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy*) override;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INPUT_TYPE_COLOR)
</span><del>- virtual PassRefPtr<WebColorPicker> createColorPicker(WebPageProxy*, const WebCore::Color& initialColor, const WebCore::IntRect&);
</del><ins>+ virtual PassRefPtr<WebColorPicker> createColorPicker(WebPageProxy*, const WebCore::Color& initialColor, const WebCore::IntRect&) override;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> virtual void setTextIndicator(PassRefPtr<WebCore::TextIndicator>, bool fadeOut) override;
</span><span class="cx"> virtual void setTextIndicatorAnimationProgress(float) override;
</span><span class="cx">
</span><del>- virtual void enterAcceleratedCompositingMode(const LayerTreeContext&);
- virtual void exitAcceleratedCompositingMode();
- virtual void updateAcceleratedCompositingMode(const LayerTreeContext&);
</del><ins>+ virtual void enterAcceleratedCompositingMode(const LayerTreeContext&) override;
+ virtual void exitAcceleratedCompositingMode() override;
+ virtual void updateAcceleratedCompositingMode(const LayerTreeContext&) override;
</ins><span class="cx">
</span><span class="cx"> virtual PassRefPtr<ViewSnapshot> takeViewSnapshot() override;
</span><span class="cx"> virtual void wheelEventWasNotHandledByWebCore(const NativeWebWheelEvent&) override;
</span><span class="cx">
</span><del>- virtual void accessibilityWebProcessTokenReceived(const IPC::DataReference&);
</del><ins>+ virtual void accessibilityWebProcessTokenReceived(const IPC::DataReference&) override;
</ins><span class="cx">
</span><del>- virtual void pluginFocusOrWindowFocusChanged(uint64_t pluginComplexTextInputIdentifier, bool pluginHasFocusAndWindowHasFocus);
- virtual void setPluginComplexTextInputState(uint64_t pluginComplexTextInputIdentifier, PluginComplexTextInputState);
</del><ins>+ virtual void pluginFocusOrWindowFocusChanged(uint64_t pluginComplexTextInputIdentifier, bool pluginHasFocusAndWindowHasFocus) override;
+ virtual void setPluginComplexTextInputState(uint64_t pluginComplexTextInputIdentifier, PluginComplexTextInputState) override;
</ins><span class="cx">
</span><del>- virtual void makeFirstResponder();
</del><ins>+ virtual void makeFirstResponder() override;
</ins><span class="cx">
</span><del>- virtual void didPerformDictionaryLookup(const DictionaryPopupInfo&);
- virtual void dismissContentRelativeChildWindows();
</del><ins>+ virtual void didPerformDictionaryLookup(const DictionaryPopupInfo&) override;
+ virtual void dismissContentRelativeChildWindows() override;
</ins><span class="cx">
</span><del>- virtual void showCorrectionPanel(WebCore::AlternativeTextType, const WebCore::FloatRect& boundingBoxOfReplacedString, const String& replacedString, const String& replacementString, const Vector<String>& alternativeReplacementStrings);
- virtual void dismissCorrectionPanel(WebCore::ReasonForDismissingAlternativeText);
- virtual String dismissCorrectionPanelSoon(WebCore::ReasonForDismissingAlternativeText);
- virtual void recordAutocorrectionResponse(WebCore::AutocorrectionResponseType, const String& replacedString, const String& replacementString);
</del><ins>+ virtual void showCorrectionPanel(WebCore::AlternativeTextType, const WebCore::FloatRect& boundingBoxOfReplacedString, const String& replacedString, const String& replacementString, const Vector<String>& alternativeReplacementStrings) override;
+ virtual void dismissCorrectionPanel(WebCore::ReasonForDismissingAlternativeText) override;
+ virtual String dismissCorrectionPanelSoon(WebCore::ReasonForDismissingAlternativeText) override;
+ virtual void recordAutocorrectionResponse(WebCore::AutocorrectionResponseType, const String& replacedString, const String& replacementString) override;
</ins><span class="cx">
</span><del>- virtual void recommendedScrollbarStyleDidChange(int32_t newStyle);
</del><ins>+ virtual void recommendedScrollbarStyleDidChange(int32_t newStyle) override;
</ins><span class="cx">
</span><del>- virtual WKView* wkView() const { return m_wkView; }
</del><ins>+ virtual WKView* wkView() const override { return m_wkView; }
</ins><span class="cx"> virtual void intrinsicContentSizeDidChange(const WebCore::IntSize& intrinsicContentSize) override;
</span><span class="cx">
</span><span class="cx"> #if USE(DICTATION_ALTERNATIVES)
</span><del>- virtual uint64_t addDictationAlternatives(const RetainPtr<NSTextAlternatives>&);
- virtual void removeDictationAlternatives(uint64_t dictationContext);
- virtual void showDictationAlternativeUI(const WebCore::FloatRect& boundingBoxOfDictatedText, uint64_t dictationContext);
- virtual Vector<String> dictationAlternatives(uint64_t dictationContext);
</del><ins>+ virtual uint64_t addDictationAlternatives(const RetainPtr<NSTextAlternatives>&) override;
+ virtual void removeDictationAlternatives(uint64_t dictationContext) override;
+ virtual void showDictationAlternativeUI(const WebCore::FloatRect& boundingBoxOfDictatedText, uint64_t dictationContext) override;
+ virtual Vector<String> dictationAlternatives(uint64_t dictationContext) override;
</ins><span class="cx"> #endif
</span><span class="cx"> #if USE(INSERTION_UNDO_GROUPING)
</span><span class="cx"> virtual void registerInsertionUndoGrouping() override;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageOverlaycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp (179235 => 179236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp 2015-01-28 01:54:25 UTC (rev 179235)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp 2015-01-28 02:29:06 UTC (rev 179236)
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>- virtual DDActionContext *actionContextForResultAtPoint(WebPageOverlay& pageOverlay, WebCore::FloatPoint location, RefPtr<WebCore::Range>& rangeHandle)
</del><ins>+ virtual DDActionContext *actionContextForResultAtPoint(WebPageOverlay& pageOverlay, WebCore::FloatPoint location, RefPtr<WebCore::Range>& rangeHandle) override
</ins><span class="cx"> {
</span><span class="cx"> if (!m_client.actionContextForResultAtPoint)
</span><span class="cx"> return nil;
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx"> return actionContext;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void dataDetectorsDidPresentUI(WebPageOverlay& pageOverlay)
</del><ins>+ virtual void dataDetectorsDidPresentUI(WebPageOverlay& pageOverlay) override
</ins><span class="cx"> {
</span><span class="cx"> if (!m_client.dataDetectorsDidPresentUI)
</span><span class="cx"> return;
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx"> m_client.dataDetectorsDidPresentUI(toAPI(&pageOverlay), m_client.base.clientInfo);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void dataDetectorsDidChangeUI(WebPageOverlay& pageOverlay)
</del><ins>+ virtual void dataDetectorsDidChangeUI(WebPageOverlay& pageOverlay) override
</ins><span class="cx"> {
</span><span class="cx"> if (!m_client.dataDetectorsDidChangeUI)
</span><span class="cx"> return;
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> m_client.dataDetectorsDidChangeUI(toAPI(&pageOverlay), m_client.base.clientInfo);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void dataDetectorsDidHideUI(WebPageOverlay& pageOverlay)
</del><ins>+ virtual void dataDetectorsDidHideUI(WebPageOverlay& pageOverlay) override
</ins><span class="cx"> {
</span><span class="cx"> if (!m_client.dataDetectorsDidHideUI)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapeNetscapePluginh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h (179235 => 179236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h 2015-01-28 01:54:25 UTC (rev 179235)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h 2015-01-28 02:29:06 UTC (rev 179236)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> static PassRefPtr<NetscapePlugin> fromNPP(NPP);
</span><span class="cx">
</span><span class="cx"> // In-process NetscapePlugins don't support asynchronous initialization.
</span><del>- virtual bool isBeingAsynchronouslyInitialized() const { return false; }
</del><ins>+ virtual bool isBeingAsynchronouslyInitialized() const override { return false; }
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> NPError setDrawingModel(NPDrawingModel);
</span><span class="lines">@@ -177,38 +177,38 @@
</span><span class="cx"> static bool wantsPluginRelativeNPWindowCoordinates();
</span><span class="cx">
</span><span class="cx"> // Plugin
</span><del>- virtual bool initialize(const Parameters&);
- virtual void destroy();
- virtual void paint(WebCore::GraphicsContext*, const WebCore::IntRect& dirtyRect);
- virtual PassRefPtr<ShareableBitmap> snapshot();
</del><ins>+ virtual bool initialize(const Parameters&) override;
+ virtual void destroy() override;
+ virtual void paint(WebCore::GraphicsContext*, const WebCore::IntRect& dirtyRect) override;
+ virtual PassRefPtr<ShareableBitmap> snapshot() override;
</ins><span class="cx"> #if PLATFORM(COCOA)
</span><del>- virtual PlatformLayer* pluginLayer();
</del><ins>+ virtual PlatformLayer* pluginLayer() override;
</ins><span class="cx"> #endif
</span><del>- virtual bool isTransparent();
</del><ins>+ virtual bool isTransparent() override;
</ins><span class="cx"> virtual bool wantsWheelEvents() override;
</span><del>- virtual void geometryDidChange(const WebCore::IntSize& pluginSize, const WebCore::IntRect& clipRect, const WebCore::AffineTransform& pluginToRootViewTransform);
- virtual void visibilityDidChange(bool isVisible);
- virtual void frameDidFinishLoading(uint64_t requestID);
- virtual void frameDidFail(uint64_t requestID, bool wasCancelled);
- virtual void didEvaluateJavaScript(uint64_t requestID, const String& result);
</del><ins>+ virtual void geometryDidChange(const WebCore::IntSize& pluginSize, const WebCore::IntRect& clipRect, const WebCore::AffineTransform& pluginToRootViewTransform) override;
+ virtual void visibilityDidChange(bool isVisible) override;
+ virtual void frameDidFinishLoading(uint64_t requestID) override;
+ virtual void frameDidFail(uint64_t requestID, bool wasCancelled) override;
+ virtual void didEvaluateJavaScript(uint64_t requestID, const String& result) override;
</ins><span class="cx"> virtual void streamDidReceiveResponse(uint64_t streamID, const WebCore::URL& responseURL, uint32_t streamLength,
</span><del>- uint32_t lastModifiedTime, const String& mimeType, const String& headers, const String& suggestedFileName);
- virtual void streamDidReceiveData(uint64_t streamID, const char* bytes, int length);
- virtual void streamDidFinishLoading(uint64_t streamID);
- virtual void streamDidFail(uint64_t streamID, bool wasCancelled);
</del><ins>+ uint32_t lastModifiedTime, const String& mimeType, const String& headers, const String& suggestedFileName) override;
+ virtual void streamDidReceiveData(uint64_t streamID, const char* bytes, int length) override;
+ virtual void streamDidFinishLoading(uint64_t streamID) override;
+ virtual void streamDidFail(uint64_t streamID, bool wasCancelled) override;
</ins><span class="cx"> virtual void manualStreamDidReceiveResponse(const WebCore::URL& responseURL, uint32_t streamLength,
</span><del>- uint32_t lastModifiedTime, const String& mimeType, const String& headers, const String& suggestedFileName);
- virtual void manualStreamDidReceiveData(const char* bytes, int length);
- virtual void manualStreamDidFinishLoading();
- virtual void manualStreamDidFail(bool wasCancelled);
</del><ins>+ uint32_t lastModifiedTime, const String& mimeType, const String& headers, const String& suggestedFileName) override;
+ virtual void manualStreamDidReceiveData(const char* bytes, int length) override;
+ virtual void manualStreamDidFinishLoading() override;
+ virtual void manualStreamDidFail(bool wasCancelled) override;
</ins><span class="cx">
</span><del>- virtual bool handleMouseEvent(const WebMouseEvent&);
- virtual bool handleWheelEvent(const WebWheelEvent&);
- virtual bool handleMouseEnterEvent(const WebMouseEvent&);
- virtual bool handleMouseLeaveEvent(const WebMouseEvent&);
- virtual bool handleContextMenuEvent(const WebMouseEvent&);
- virtual bool handleKeyboardEvent(const WebKeyboardEvent&);
- virtual void setFocus(bool);
</del><ins>+ virtual bool handleMouseEvent(const WebMouseEvent&) override;
+ virtual bool handleWheelEvent(const WebWheelEvent&) override;
+ virtual bool handleMouseEnterEvent(const WebMouseEvent&) override;
+ virtual bool handleMouseLeaveEvent(const WebMouseEvent&) override;
+ virtual bool handleContextMenuEvent(const WebMouseEvent&) override;
+ virtual bool handleKeyboardEvent(const WebKeyboardEvent&) override;
+ virtual void setFocus(bool) override;
</ins><span class="cx">
</span><span class="cx"> virtual bool handleEditingCommand(const String& commandName, const String& argument) override;
</span><span class="cx"> virtual bool isEditingCommandEnabled(const String&) override;
</span><span class="lines">@@ -218,19 +218,19 @@
</span><span class="cx">
</span><span class="cx"> virtual bool handlesPageScaleFactor() override;
</span><span class="cx">
</span><del>- virtual NPObject* pluginScriptableNPObject();
</del><ins>+ virtual NPObject* pluginScriptableNPObject() override;
</ins><span class="cx">
</span><span class="cx"> virtual unsigned countFindMatches(const String&, WebCore::FindOptions, unsigned maxMatchCount) override;
</span><span class="cx"> virtual bool findString(const String&, WebCore::FindOptions, unsigned maxMatchCount) override;
</span><span class="cx">
</span><del>- virtual void windowFocusChanged(bool);
- virtual void windowVisibilityChanged(bool);
</del><ins>+ virtual void windowFocusChanged(bool) override;
+ virtual void windowVisibilityChanged(bool) override;
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- virtual void windowAndViewFramesChanged(const WebCore::IntRect& windowFrameInScreenCoordinates, const WebCore::IntRect& viewFrameInWindowCoordinates);
</del><ins>+ virtual void windowAndViewFramesChanged(const WebCore::IntRect& windowFrameInScreenCoordinates, const WebCore::IntRect& viewFrameInWindowCoordinates) override;
</ins><span class="cx">
</span><del>- virtual uint64_t pluginComplexTextInputIdentifier() const;
- virtual void sendComplexTextInput(const String& textInput);
</del><ins>+ virtual uint64_t pluginComplexTextInputIdentifier() const override;
+ virtual void sendComplexTextInput(const String& textInput) override;
</ins><span class="cx"> virtual void setLayerHostingMode(LayerHostingMode) override;
</span><span class="cx">
</span><span class="cx"> void pluginFocusOrWindowFocusChanged();
</span><span class="lines">@@ -239,15 +239,15 @@
</span><span class="cx"> void updatePluginLayer();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- virtual void contentsScaleFactorChanged(float);
- virtual void storageBlockingStateChanged(bool);
- virtual void privateBrowsingStateChanged(bool);
- virtual bool getFormValue(String& formValue);
- virtual bool handleScroll(WebCore::ScrollDirection, WebCore::ScrollGranularity);
- virtual WebCore::Scrollbar* horizontalScrollbar();
- virtual WebCore::Scrollbar* verticalScrollbar();
</del><ins>+ virtual void contentsScaleFactorChanged(float) override;
+ virtual void storageBlockingStateChanged(bool) override;
+ virtual void privateBrowsingStateChanged(bool) override;
+ virtual bool getFormValue(String& formValue) override;
+ virtual bool handleScroll(WebCore::ScrollDirection, WebCore::ScrollGranularity) override;
+ virtual WebCore::Scrollbar* horizontalScrollbar() override;
+ virtual WebCore::Scrollbar* verticalScrollbar() override;
</ins><span class="cx">
</span><del>- virtual bool supportsSnapshotting() const;
</del><ins>+ virtual bool supportsSnapshotting() const override;
</ins><span class="cx">
</span><span class="cx"> // Convert the given point from plug-in coordinates to root view coordinates.
</span><span class="cx"> virtual WebCore::IntPoint convertToRootView(const WebCore::IntPoint&) const override;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPDFPDFPluginh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.h (179235 => 179236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.h 2015-01-28 01:54:25 UTC (rev 179235)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.h 2015-01-28 02:29:06 UTC (rev 179236)
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> explicit PDFPlugin(WebFrame*);
</span><span class="cx">
</span><span class="cx"> // Plugin functions.
</span><del>- virtual bool initialize(const Parameters&);
</del><ins>+ virtual bool initialize(const Parameters&) override;
</ins><span class="cx"> virtual void destroy() override;
</span><span class="cx"> virtual void paint(WebCore::GraphicsContext*, const WebCore::IntRect& dirtyRectInWindowCoordinates) override { }
</span><span class="cx"> virtual void updateControlTints(WebCore::GraphicsContext*) override;
</span><span class="lines">@@ -200,7 +200,7 @@
</span><span class="cx"> virtual WebCore::IntPoint convertFromScrollbarToContainingView(const WebCore::Scrollbar*, const WebCore::IntPoint& scrollbarPoint) const override;
</span><span class="cx"> virtual WebCore::IntPoint convertFromContainingViewToScrollbar(const WebCore::Scrollbar*, const WebCore::IntPoint& parentPoint) const override;
</span><span class="cx"> virtual bool updatesScrollLayerPositionOnMainThread() const override { return true; }
</span><del>- virtual bool forceUpdateScrollbarsOnMainThreadForPerformanceTesting() const;
</del><ins>+ virtual bool forceUpdateScrollbarsOnMainThreadForPerformanceTesting() const override;
</ins><span class="cx">
</span><span class="cx"> // PDFPlugin functions.
</span><span class="cx"> void updateScrollbars();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginProcessConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.h (179235 => 179236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.h 2015-01-28 01:54:25 UTC (rev 179235)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.h 2015-01-28 02:29:06 UTC (rev 179236)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> // IPC::Connection::Client
</span><span class="cx"> virtual void didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&) override;
</span><span class="cx"> virtual void didReceiveSyncMessage(IPC::Connection&, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&) override;
</span><del>- virtual void didClose(IPC::Connection&);
</del><ins>+ virtual void didClose(IPC::Connection&) override;
</ins><span class="cx"> virtual void didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName) override;
</span><span class="cx">
</span><span class="cx"> // Message handlers.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.h (179235 => 179236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.h 2015-01-28 01:54:25 UTC (rev 179235)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.h 2015-01-28 02:29:06 UTC (rev 179236)
</span><span class="lines">@@ -66,72 +66,72 @@
</span><span class="cx"> void didReceivePluginProxyMessage(IPC::Connection&, IPC::MessageDecoder&);
</span><span class="cx"> void didReceiveSyncPluginProxyMessage(IPC::Connection&, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&);
</span><span class="cx">
</span><del>- bool isBeingAsynchronouslyInitialized() const { return m_waitingOnAsynchronousInitialization; }
</del><ins>+ bool isBeingAsynchronouslyInitialized() const override { return m_waitingOnAsynchronousInitialization; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> explicit PluginProxy(uint64_t pluginProcessToken, bool isRestartedProcess);
</span><span class="cx">
</span><span class="cx"> // Plugin
</span><del>- virtual bool initialize(const Parameters&);
</del><ins>+ virtual bool initialize(const Parameters&) override;
</ins><span class="cx"> bool initializeSynchronously();
</span><span class="cx">
</span><del>- virtual void destroy();
- virtual void paint(WebCore::GraphicsContext*, const WebCore::IntRect& dirtyRect);
- virtual bool supportsSnapshotting() const;
- virtual PassRefPtr<ShareableBitmap> snapshot();
</del><ins>+ virtual void destroy() override;
+ virtual void paint(WebCore::GraphicsContext*, const WebCore::IntRect& dirtyRect) override;
+ virtual bool supportsSnapshotting() const override;
+ virtual PassRefPtr<ShareableBitmap> snapshot() override;
</ins><span class="cx"> #if PLATFORM(COCOA)
</span><del>- virtual PlatformLayer* pluginLayer();
</del><ins>+ virtual PlatformLayer* pluginLayer() override;
</ins><span class="cx"> #endif
</span><del>- virtual bool isTransparent();
</del><ins>+ virtual bool isTransparent() override;
</ins><span class="cx"> virtual bool wantsWheelEvents() override;
</span><del>- virtual void geometryDidChange(const WebCore::IntSize& pluginSize, const WebCore::IntRect& clipRect, const WebCore::AffineTransform& pluginToRootViewTransform);
- virtual void visibilityDidChange(bool isVisible);
- virtual void frameDidFinishLoading(uint64_t requestID);
- virtual void frameDidFail(uint64_t requestID, bool wasCancelled);
- virtual void didEvaluateJavaScript(uint64_t requestID, const String& result);
- virtual void streamDidReceiveResponse(uint64_t streamID, const WebCore::URL& responseURL, uint32_t streamLength, uint32_t lastModifiedTime, const String& mimeType, const String& headers, const String& suggestedFileName);
- virtual void streamDidReceiveData(uint64_t streamID, const char* bytes, int length);
- virtual void streamDidFinishLoading(uint64_t streamID);
- virtual void streamDidFail(uint64_t streamID, bool wasCancelled);
- virtual void manualStreamDidReceiveResponse(const WebCore::URL& responseURL, uint32_t streamLength, uint32_t lastModifiedTime, const WTF::String& mimeType, const WTF::String& headers, const String& suggestedFileName);
- virtual void manualStreamDidReceiveData(const char* bytes, int length);
- virtual void manualStreamDidFinishLoading();
- virtual void manualStreamDidFail(bool wasCancelled);
</del><ins>+ virtual void geometryDidChange(const WebCore::IntSize& pluginSize, const WebCore::IntRect& clipRect, const WebCore::AffineTransform& pluginToRootViewTransform) override;
+ virtual void visibilityDidChange(bool isVisible) override;
+ virtual void frameDidFinishLoading(uint64_t requestID) override;
+ virtual void frameDidFail(uint64_t requestID, bool wasCancelled) override;
+ virtual void didEvaluateJavaScript(uint64_t requestID, const String& result) override;
+ virtual void streamDidReceiveResponse(uint64_t streamID, const WebCore::URL& responseURL, uint32_t streamLength, uint32_t lastModifiedTime, const String& mimeType, const String& headers, const String& suggestedFileName) override;
+ virtual void streamDidReceiveData(uint64_t streamID, const char* bytes, int length) override;
+ virtual void streamDidFinishLoading(uint64_t streamID) override;
+ virtual void streamDidFail(uint64_t streamID, bool wasCancelled) override;
+ virtual void manualStreamDidReceiveResponse(const WebCore::URL& responseURL, uint32_t streamLength, uint32_t lastModifiedTime, const WTF::String& mimeType, const WTF::String& headers, const String& suggestedFileName) override;
+ virtual void manualStreamDidReceiveData(const char* bytes, int length) override;
+ virtual void manualStreamDidFinishLoading() override;
+ virtual void manualStreamDidFail(bool wasCancelled) override;
</ins><span class="cx">
</span><del>- virtual bool handleMouseEvent(const WebMouseEvent&);
- virtual bool handleWheelEvent(const WebWheelEvent&);
- virtual bool handleMouseEnterEvent(const WebMouseEvent&);
- virtual bool handleMouseLeaveEvent(const WebMouseEvent&);
- virtual bool handleContextMenuEvent(const WebMouseEvent&);
- virtual bool handleKeyboardEvent(const WebKeyboardEvent&);
- virtual void setFocus(bool);
</del><ins>+ virtual bool handleMouseEvent(const WebMouseEvent&) override;
+ virtual bool handleWheelEvent(const WebWheelEvent&) override;
+ virtual bool handleMouseEnterEvent(const WebMouseEvent&) override;
+ virtual bool handleMouseLeaveEvent(const WebMouseEvent&) override;
+ virtual bool handleContextMenuEvent(const WebMouseEvent&) override;
+ virtual bool handleKeyboardEvent(const WebKeyboardEvent&) override;
+ virtual void setFocus(bool) override;
</ins><span class="cx"> virtual bool handleEditingCommand(const String& commandName, const String& argument) override;
</span><span class="cx"> virtual bool isEditingCommandEnabled(const String& commandName) override;
</span><span class="cx"> virtual bool shouldAllowScripting() override { return true; }
</span><span class="cx"> virtual bool shouldAllowNavigationFromDrags() override { return false; }
</span><span class="cx">
</span><del>- virtual bool handlesPageScaleFactor();
</del><ins>+ virtual bool handlesPageScaleFactor() override;
</ins><span class="cx">
</span><del>- virtual NPObject* pluginScriptableNPObject();
</del><ins>+ virtual NPObject* pluginScriptableNPObject() override;
</ins><span class="cx">
</span><del>- virtual void windowFocusChanged(bool);
- virtual void windowVisibilityChanged(bool);
</del><ins>+ virtual void windowFocusChanged(bool) override;
+ virtual void windowVisibilityChanged(bool) override;
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- virtual void windowAndViewFramesChanged(const WebCore::IntRect& windowFrameInScreenCoordinates, const WebCore::IntRect& viewFrameInWindowCoordinates);
- virtual uint64_t pluginComplexTextInputIdentifier() const;
- virtual void sendComplexTextInput(const String& textInput);
</del><ins>+ virtual void windowAndViewFramesChanged(const WebCore::IntRect& windowFrameInScreenCoordinates, const WebCore::IntRect& viewFrameInWindowCoordinates) override;
+ virtual uint64_t pluginComplexTextInputIdentifier() const override;
+ virtual void sendComplexTextInput(const String& textInput) override;
</ins><span class="cx"> virtual void setLayerHostingMode(LayerHostingMode) override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- virtual void contentsScaleFactorChanged(float);
- virtual void storageBlockingStateChanged(bool);
- virtual void privateBrowsingStateChanged(bool);
</del><ins>+ virtual void contentsScaleFactorChanged(float) override;
+ virtual void storageBlockingStateChanged(bool) override;
+ virtual void privateBrowsingStateChanged(bool) override;
</ins><span class="cx"> virtual void mutedStateChanged(bool) override;
</span><del>- virtual bool getFormValue(String& formValue);
- virtual bool handleScroll(WebCore::ScrollDirection, WebCore::ScrollGranularity);
- virtual WebCore::Scrollbar* horizontalScrollbar();
- virtual WebCore::Scrollbar* verticalScrollbar();
</del><ins>+ virtual bool getFormValue(String& formValue) override;
+ virtual bool handleScroll(WebCore::ScrollDirection, WebCore::ScrollGranularity) override;
+ virtual WebCore::Scrollbar* horizontalScrollbar() override;
+ virtual WebCore::Scrollbar* verticalScrollbar() override;
</ins><span class="cx">
</span><span class="cx"> virtual unsigned countFindMatches(const String&, WebCore::FindOptions, unsigned) override { return 0; }
</span><span class="cx"> virtual bool findString(const String&, WebCore::FindOptions, unsigned) override { return false; }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebContextMenuClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.h (179235 => 179236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.h 2015-01-28 01:54:25 UTC (rev 179235)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.h 2015-01-28 02:29:06 UTC (rev 179236)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual void contextMenuDestroyed();
</del><ins>+ virtual void contextMenuDestroyed() override;
</ins><span class="cx">
</span><span class="cx"> #if USE(CROSS_PLATFORM_CONTEXT_MENUS)
</span><span class="cx"> virtual std::unique_ptr<WebCore::ContextMenu> customizeMenu(std::unique_ptr<WebCore::ContextMenu>) override;
</span></span></pre>
</div>
</div>
</body>
</html>