Merge r181938 - [GTK][WK2] WebPageProxy::failedToShowPopupMenu() virt…

…ual method should be marked as override https://bugs.webkit.org/show_bug.cgi?id=143045 Reviewed by Carlos Garcia Campos. * UIProcess/WebPageProxy.h: Mark the failedToShowPopupMenu(), inherited from the WebPopupMenuProxy::Client class, as overridden.
WebKit · Mar 25, 2015 · 405e960 · 405e960
1 parent 06a81ad
commit 405e960
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2015-03-25  Zan Dobersek  <zdobersek@igalia.com>
+
+        [GTK][WK2] WebPageProxy::failedToShowPopupMenu() virtual method should be marked as override
+        https://bugs.webkit.org/show_bug.cgi?id=143045
+
+        Reviewed by Carlos Garcia Campos.
+
+        * UIProcess/WebPageProxy.h: Mark the failedToShowPopupMenu(), inherited from
+        the WebPopupMenuProxy::Client class, as overridden.
+
 2015-03-25  Zan Dobersek  <zdobersek@igalia.com>
 
         [WK2] Clean up DrawingAreaImpl vtable overrides

diff --git a/Source/WebKit2/UIProcess/WebPageProxy.h b/Source/WebKit2/UIProcess/WebPageProxy.h
@@ -1025,7 +1025,7 @@ class WebPageProxy : public API::ObjectImpl<API::Object::Type::Page>
     virtual void valueChangedForPopupMenu(WebPopupMenuProxy*, int32_t newSelectedIndex) override;
     virtual void setTextFromItemForPopupMenu(WebPopupMenuProxy*, int32_t index) override;
 #if PLATFORM(GTK)
-    virtual void failedToShowPopupMenu();
+    virtual void failedToShowPopupMenu() override;
 #endif
 
     void didCreateMainFrame(uint64_t frameID);