Changeset 116119 in webkit

Timestamp:

May 4, 2012 10:22:59 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL] Frame load callbacks output is missing for redirections
​https://bugs.webkit.org/show_bug.cgi?id=85173

Patch by Christophe Dumez <Christophe Dumez> on 2012-05-04
Reviewed by Antonio Gomes.

Source/WebKit/efl:

Add a few redirection-related signals on the ewk_frame so that EFL's
DumpRenderTree can print the expected output when
LayoutTestController's dumpFrameLoadCallbacks() returns true.

• WebCoreSupport/FrameLoaderClientEfl.cpp:

(WebCore::FrameLoaderClientEfl::dispatchWillSendRequest):
(WebCore::FrameLoaderClientEfl::dispatchDidReceiveResponse):
(WebCore::FrameLoaderClientEfl::dispatchDidReceiveServerRedirectForProvisionalLoad):
(WebCore::FrameLoaderClientEfl::dispatchWillPerformClientRedirect):

• ewk/ewk_frame.cpp:

(ewk_frame_redirect_provisional_load):
(ewk_frame_redirect_requested):

• ewk/ewk_frame.h:
• ewk/ewk_private.h:

Tools:

Catch the new ewk_frame signals to print the expected output in case
of redirections, when LayoutTestController's dumpFrameLoadCallbacks()
returns true.

• DumpRenderTree/efl/DumpRenderTreeChrome.cpp:

(DumpRenderTreeChrome::createView):
(DumpRenderTreeChrome::onWillSendRequest):
(DumpRenderTreeChrome::onFrameCreated):
(DumpRenderTreeChrome::onFrameRedirectForProvisionalLoad):
(DumpRenderTreeChrome::onFrameRedirectRequested):
(DumpRenderTreeChrome::onResponseReceived):

• DumpRenderTree/efl/DumpRenderTreeChrome.h:

(DumpRenderTreeChrome):

LayoutTests:

Update test_expectations.txt now that EFL's DumpRenderTree is
correctly printing frame load callbacks information in case of
redirections.

• platform/efl/Skipped:
• platform/efl/test_expectations.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/efl/Skipped (modified) (3 diffs)
• LayoutTests/platform/efl/test_expectations.txt (modified) (2 diffs)
• Source/WebKit/efl/ChangeLog (modified) (1 diff)
• Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp (modified) (5 diffs)
• Source/WebKit/efl/ewk/ewk_frame.cpp (modified) (1 diff)
• Source/WebKit/efl/ewk/ewk_frame.h (modified) (2 diffs)
• Source/WebKit/efl/ewk/ewk_private.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp (modified) (4 diffs)
• Tools/DumpRenderTree/efl/DumpRenderTreeChrome.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-05-04  Christophe Dumez  <christophe.dumez@intel.com>
+
+        [EFL] Frame load callbacks output is missing for redirections
+        https://bugs.webkit.org/show_bug.cgi?id=85173
+
+        Reviewed by Antonio Gomes.
+
+        Update test_expectations.txt now that EFL's DumpRenderTree is
+        correctly printing frame load callbacks information in case of
+        redirections.
+
+        * platform/efl/Skipped:
+        * platform/efl/test_expectations.txt:
+
 2012-05-04  Sudarsana Nagineni  <sudarsana.nagineni@linux.intel.com>
 

trunk/LayoutTests/platform/efl/Skipped

@@ -266 +266 @@
 fast/encoding/idn-security.html
 
-# EFL's LayoutTestController does not implement dispatchPendingLoadRequests
-http/tests/loading/deleted-host-in-resource-load-delegate-callback.html
-
 # EFL's LayoutTestController does not implement keepWebHistory
 fast/history/visited-generated-content-test.html
@@ -573 +570 @@
 media/media-captions.html
 
-# BUG: Requires willPerformClientRedirectToURL
-http/tests/loading/onload-vs-immediate-refresh.pl
-
 # BUG: Missing DRT API.
 http/tests/loading/preload-slow-loading.php
-
-# BUG: Missing resource load callback ability in DRT
-http/tests/loading/redirect-methods.html
 
 # BUG: No authentication challenge handling
@@ -888 +879 @@
 # https://bugs.webkit.org/show_bug.cgi?id=61122
 http/tests/navigation/post-307-response.html
-
-# Needs to make sure the redirect-chain scenario in https://bugs.webkit.org/show_bug.cgi?id=31410 works
-# See https://bugs.webkit.org/show_bug.cgi?id=35300
-http/tests/loading/307-after-303-after-post.html
 
 # Probably related to https://bugs.webkit.org/show_bug.cgi?id=27637

trunk/LayoutTests/platform/efl/test_expectations.txt

@@ -266 +266 @@
 // Redirect response URL is not the one expected
 BUGWK85072 : http/tests/misc/will-send-request-returns-null-on-redirect.html = TEXT
+BUGWK85072 : http/tests/loading/307-after-303-after-post.html = TEXT
+BUGWK85072 : http/tests/loading/redirect-methods.html = TEXT
 
 // No support for overriding WebKitLoadSiteIconsKey
@@ -285 +287 @@
 // Generate results for your platform
 BUGWK85567 : fast/images/png-suite/test.html = IMAGE
-
 // Issue with SVG hittesting on strokes, fails on GTK as well.
 BUGWK82628 : svg/hittest/svg-ellipse-non-scale-stroke.xhtml = FAIL

trunk/Source/WebKit/efl/ChangeLog

@@ +1 @@
+2012-05-04  Christophe Dumez  <christophe.dumez@intel.com>
+
+        [EFL] Frame load callbacks output is missing for redirections
+        https://bugs.webkit.org/show_bug.cgi?id=85173
+
+        Reviewed by Antonio Gomes.
+
+        Add a few redirection-related signals on the ewk_frame so that EFL's
+        DumpRenderTree can print the expected output when
+        LayoutTestController's dumpFrameLoadCallbacks() returns true.
+
+        * WebCoreSupport/FrameLoaderClientEfl.cpp:
+        (WebCore::FrameLoaderClientEfl::dispatchWillSendRequest):
+        (WebCore::FrameLoaderClientEfl::dispatchDidReceiveResponse):
+        (WebCore::FrameLoaderClientEfl::dispatchDidReceiveServerRedirectForProvisionalLoad):
+        (WebCore::FrameLoaderClientEfl::dispatchWillPerformClientRedirect):
+        * ewk/ewk_frame.cpp:
+        (ewk_frame_redirect_provisional_load):
+        (ewk_frame_redirect_requested):
+        * ewk/ewk_frame.h:
+        * ewk/ewk_private.h:
+
 2012-05-04  Christophe Dumez  <christophe.dumez@intel.com>
 

trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp

@@ -198 +198 @@
         responseBuffer.url = redirectUrl.data();
         responseBuffer.status_code = coreResponse.httpStatusCode();
+        responseBuffer.identifier = identifier;
         redirectResponse = &responseBuffer;
     }
@@ -263 +264 @@
 }
 
-void FrameLoaderClientEfl::dispatchDidReceiveResponse(DocumentLoader* loader, unsigned long, const ResourceResponse& coreResponse)
+void FrameLoaderClientEfl::dispatchDidReceiveResponse(DocumentLoader* loader, unsigned long identifier, const ResourceResponse& coreResponse)
 {
     // Update our knowledge of request soup flags - some are only set
@@ -271 +272 @@
     m_response = coreResponse;
 
-    Ewk_Frame_Resource_Response response = { 0, coreResponse.httpStatusCode() };
+    Ewk_Frame_Resource_Response response = { 0, coreResponse.httpStatusCode(), identifier };
     CString url = coreResponse.url().string().utf8();
     response.url = url.data();
@@ -570 +571 @@
 void FrameLoaderClientEfl::dispatchDidReceiveServerRedirectForProvisionalLoad()
 {
-    notImplemented();
+    ewk_frame_redirect_provisional_load(m_frame);
 }
 
@@ -578 +579 @@
 }
 
-void FrameLoaderClientEfl::dispatchWillPerformClientRedirect(const KURL&, double, double)
-{
-    notImplemented();
+void FrameLoaderClientEfl::dispatchWillPerformClientRedirect(const KURL& url, double, double)
+{
+    ewk_frame_redirect_requested(m_frame, url.string().utf8().data());
 }
 

trunk/Source/WebKit/efl/ewk/ewk_frame.cpp

@@ -1227 +1227 @@
 /**
  * @internal
+ * Reports receipt of server redirect for provisional load.
+ *
+ * @param ewkFrame Frame.
+ *
+ * Emits signal: "redirect,load,provisional"
+ */
+void ewk_frame_redirect_provisional_load(Evas_Object* ewkFrame)
+{
+    evas_object_smart_callback_call(ewkFrame, "redirect,load,provisional", 0);
+}
+
+/**
+ * @internal
+ * Reports that a client redirect will be performed.
+ *
+ * @param ewkFrame Frame.
+ * @param url Redirection URL.
+ *
+ * Emits signal: "redirect,requested"
+ */
+void ewk_frame_redirect_requested(Evas_Object* ewkFrame, const char* url)
+{
+    evas_object_smart_callback_call(ewkFrame, "redirect,requested", (void*)url);
+}
+
+/**
+ * @internal
  * Reports a resource will be requested. User may override behavior of webkit by
  * changing values in @param request.

trunk/Source/WebKit/efl/ewk/ewk_frame.h

@@ -62 +62 @@
  *  - "navigation,first", void: first navigation was occurred.
  *  - "redirect,cancelled", void: client redirect was cancelled.
+ *  - "redirect,load,provisional", void: received server redirect for provisional load.
+ *  - "redirect,requested", const char*: url of the client redirect that will be performed.
  *  - "resource,request,new", Ewk_Frame_Resource_Request*: reports that
  *    there's a new resource request.
@@ -136 +138 @@
     const char *url; /**< url of the resource */
     int status_code; /**< http status code */
+    unsigned long identifier; /**< identifier of resource */
 };
 

trunk/Source/WebKit/efl/ewk/ewk_private.h

@@ -227 +227 @@
 
 void ewk_frame_redirect_cancelled(Evas_Object* ewkFrame);
+void ewk_frame_redirect_provisional_load(Evas_Object* ewkFrame);
+void ewk_frame_redirect_requested(Evas_Object* ewkFrame, const char* url);
 void ewk_frame_request_will_send(Evas_Object* ewkFrame, Ewk_Frame_Resource_Messages* messages);
 void ewk_frame_request_assign_identifier(Evas_Object* ewkFrame, const Ewk_Frame_Resource_Request* request);

trunk/Tools/ChangeLog

@@ +1 @@
+2012-05-04  Christophe Dumez  <christophe.dumez@intel.com>
+
+        [EFL] Frame load callbacks output is missing for redirections
+        https://bugs.webkit.org/show_bug.cgi?id=85173
+
+        Reviewed by Antonio Gomes.
+
+        Catch the new ewk_frame signals to print the expected output in case
+        of redirections, when LayoutTestController's dumpFrameLoadCallbacks()
+        returns true.
+
+        * DumpRenderTree/efl/DumpRenderTreeChrome.cpp:
+        (DumpRenderTreeChrome::createView):
+        (DumpRenderTreeChrome::onWillSendRequest):
+        (DumpRenderTreeChrome::onFrameCreated):
+        (DumpRenderTreeChrome::onFrameRedirectForProvisionalLoad):
+        (DumpRenderTreeChrome::onFrameRedirectRequested):
+        (DumpRenderTreeChrome::onResponseReceived):
+        * DumpRenderTree/efl/DumpRenderTreeChrome.h:
+        (DumpRenderTreeChrome):
+
 2012-05-04  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
 

trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp

@@ -113 +113 @@
     evas_object_smart_callback_add(mainFrame, "load,error", onFrameLoadError, 0);
     evas_object_smart_callback_add(mainFrame, "redirect,cancelled", onFrameRedirectCancelled, 0);
+    evas_object_smart_callback_add(mainFrame, "redirect,load,provisional", onFrameRedirectForProvisionalLoad, 0);
+    evas_object_smart_callback_add(mainFrame, "redirect,requested", onFrameRedirectRequested, 0);
     evas_object_smart_callback_add(mainFrame, "xss,detected", onDidDetectXSS, 0);
 
@@ -498 +500 @@
     evas_object_smart_callback_add(frame, "load,error", onFrameLoadError, 0);
     evas_object_smart_callback_add(frame, "redirect,cancelled", onFrameRedirectCancelled, 0);
+    evas_object_smart_callback_add(frame, "redirect,load,provisional", onFrameRedirectForProvisionalLoad, 0);
+    evas_object_smart_callback_add(frame, "redirect,requested", onFrameRedirectRequested, 0);
     evas_object_smart_callback_add(frame, "xss,detected", onDidDetectXSS, 0);
 }
@@ -555 +559 @@
 }
 
+void DumpRenderTreeChrome::onFrameRedirectForProvisionalLoad(void*, Evas_Object* frame, void*)
+{
+    if (!done && gLayoutTestController->dumpFrameLoadCallbacks()) {
+        const String frameName(DumpRenderTreeSupportEfl::suitableDRTFrameName(frame));
+        printf("%s - didReceiveServerRedirectForProvisionalLoadForFrame\n", frameName.utf8().data());
+    }
+}
+
+void DumpRenderTreeChrome::onFrameRedirectRequested(void*, Evas_Object* frame, void* eventInfo)
+{
+    const char* url = static_cast<const char*>(eventInfo);
+
+    if (!done && gLayoutTestController->dumpFrameLoadCallbacks()) {
+        const String frameName(DumpRenderTreeSupportEfl::suitableDRTFrameName(frame));
+        printf("%s - willPerformClientRedirectToURL: %s \n", frameName.utf8().data(), pathSuitableForTestResult(url).data());
+    }
+}
+
 void DumpRenderTreeChrome::onDidDetectXSS(void*, Evas_Object* view, void*)
 {
@@ -568 +590 @@
         CString responseDescription(descriptionSuitableForTestResult(response));
         printf("%s - didReceiveResponse %s\n",
-               pathSuitableForTestResult(response->url).data(),
+               m_dumpAssignedUrls.contains(response->identifier) ? m_dumpAssignedUrls.get(response->identifier).data() : "<unknown>",
                responseDescription.data());
     }

trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.h

@@ -97 +97 @@
 
     static void onFrameRedirectCancelled(void*, Evas_Object*, void*);
+    static void onFrameRedirectForProvisionalLoad(void*, Evas_Object*, void*);
+    static void onFrameRedirectRequested(void*, Evas_Object*, void*);
 
     static void onFrameLoadError(void*, Evas_Object*, void*);