Commit 13be8c45 authored by ossy@webkit.org's avatar ossy@webkit.org
Browse files

[WTR] Should dump as text when the mimetype is text/plain

https://bugs.webkit.org/show_bug.cgi?id=118306

Patch by Peter Gal <galpeter@inf.u-szeged.hu> 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:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154478 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 49b4fada
2013-08-23 Peter Gal <galpeter@inf.u-szeged.hu>
[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 <simon.pena@samsung.com>
 
[GTK] Unreviewed gardening. Update test expectations.
......@@ -235,7 +235,6 @@ editing/text-iterator/findString-selection-disabled.html
# 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
......
2013-08-23 Peter Gal <galpeter@inf.u-szeged.hu>
[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 <fpizlo@apple.com>
Update LLVM binary drops and scripts to the latest version from SVN
......
......@@ -848,8 +848,10 @@ void InjectedBundlePage::dump()
WKBundlePageForceRepaint(m_page);
WKBundleFrameRef frame = WKBundlePageGetMainFrame(m_page);
WTF::String url = toWTFString(adoptWK(WKURLCopyString(adoptWK(WKBundleFrameCopyURL(frame)).get())));
if (url.find("dumpAsText/") != WTF::notFound)
WKRetainPtr<WKURLRef> urlRef = adoptWK(WKBundleFrameCopyURL(frame));
String url = toWTFString(adoptWK(WKURLCopyString(urlRef.get())));
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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment