Changeset 41969 in webkit

Timestamp:

Mar 25, 2009 5:00:52 AM (15 years ago)

Author:

xan@webkit.org

Message:

2009-03-23 Alejandro Garcia Castro <​alex@igalia.com>

Reviewed by Holger Freyther.

[Gtk] Current API does not allow us to open target="_blank" links
in new tabs instead of windows
​https://bugs.webkit.org/show_bug.cgi?id=23932

Added a signal to the API (new-window-policy-decision-requested)
that allows the browser to decide the policy for the new window
request, if the signal is not handled we open the new window as
usual.

• WebCoreSupport/FrameLoaderClientGtk.cpp: (WebKit::getNavigationAction): (WebKit::FrameLoaderClient::dispatchDecidePolicyForNewWindowAction): (WebKit::FrameLoaderClient::dispatchDecidePolicyForNavigationAction):
• webkit/webkitwebview.cpp:

Location:

trunk/WebKit/gtk

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/FrameLoaderClientGtk.cpp (modified) (3 diffs)
• webkit/webkitwebview.cpp (modified) (2 diffs)

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2009-03-23  Alejandro Garcia Castro  <alex@igalia.com>
+
+        Reviewed by Holger Freyther.
+
+        [Gtk] Current API does not allow us to open target="_blank" links
+        in new tabs instead of windows
+        https://bugs.webkit.org/show_bug.cgi?id=23932
+
+        Added a signal to the API (new-window-policy-decision-requested)
+        that allows the browser to decide the policy for the new window
+        request, if the signal is not handled we open the new window as
+        usual.
+
+        * WebCoreSupport/FrameLoaderClientGtk.cpp:
+        (WebKit::getNavigationAction):
+        (WebKit::FrameLoaderClient::dispatchDecidePolicyForNewWindowAction):
+        (WebKit::FrameLoaderClient::dispatchDecidePolicyForNavigationAction):
+        * webkit/webkitwebview.cpp:
+
 2009-03-20  Jan Michael Alonzo  <jmalonzo@gmail.com>
 

trunk/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp

@@ -304 +304 @@
 }
 
+static WebKitWebNavigationAction* getNavigationAction(const NavigationAction& action)
+{
+    gint button = -1;
+
+    const Event* event = action.event();
+    if (event && event->isMouseEvent()) {
+        const MouseEvent* mouseEvent = static_cast<const MouseEvent*>(event);
+        // DOM button values are 0, 1 and 2 for left, middle and right buttons.
+        // GTK+ uses 1, 2 and 3, so let's add 1 to remain consistent.
+        button = mouseEvent->button() + 1;
+    }
+
+    gint modifierFlags = 0;
+    UIEventWithKeyState* keyStateEvent = findEventWithKeyState(const_cast<Event*>(event));
+    if (keyStateEvent) {
+        if (keyStateEvent->shiftKey())
+            modifierFlags |= GDK_SHIFT_MASK;
+        if (keyStateEvent->ctrlKey())
+            modifierFlags |= GDK_CONTROL_MASK;
+        if (keyStateEvent->altKey())
+            modifierFlags |= GDK_MOD1_MASK;
+        if (keyStateEvent->metaKey())
+            modifierFlags |= GDK_MOD2_MASK;
+    }
+
+    return WEBKIT_WEB_NAVIGATION_ACTION(g_object_new(WEBKIT_TYPE_WEB_NAVIGATION_ACTION,
+                                                     "reason", kit(action.type()),
+                                                     "original-uri", action.url().string().utf8().data(),
+                                                     "button", button,
+                                                     "modifier-state", modifierFlags,
+                                                     NULL));
+}
+
 void FrameLoaderClient::dispatchDecidePolicyForNewWindowAction(FramePolicyFunction policyFunction, const NavigationAction& action, const ResourceRequest& resourceRequest, PassRefPtr<FormState>, const String& s)
 {
@@ -315 +348 @@
     }
 
+    WebKitWebPolicyDecision* policyDecision = webkit_web_policy_decision_new(m_frame, policyFunction);
+
+    if (m_policyDecision)
+        g_object_unref(m_policyDecision);
+    m_policyDecision = policyDecision;
+
+    WebKitWebView* webView = getViewFromFrame(m_frame);
+    WebKitNetworkRequest* request = webkit_network_request_new(resourceRequest.url().string().utf8().data());
+    WebKitWebNavigationAction* navigationAction = getNavigationAction(action);
+    gboolean isHandled = false;
+
+    g_signal_emit_by_name(webView, "new-window-policy-decision-requested", m_frame, request, navigationAction, policyDecision, &isHandled);
+
+    g_object_unref(navigationAction);
+    g_object_unref(request);
+
     // FIXME: I think Qt version marshals this to another thread so when we
     // have multi-threaded download, we might need to do the same
-    (core(m_frame)->loader()->*policyFunction)(PolicyUse);
+    if (!isHandled)
+        (core(m_frame)->loader()->*policyFunction)(PolicyUse);
 }
 
@@ -354 +404 @@
     m_policyDecision = policyDecision;
 
-    gint button = -1;
-    gint modifierFlags = 0;
-
-    const Event* event = action.event();
-    if (event && event->isMouseEvent()) {
-        const MouseEvent* mouseEvent = static_cast<const MouseEvent*>(event);
-        // DOM button values are 0, 1 and 2 for left, middle and right buttons.
-        // GTK+ uses 1, 2 and 3, so let's add 1 to remain consistent.
-        button = mouseEvent->button() + 1;
-    }
-
-    UIEventWithKeyState* keyStateEvent = findEventWithKeyState(const_cast<Event*>(event));
-    if (keyStateEvent) {
-        if (keyStateEvent->shiftKey())
-            modifierFlags |= GDK_SHIFT_MASK;
-        if (keyStateEvent->ctrlKey())
-            modifierFlags |= GDK_CONTROL_MASK;
-        if (keyStateEvent->altKey())
-            modifierFlags |= GDK_MOD1_MASK;
-        if (keyStateEvent->metaKey())
-            modifierFlags |= GDK_MOD2_MASK;
-    }
-
-    GObject* navigationAction = G_OBJECT(g_object_new(WEBKIT_TYPE_WEB_NAVIGATION_ACTION,
-                                                     "reason", kit(action.type()),
-                                                      "original-uri", action.url().string().utf8().data(),
-                                                      "button", button,
-                                                      "modifier-state", modifierFlags,
-                                                      NULL));
-
+    WebKitWebNavigationAction* navigationAction = getNavigationAction(action);
     gboolean isHandled = false;
     g_signal_emit_by_name(webView, "navigation-policy-decision-requested", m_frame, request, navigationAction, policyDecision, &isHandled);

trunk/WebKit/gtk/webkit/webkitwebview.cpp

@@ -113 +113 @@
     /* normal signals */
     NAVIGATION_REQUESTED,
+    NEW_WINDOW_POLICY_DECISION_REQUESTED,
     NAVIGATION_POLICY_DECISION_REQUESTED,
     MIME_TYPE_POLICY_DECISION_REQUESTED,
@@ -1053 +1054 @@
 
     /**
+     * WebKitWebView::new-window-policy-decision-requested:
+     * @web_view: the object on which the signal is emitted
+     * @frame: the #WebKitWebFrame that required the navigation
+     * @request: a #WebKitNetworkRequest
+     * @navigation_action: a #WebKitWebNavigation
+     * @policy_decision: a #WebKitWebPolicyDecision
+     * @return: TRUE if the signal will be handled, FALSE to have the
+     *          default behavior apply
+     *
+     * Emitted when @frame requests opening a new window. With this
+     * signal the browser can use the context of the request to decide
+     * about the new window. If the request is not handled the default
+     * behavior is to allow opening the new window to load the url,
+     * which will cause a create-web-view signal emission where the
+     * browser handles the new window action but without information
+     * of the context that caused the navigation. The following
+     * navigation-policy-decision-requested emissions will load the
+     * page after the creation of the new window just with the
+     * information of this new navigation context, without any
+     * information about the action that made this new window to be
+     * opened.
+     *
+     * Since: 1.1.4
+     */
+    webkit_web_view_signals[NEW_WINDOW_POLICY_DECISION_REQUESTED] =
+        g_signal_new("new-window-policy-decision-requested",
+            G_TYPE_FROM_CLASS(webViewClass),
+            (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
+            0,
+            g_signal_accumulator_true_handled,
+            NULL,
+            webkit_marshal_BOOLEAN__OBJECT_OBJECT_OBJECT_OBJECT,
+            G_TYPE_BOOLEAN, 4,
+            WEBKIT_TYPE_WEB_FRAME,
+            WEBKIT_TYPE_NETWORK_REQUEST,
+            WEBKIT_TYPE_WEB_NAVIGATION_ACTION,
+            WEBKIT_TYPE_WEB_POLICY_DECISION);
+
+    /**
      * WebKitWebView::navigation-policy-decision-requested:
      * @web_view: the object on which the signal is emitted