Changeset 116158 in webkit

Timestamp:

May 4, 2012 1:14:58 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL] Implement layoutTestController.dumpResourceResponseMIMETypes
​https://bugs.webkit.org/show_bug.cgi?id=84941

Patch by Christophe Dumez <Christophe Dumez> on 2012-05-04
Reviewed by Martin Robinson.

Source/WebKit/efl:

Extend Ewk_Frame_Resource_Response structure to pass resource MIME type
information.

• WebCoreSupport/FrameLoaderClientEfl.cpp:

(WebCore::FrameLoaderClientEfl::dispatchWillSendRequest):
(WebCore::FrameLoaderClientEfl::dispatchDidReceiveResponse):

• ewk/ewk_frame.h:

Tools:

Print MIME type detection messages in EFL's DumpRenderTree if
LayoutTestController's dumpResourceResponseMIMETypes() returns true.

• DumpRenderTree/efl/DumpRenderTreeChrome.cpp:

(DumpRenderTreeChrome::onResponseReceived):

LayoutTests:

• platform/efl/Skipped: Unskip test cases which require MIME type

detection messages now that is is implemented in EFL port.

• platform/efl/fast/preloader/script-expected.txt: Added. Use same

EFL expectation as in chromium and mac ports (MIME type is
"application/javascript" instead of "application/x-javascript").

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/efl/Skipped (modified) (1 diff)
• LayoutTests/platform/efl/fast/preloader (added)
• LayoutTests/platform/efl/fast/preloader/script-expected.txt (added)
• Source/WebKit/efl/ChangeLog (modified) (1 diff)
• Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp (modified) (3 diffs)
• Source/WebKit/efl/ewk/ewk_frame.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-05-04  Christophe Dumez  <christophe.dumez@intel.com>
+
+        [EFL] Implement layoutTestController.dumpResourceResponseMIMETypes
+        https://bugs.webkit.org/show_bug.cgi?id=84941
+
+        Reviewed by Martin Robinson.
+
+        * platform/efl/Skipped: Unskip test cases which require MIME type
+        detection messages now that is is implemented in EFL port.
+        * platform/efl/fast/preloader/script-expected.txt: Added. Use same
+        EFL expectation as in chromium and mac ports (MIME type is
+        "application/javascript" instead of "application/x-javascript").
+
 2012-05-04  Ojan Vafai  <ojan@chromium.org>
 

trunk/LayoutTests/platform/efl/Skipped

@@ -549 +549 @@
 fast/js/i18n-bindings-locale.html
 fast/js/navigator-language.html
-
-# BUG: no mimetype detection messages (LayoutTestController:dumpResourceResponseMIMETypes)
-fast/preloader/document-write-noscript.html
-fast/preloader/image.html
-fast/preloader/input.html
-fast/preloader/link.html
-fast/preloader/noscript.html
-fast/preloader/script.html
-fast/preloader/style.html
-http/tests/mime/uppercase-mime-type.html
-http/tests/loading/preload-append-scan.php
 
 # BUG: Needs setPrinting

trunk/Source/WebKit/efl/ChangeLog

@@ +1 @@
+2012-05-04  Christophe Dumez  <christophe.dumez@intel.com>
+
+        [EFL] Implement layoutTestController.dumpResourceResponseMIMETypes
+        https://bugs.webkit.org/show_bug.cgi?id=84941
+
+        Reviewed by Martin Robinson.
+
+        Extend Ewk_Frame_Resource_Response structure to pass resource MIME type
+        information.
+
+        * WebCoreSupport/FrameLoaderClientEfl.cpp:
+        (WebCore::FrameLoaderClientEfl::dispatchWillSendRequest):
+        (WebCore::FrameLoaderClientEfl::dispatchDidReceiveResponse):
+        * ewk/ewk_frame.h:
+
 2012-05-04  Nate Chapin  <japhet@chromium.org>
 

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

@@ -189 +189 @@
     Ewk_Frame_Resource_Response* redirectResponse;
     Ewk_Frame_Resource_Response responseBuffer;
-    CString redirectUrl;
+    CString redirectUrl, mimeType;
 
     if (coreResponse.isNull())
@@ -195 +195 @@
     else {
         redirectUrl = coreResponse.url().string().utf8();
+        mimeType = coreResponse.mimeType().utf8();
         responseBuffer.url = redirectUrl.data();
         responseBuffer.status_code = coreResponse.httpStatusCode();
         responseBuffer.identifier = identifier;
+        responseBuffer.mime_type = mimeType.data();
         redirectResponse = &responseBuffer;
     }
@@ -271 +273 @@
     m_response = coreResponse;
 
-    Ewk_Frame_Resource_Response response = { 0, coreResponse.httpStatusCode(), identifier };
+    CString mimeType = coreResponse.mimeType().utf8();
+    Ewk_Frame_Resource_Response response = { 0, coreResponse.httpStatusCode(), identifier, mimeType.data() };
     CString url = coreResponse.url().string().utf8();
     response.url = url.data();

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

@@ -139 +139 @@
     int status_code; /**< http status code */
     unsigned long identifier; /**< identifier of resource */
+    const char *mime_type; /**< MIME type of the resource */
 };
 

trunk/Tools/ChangeLog

@@ +1 @@
+2012-05-04  Christophe Dumez  <christophe.dumez@intel.com>
+
+        [EFL] Implement layoutTestController.dumpResourceResponseMIMETypes
+        https://bugs.webkit.org/show_bug.cgi?id=84941
+
+        Reviewed by Martin Robinson.
+
+        Print MIME type detection messages in EFL's DumpRenderTree if
+        LayoutTestController's dumpResourceResponseMIMETypes() returns true.
+
+        * DumpRenderTree/efl/DumpRenderTreeChrome.cpp:
+        (DumpRenderTreeChrome::onResponseReceived):
+
 2012-05-04  Sudarsana Nagineni  <sudarsana.nagineni@linux.intel.com>
 

trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp

@@ -593 +593 @@
                responseDescription.data());
     }
+
+    if (!done && gLayoutTestController->dumpResourceResponseMIMETypes()) {
+        printf("%s has MIME type %s\n",
+               KURL(ParsedURLString, response->url).lastPathComponent().utf8().data(),
+               response->mime_type);
+    }
 }