Changeset 65163 in webkit

Timestamp:

Aug 11, 2010 10:14:54 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-08-11 Ryuan Choi <​ryuan.choi@samsung.com>

Reviewed by Antonio Gomes.

Implementation dispatchDecidePolicyForNavigationAction
​https://bugs.webkit.org/show_bug.cgi?id=43544

Add ewk_view_navigation_policy_decision to decide whether url which
user clicked will be loaded or not.

• WebCoreSupport/FrameLoaderClientEfl.cpp: (WebCore::FrameLoaderClientEfl::dispatchDecidePolicyForNavigationAction):
• ewk/ewk_private.h:
• ewk/ewk_view.cpp: (ewk_view_navigation_policy_decision):
• ewk/ewk_view.h:

Location:

trunk/WebKit/efl

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/FrameLoaderClientEfl.cpp (modified) (1 diff)
• ewk/ewk_private.h (modified) (1 diff)
• ewk/ewk_view.cpp (modified) (1 diff)
• ewk/ewk_view.h (modified) (2 diffs)

trunk/WebKit/efl/ChangeLog

@@ +1 @@
+2010-08-11  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        Reviewed by Antonio Gomes.
+
+        Implementation dispatchDecidePolicyForNavigationAction
+        https://bugs.webkit.org/show_bug.cgi?id=43544
+
+        Add ewk_view_navigation_policy_decision to decide whether url which
+        user clicked will be loaded or not.
+
+        * WebCoreSupport/FrameLoaderClientEfl.cpp:
+        (WebCore::FrameLoaderClientEfl::dispatchDecidePolicyForNavigationAction):
+        * ewk/ewk_private.h:
+        * ewk/ewk_view.cpp:
+        (ewk_view_navigation_policy_decision):
+        * ewk/ewk_view.h:
+
 2010-08-10  Ryuan Choi  <ryuan.choi@samsung.com>
 

trunk/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp

@@ -355 +355 @@
     // if not acceptNavigationRequest - look at Qt -> PolicyIgnore;
     // FIXME: do proper check and only reset forms when on PolicyIgnore
-    Frame* f = ewk_frame_core_get(m_frame);
-    f->loader()->resetMultipleFormSubmissionProtection();
-    callPolicyFunction(function, PolicyUse);
+    char* url = strdup(resourceRequest.url().prettyURL().utf8().data());
+    Ewk_Frame_Resource_Request request = { url, 0 };
+    Eina_Bool ret = ewk_view_navigation_policy_decision(m_view, &request);
+    free(url);
+
+    PolicyAction policy;
+    if (!ret)
+        policy = PolicyIgnore;
+    else {
+        if (action.type() == NavigationTypeFormSubmitted || action.type() == NavigationTypeFormResubmitted) {
+            Frame* f = ewk_frame_core_get(m_frame);
+            f->loader()->resetMultipleFormSubmissionProtection();
+        }
+        policy = PolicyUse;
+    }
+    callPolicyFunction(function, policy);
 }
 

trunk/WebKit/efl/ewk/ewk_private.h

@@ -149 +149 @@
 WTF::PassRefPtr<WebCore::Widget> ewk_frame_plugin_create(Evas_Object* o, const WebCore::IntSize& pluginSize, WebCore::HTMLPlugInElement* element, const WebCore::KURL& url, const WTF::Vector<WTF::String>& paramNames, const WTF::Vector<WTF::String>& paramValues, const WTF::String& mimeType, bool loadManually);
 
+Eina_Bool ewk_view_navigation_policy_decision(Evas_Object* o, Ewk_Frame_Resource_Request* request);
+
 #ifdef __cplusplus
 

trunk/WebKit/efl/ewk/ewk_view.cpp

@@ -3981 +3981 @@
     return priv->settings.zoom_range.user_scalable;
 }
+
+/**
+ * @internal
+ * Reports a requeset will be loaded. It's client responsibility to decide if
+ * request would be used. If @return is true, loader will try to load. Else,
+ * Loader ignore action of request.
+ *
+ * @param o View to load
+ * @param request Request which contain url to navigate
+ */
+Eina_Bool ewk_view_navigation_policy_decision(Evas_Object* o, Ewk_Frame_Resource_Request* request)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_TRUE);
+    EINA_SAFETY_ON_NULL_RETURN_VAL(sd->api, EINA_TRUE);
+
+    if (!sd->api->navigation_policy_decision)
+        return EINA_TRUE;
+
+    return sd->api->navigation_policy_decision(sd, request);
+}

trunk/WebKit/efl/ewk/ewk_view.h

@@ -22 +22 @@
 #define ewk_view_h
 
+#include "ewk_frame.h"
 #include "ewk_history.h"
 #include "ewk_window_features.h"
@@ -134 +135 @@
 
     Eina_Bool (*run_open_panel)(Ewk_View_Smart_Data *sd, Evas_Object *frame, Eina_Bool allows_multiple_files, const Eina_List *suggested_filenames, Eina_List **selected_filenames);
+
+    Eina_Bool (*navigation_policy_decision)(Ewk_View_Smart_Data *sd, Ewk_Frame_Resource_Request *request);
 };