diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-10 19:10:20 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-10 19:10:20 +0200 |
| commit | 284837daa07b29d6a63a748544a90b1f5842ac5c (patch) | |
| tree | ecd258180bde91fe741e0cfd2638beb3c6da7e8e /Source/WebKit/gtk/webkit/webkitwebview.cpp | |
| parent | 2e2ba8ff45915f40ed3e014101269c175f2a89a0 (diff) | |
| download | qtwebkit-284837daa07b29d6a63a748544a90b1f5842ac5c.tar.gz | |
Imported WebKit commit 68645295d2e3e09af2c942f092556f06aa5f8b0d (http://svn.webkit.org/repository/webkit/trunk@128073)
New snapshot
Diffstat (limited to 'Source/WebKit/gtk/webkit/webkitwebview.cpp')
| -rw-r--r-- | Source/WebKit/gtk/webkit/webkitwebview.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/Source/WebKit/gtk/webkit/webkitwebview.cpp b/Source/WebKit/gtk/webkit/webkitwebview.cpp index a5368944d..8b992119d 100644 --- a/Source/WebKit/gtk/webkit/webkitwebview.cpp +++ b/Source/WebKit/gtk/webkit/webkitwebview.cpp @@ -427,7 +427,7 @@ static IntPoint getLocationForKeyboardGeneratedContextMenu(Frame* frame) if (!selection->selection().isNonOrphanedCaretOrRange() || (selection->selection().isCaret() && !selection->selection().isContentEditable())) { if (Node* focusedNode = getFocusedNode(frame)) - return focusedNode->getPixelSnappedRect().location(); + return focusedNode->pixelSnappedBoundingBox().location(); // There was no selection and no focused node, so just put the context // menu into the corner of the view, offset slightly. @@ -992,6 +992,9 @@ static void webkit_web_view_realize(GtkWidget* widget) | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_SCROLL_MASK +#if GTK_CHECK_VERSION(3, 3, 18) + | GDK_SMOOTH_SCROLL_MASK +#endif | GDK_POINTER_MOTION_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK @@ -1605,7 +1608,7 @@ static gboolean webkit_web_view_query_tooltip(GtkWidget *widget, gint x, gint y, String title = static_cast<Element*>(titleNode)->title(); if (!title.isEmpty()) { if (FrameView* view = coreFrame->view()) { - GdkRectangle area = view->contentsToWindow(node->getPixelSnappedRect()); + GdkRectangle area = view->contentsToWindow(node->pixelSnappedBoundingBox()); gtk_tooltip_set_tip_area(tooltip, &area); } gtk_tooltip_set_text(tooltip, title.utf8().data()); @@ -3629,9 +3632,9 @@ static void webkit_web_view_init(WebKitWebView* webView) WebCore::provideUserMediaTo(priv->corePage, priv->userMediaClient.get()); #endif -#if ENABLE(REGISTER_PROTOCOL_HANDLER) - priv->registerProtocolHandlerClient = WebKit::RegisterProtocolHandlerClient::create(); - WebCore::provideRegisterProtocolHandlerTo(priv->corePage, priv->registerProtocolHandlerClient.get()); +#if ENABLE(NAVIGATOR_CONTENT_UTILS) + priv->navigatorContentUtilsClient = WebKit::NavigatorContentUtilsClient::create(); + WebCore::provideNavigatorContentUtilsTo(priv->corePage, priv->navigatorContentUtilsClient.get()); #endif if (DumpRenderTreeSupportGtk::dumpRenderTreeModeEnabled()) { |