Diff
Modified: trunk/LayoutTests/ChangeLog (116157 => 116158)
--- trunk/LayoutTests/ChangeLog 2012-05-04 20:13:10 UTC (rev 116157)
+++ trunk/LayoutTests/ChangeLog 2012-05-04 20:14:58 UTC (rev 116158)
@@ -1,3 +1,16 @@
+2012-05-04 Christophe Dumez <[email protected]>
+
+ [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 <[email protected]>
Fix expectation for test after http://trac.webkit.org/changeset/116143.
Modified: trunk/LayoutTests/platform/efl/Skipped (116157 => 116158)
--- trunk/LayoutTests/platform/efl/Skipped 2012-05-04 20:13:10 UTC (rev 116157)
+++ trunk/LayoutTests/platform/efl/Skipped 2012-05-04 20:14:58 UTC (rev 116158)
@@ -549,17 +549,6 @@
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
# https://bugs.webkit.org/show_bug.cgi?id=20011
printing/setPrinting.html
Added: trunk/LayoutTests/platform/efl/fast/preloader/script-expected.txt (0 => 116158)
--- trunk/LayoutTests/platform/efl/fast/preloader/script-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/efl/fast/preloader/script-expected.txt 2012-05-04 20:14:58 UTC (rev 116158)
@@ -0,0 +1,5 @@
+script1.js has MIME type application/_javascript_
+This test requires DumpRenderTree to see the log of what resources are loaded.
+
+<script src=""
+
Modified: trunk/Source/WebKit/efl/ChangeLog (116157 => 116158)
--- trunk/Source/WebKit/efl/ChangeLog 2012-05-04 20:13:10 UTC (rev 116157)
+++ trunk/Source/WebKit/efl/ChangeLog 2012-05-04 20:14:58 UTC (rev 116158)
@@ -1,3 +1,18 @@
+2012-05-04 Christophe Dumez <[email protected]>
+
+ [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 <[email protected]>
Don't require FrameLoaderClient to manufacture a commitData() call for empty documents.
Modified: trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp (116157 => 116158)
--- trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp 2012-05-04 20:13:10 UTC (rev 116157)
+++ trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp 2012-05-04 20:14:58 UTC (rev 116158)
@@ -188,15 +188,17 @@
Ewk_Frame_Resource_Response* redirectResponse;
Ewk_Frame_Resource_Response responseBuffer;
- CString redirectUrl;
+ CString redirectUrl, mimeType;
if (coreResponse.isNull())
redirectResponse = 0;
else {
redirectUrl = coreResponse.url().string().utf8();
+ mimeType = coreResponse.mimeType().utf8();
responseBuffer.url = ""
responseBuffer.status_code = coreResponse.httpStatusCode();
responseBuffer.identifier = identifier;
+ responseBuffer.mime_type = mimeType.data();
redirectResponse = &responseBuffer;
}
@@ -270,7 +272,8 @@
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 = ""
response.url = ""
Modified: trunk/Source/WebKit/efl/ewk/ewk_frame.h (116157 => 116158)
--- trunk/Source/WebKit/efl/ewk/ewk_frame.h 2012-05-04 20:13:10 UTC (rev 116157)
+++ trunk/Source/WebKit/efl/ewk/ewk_frame.h 2012-05-04 20:14:58 UTC (rev 116158)
@@ -138,6 +138,7 @@
const char *url; /**< url of the resource */
int status_code; /**< http status code */
unsigned long identifier; /**< identifier of resource */
+ const char *mime_type; /**< MIME type of the resource */
};
/// Creates a type name for _Ewk_Frame_Resource_Messages.
Modified: trunk/Tools/ChangeLog (116157 => 116158)
--- trunk/Tools/ChangeLog 2012-05-04 20:13:10 UTC (rev 116157)
+++ trunk/Tools/ChangeLog 2012-05-04 20:14:58 UTC (rev 116158)
@@ -1,3 +1,16 @@
+2012-05-04 Christophe Dumez <[email protected]>
+
+ [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 <[email protected]>
[GTK] DRT needs an implementation of LayoutTestController::setDefersLoading and ::goBack
Modified: trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp (116157 => 116158)
--- trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp 2012-05-04 20:13:10 UTC (rev 116157)
+++ trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp 2012-05-04 20:14:58 UTC (rev 116158)
@@ -592,6 +592,12 @@
m_dumpAssignedUrls.contains(response->identifier) ? m_dumpAssignedUrls.get(response->identifier).data() : "<unknown>",
responseDescription.data());
}
+
+ if (!done && gLayoutTestController->dumpResourceResponseMIMETypes()) {
+ printf("%s has MIME type %s\n",
+ KURL(ParsedURLString, response->url).lastPathComponent().utf8().data(),
+ response->mime_type);
+ }
}
void DumpRenderTreeChrome::onResourceLoadFinished(void*, Evas_Object*, void* eventInfo)
