Title: [154478] trunk
- Revision
- 154478
- Author
- [email protected]
- Date
- 2013-08-23 04:18:24 -0700 (Fri, 23 Aug 2013)
Log Message
[WTR] Should dump as text when the mimetype is text/plain
https://bugs.webkit.org/show_bug.cgi?id=118306
Patch by Peter Gal <[email protected]> on 2013-08-23
Reviewed by Christophe Dumez.
Tools:
Check for the text/plain mimetype and if true then mark it as
text dump.
* WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
(WTR::InjectedBundlePage::dump):
LayoutTests:
Unskipping http/tests/multipart/load-last-non-html-frame.php.
Now the result should match the expectation.
* platform/wk2/TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (154477 => 154478)
--- trunk/LayoutTests/ChangeLog 2013-08-23 10:33:05 UTC (rev 154477)
+++ trunk/LayoutTests/ChangeLog 2013-08-23 11:18:24 UTC (rev 154478)
@@ -1,3 +1,15 @@
+2013-08-23 Peter Gal <[email protected]>
+
+ [WTR] Should dump as text when the mimetype is text/plain
+ https://bugs.webkit.org/show_bug.cgi?id=118306
+
+ Reviewed by Christophe Dumez.
+
+ Unskipping http/tests/multipart/load-last-non-html-frame.php.
+ Now the result should match the expectation.
+
+ * platform/wk2/TestExpectations:
+
2013-08-23 Simon Pena <[email protected]>
[GTK] Unreviewed gardening. Update test expectations.
Modified: trunk/LayoutTests/platform/wk2/TestExpectations (154477 => 154478)
--- trunk/LayoutTests/platform/wk2/TestExpectations 2013-08-23 10:33:05 UTC (rev 154477)
+++ trunk/LayoutTests/platform/wk2/TestExpectations 2013-08-23 11:18:24 UTC (rev 154478)
@@ -235,7 +235,6 @@
# WebKit2 needs an implementation of FrameLoaderClient::revertToProvisionalState
# https://bugs.webkit.org/show_bug.cgi?id=81365
-http/tests/multipart/load-last-non-html-frame.php
http/tests/multipart/multipart-wait-before-boundary.html
# layoutTestController.setWindowIsKey() has no effect on the web process side in WebKit2
Modified: trunk/Tools/ChangeLog (154477 => 154478)
--- trunk/Tools/ChangeLog 2013-08-23 10:33:05 UTC (rev 154477)
+++ trunk/Tools/ChangeLog 2013-08-23 11:18:24 UTC (rev 154478)
@@ -1,3 +1,16 @@
+2013-08-23 Peter Gal <[email protected]>
+
+ [WTR] Should dump as text when the mimetype is text/plain
+ https://bugs.webkit.org/show_bug.cgi?id=118306
+
+ Reviewed by Christophe Dumez.
+
+ Check for the text/plain mimetype and if true then mark it as
+ text dump.
+
+ * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+ (WTR::InjectedBundlePage::dump):
+
2013-08-22 Filip Pizlo <[email protected]>
Update LLVM binary drops and scripts to the latest version from SVN
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (154477 => 154478)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2013-08-23 10:33:05 UTC (rev 154477)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2013-08-23 11:18:24 UTC (rev 154478)
@@ -848,8 +848,10 @@
WKBundlePageForceRepaint(m_page);
WKBundleFrameRef frame = WKBundlePageGetMainFrame(m_page);
- WTF::String url = ""
- if (url.find("dumpAsText/") != WTF::notFound)
+ WKRetainPtr<WKURLRef> urlRef = adoptWK(WKBundleFrameCopyURL(frame));
+ String url = ""
+ WKRetainPtr<WKStringRef> mimeType = adoptWK(WKBundleFrameCopyMIMETypeForResourceWithURL(frame, urlRef.get()));
+ if (url.find("dumpAsText/") != notFound || WKStringIsEqualToUTF8CString(mimeType.get(), "text/plain"))
InjectedBundle::shared().testRunner()->dumpAsText(false);
StringBuilder stringBuilder;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
