Changeset 119590 in webkit

Timestamp:

Jun 6, 2012 7:57:42 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL][DRT] http/tests/globalhistory testcases do not pass
​https://bugs.webkit.org/show_bug.cgi?id=82579

Patch by Mikhail Pozdnyakov <​mikhail.pozdnyakov@intel.com> on 2012-06-06
Reviewed by Csaba Osztrogonác.

Tools:

DRT has provided callbacks for ewk_view "global history delegate" signals.

• DumpRenderTree/efl/DumpRenderTree.cpp:

(isGlobalHistoryTest): Aux function to ident global history testcase.
(createLayoutTestController):

• DumpRenderTree/efl/DumpRenderTreeChrome.cpp:

(DumpRenderTreeChrome::createView):
(DumpRenderTreeChrome::onTitleChanged): Handles also some global history testcases.
(DumpRenderTreeChrome::onWebViewNavigatedWithData): New callback function.
(DumpRenderTreeChrome::onWebViewServerRedirect): Ditto.
(DumpRenderTreeChrome::onWebViewClientRedirect): Ditto.
(DumpRenderTreeChrome::onWebViewPopulateVisitedLinks): Ditto.

• DumpRenderTree/efl/DumpRenderTreeChrome.h:

(DumpRenderTreeChrome):

LayoutTests:

• platform/efl/Skipped: Unskip http/tests/globalhistory.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/efl/Skipped (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/efl/DumpRenderTree.cpp (modified) (2 diffs)
• Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp (modified) (3 diffs)
• Tools/DumpRenderTree/efl/DumpRenderTreeChrome.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-06-06  Mikhail Pozdnyakov  <mikhail.pozdnyakov@intel.com>
+
+        [EFL][DRT] http/tests/globalhistory testcases do not pass
+        https://bugs.webkit.org/show_bug.cgi?id=82579
+
+        Reviewed by Csaba Osztrogonác.
+
+        * platform/efl/Skipped: Unskip http/tests/globalhistory.
+
 2012-06-06  Ilya Tikhonovsky  <loislo@chromium.org>
 

trunk/LayoutTests/platform/efl/Skipped

@@ -293 +293 @@
 fast/dom/Window/slow-unload-handler.html
 fast/dom/Window/slow-unload-handler-only-frame-is-stopped.html
-
-# The EFL port has no global history delegate
-http/tests/globalhistory
 
 # Fails because of the security policy of the user agent?

trunk/Tools/ChangeLog

@@ +1 @@
+2012-06-06  Mikhail Pozdnyakov  <mikhail.pozdnyakov@intel.com>
+
+        [EFL][DRT] http/tests/globalhistory testcases do not pass
+        https://bugs.webkit.org/show_bug.cgi?id=82579
+
+        Reviewed by Csaba Osztrogonác.
+
+        DRT has provided callbacks for ewk_view "global history delegate" signals.
+
+        * DumpRenderTree/efl/DumpRenderTree.cpp:
+        (isGlobalHistoryTest): Aux function to ident global history testcase.
+        (createLayoutTestController):
+        * DumpRenderTree/efl/DumpRenderTreeChrome.cpp:
+        (DumpRenderTreeChrome::createView):
+        (DumpRenderTreeChrome::onTitleChanged): Handles also some global history testcases.
+        (DumpRenderTreeChrome::onWebViewNavigatedWithData): New callback function.
+        (DumpRenderTreeChrome::onWebViewServerRedirect): Ditto.
+        (DumpRenderTreeChrome::onWebViewClientRedirect): Ditto.
+        (DumpRenderTreeChrome::onWebViewPopulateVisitedLinks): Ditto.
+        * DumpRenderTree/efl/DumpRenderTreeChrome.h:
+        (DumpRenderTreeChrome):
+
 2012-06-06  János Badics  <jbadics@inf.u-szeged.hu>
 

trunk/Tools/DumpRenderTree/efl/DumpRenderTree.cpp

@@ -200 +200 @@
 }
 
+static inline bool isGlobalHistoryTest(const String& cTestPathOrURL)
+{
+    return cTestPathOrURL.contains("/globalhistory/");
+}
+
 static void createLayoutTestController(const String& testURL, const String& expectedPixelHash)
 {
@@ -215 +220 @@
 
     gLayoutTestController->setDeveloperExtrasEnabled(true);
+    gLayoutTestController->setDumpHistoryDelegateCallbacks(isGlobalHistoryTest(testURL));
 
     if (shouldDumpAsText(testURL)) {

trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp

@@ -111 +111 @@
     evas_object_smart_callback_add(view, "mixedcontent,displayed", onInsecureContentDisplayed, 0);
     evas_object_smart_callback_add(view, "frame,created", onFrameCreated, 0);
+    evas_object_smart_callback_add(view, "navigate,with,data", onWebViewNavigatedWithData, 0);
+    evas_object_smart_callback_add(view, "perform,server,redirect", onWebViewServerRedirect, 0);
+    evas_object_smart_callback_add(view, "perform,client,redirect", onWebViewClientRedirect, 0);
+    evas_object_smart_callback_add(view, "populate,visited,links", onWebViewPopulateVisitedLinks, 0);
 
     connectEditingCallbacks(view);
@@ -455 +459 @@
     if (!done && gLayoutTestController->dumpTitleChanges())
         printf("TITLE CHANGED: %s\n", (titleText && titleText->string) ? titleText->string : "");
+
+    if (!done && gLayoutTestController->dumpHistoryDelegateCallbacks())
+        printf("WebView updated the title for history URL \"%s\" to \"%s\".\n", ewk_frame_uri_get(frame)
+               , (titleText && titleText->string) ? titleText->string : "");
 }
 
@@ -551 +559 @@
 }
 
+void DumpRenderTreeChrome::onWebViewNavigatedWithData(void*, Evas_Object*, void* eventInfo)
+{
+    if (done || !gLayoutTestController->dumpHistoryDelegateCallbacks())
+        return;
+
+    ASSERT(eventInfo);
+    const Ewk_View_Navigation_Data* navigationData = static_cast<Ewk_View_Navigation_Data*>(eventInfo);
+
+    ASSERT(navigationData->request);
+    ASSERT(navigationData->response);
+
+    const bool wasFailure = navigationData->has_substitute_data || navigationData->response->status_code >= 400;
+    const bool wasRedirected = navigationData->client_redirect_source && *(navigationData->client_redirect_source);
+
+    printf("WebView navigated to url \"%s\" with title \"%s\" with HTTP equivalent method \"%s\".  The navigation was %s and was %s%s.\n",
+        navigationData->url,
+        navigationData->title,
+        navigationData->request->http_method,
+        wasFailure? "a failure" : "successful",
+        (wasRedirected ? "a client redirect from " : "not a client redirect"),
+        (wasRedirected ? navigationData->client_redirect_source : ""));
+}
+
+void DumpRenderTreeChrome::onWebViewServerRedirect(void*, Evas_Object*, void* eventInfo)
+{
+    if (done || !gLayoutTestController->dumpHistoryDelegateCallbacks())
+        return;
+
+    ASSERT(eventInfo);
+    const Ewk_View_Redirection_Data* data = static_cast<Ewk_View_Redirection_Data*>(eventInfo);
+    printf("WebView performed a server redirect from \"%s\" to \"%s\".\n", data->source_url, data->destination_url);
+}
+
+void DumpRenderTreeChrome::onWebViewClientRedirect(void*, Evas_Object*, void* eventInfo)
+{
+    if (done || !gLayoutTestController->dumpHistoryDelegateCallbacks())
+        return;
+
+    ASSERT(eventInfo);
+    const Ewk_View_Redirection_Data* data = static_cast<Ewk_View_Redirection_Data*>(eventInfo);
+    printf("WebView performed a client redirect from \"%s\" to \"%s\".\n", data->source_url, data->destination_url);
+}
+
+void DumpRenderTreeChrome::onWebViewPopulateVisitedLinks(void*, Evas_Object* ewkView, void*)
+{
+    if (done || !gLayoutTestController->dumpHistoryDelegateCallbacks())
+        return;
+
+    printf("Asked to populate visited links for WebView \"%s\"\n", ewk_view_uri_get(ewkView));
+}
+
 void DumpRenderTreeChrome::onFrameProvisionalLoad(void*, Evas_Object* frame, void*)
 {

trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.h

@@ -92 +92 @@
     static void onWebViewOnloadEvent(void*, Evas_Object*, void*);
 
+    static void onWebViewNavigatedWithData(void*, Evas_Object*, void*);
+
+    static void onWebViewServerRedirect(void*, Evas_Object*, void*);
+
+    static void onWebViewClientRedirect(void*, Evas_Object*, void*);
+
+    static void onWebViewPopulateVisitedLinks(void*, Evas_Object*, void*);
+
     static void onInsecureContentRun(void*, Evas_Object*, void*);