REGRESSION(r218325): [GTK] Runtime critical warnings running layout tests that show...
authorcarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 16 Jun 2017 06:03:18 +0000 (06:03 +0000)
committercarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 16 Jun 2017 06:03:18 +0000 (06:03 +0000)
https://bugs.webkit.org/show_bug.cgi?id=173421

Reviewed by Carlos Alberto Lopez Perez.

In r218325 I forgot to create a WebKitPopupMenu or WebPopupMenuProxyGtk depending on whether the view is a
WebKitWebView or not.

* UIProcess/API/gtk/PageClientImpl.cpp:
(WebKit::PageClientImpl::createPopupMenuProxy):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@218382 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp

index a7ab7a4..b73815d 100644 (file)
@@ -1,3 +1,16 @@
+2017-06-15  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        REGRESSION(r218325): [GTK] Runtime critical warnings running layout tests that show a popup menu
+        https://bugs.webkit.org/show_bug.cgi?id=173421
+
+        Reviewed by Carlos Alberto Lopez Perez.
+
+        In r218325 I forgot to create a WebKitPopupMenu or WebPopupMenuProxyGtk depending on whether the view is a
+        WebKitWebView or not.
+
+        * UIProcess/API/gtk/PageClientImpl.cpp:
+        (WebKit::PageClientImpl::createPopupMenuProxy):
+
 2017-06-15  Tim Horton  <timothy_horton@apple.com>
 
         Null deref under ViewGestureController::endSwipeGesture (navigationGestureDidEnd)
index 9987d39..83b39a6 100644 (file)
@@ -206,7 +206,9 @@ void PageClientImpl::doneWithKeyEvent(const NativeWebKeyboardEvent& event, bool
 
 RefPtr<WebPopupMenuProxy> PageClientImpl::createPopupMenuProxy(WebPageProxy& page)
 {
-    return WebKitPopupMenu::create(m_viewWidget, page);
+    if (WEBKIT_IS_WEB_VIEW(m_viewWidget))
+        return WebKitPopupMenu::create(m_viewWidget, page);
+    return WebPopupMenuProxyGtk::create(m_viewWidget, page);
 }
 
 RefPtr<WebContextMenuProxy> PageClientImpl::createContextMenuProxy(WebPageProxy& page, const ContextMenuContextData& context, const UserData& userData)