Changeset 154478 in webkit


Ignore:
Timestamp:
Aug 23, 2013 4:18:24 AM (11 years ago)
Author:
Csaba Osztrogonác
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 <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:
Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r154477 r154478  
     12013-08-23  Peter Gal  <galpeter@inf.u-szeged.hu>
     2
     3        [WTR] Should dump as text when the mimetype is text/plain
     4        https://bugs.webkit.org/show_bug.cgi?id=118306
     5
     6        Reviewed by Christophe Dumez.
     7
     8        Unskipping http/tests/multipart/load-last-non-html-frame.php.
     9        Now the result should match the expectation.
     10
     11        * platform/wk2/TestExpectations:
     12
    1132013-08-23  Simon Pena  <simon.pena@samsung.com>
    214
  • trunk/LayoutTests/platform/wk2/TestExpectations

    r153852 r154478  
    236236# WebKit2 needs an implementation of FrameLoaderClient::revertToProvisionalState
    237237# https://bugs.webkit.org/show_bug.cgi?id=81365
    238 http/tests/multipart/load-last-non-html-frame.php
    239238http/tests/multipart/multipart-wait-before-boundary.html
    240239
  • trunk/Tools/ChangeLog

    r154468 r154478  
     12013-08-23  Peter Gal  <galpeter@inf.u-szeged.hu>
     2
     3        [WTR] Should dump as text when the mimetype is text/plain
     4        https://bugs.webkit.org/show_bug.cgi?id=118306
     5
     6        Reviewed by Christophe Dumez.
     7
     8        Check for the text/plain mimetype and if true then mark it as
     9        text dump.
     10
     11        * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
     12        (WTR::InjectedBundlePage::dump):
     13
    1142013-08-22  Filip Pizlo  <fpizlo@apple.com>
    215
  • trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp

    r153956 r154478  
    849849
    850850    WKBundleFrameRef frame = WKBundlePageGetMainFrame(m_page);
    851     WTF::String url = toWTFString(adoptWK(WKURLCopyString(adoptWK(WKBundleFrameCopyURL(frame)).get())));
    852     if (url.find("dumpAsText/") != WTF::notFound)
     851    WKRetainPtr<WKURLRef> urlRef = adoptWK(WKBundleFrameCopyURL(frame));
     852    String url = toWTFString(adoptWK(WKURLCopyString(urlRef.get())));
     853    WKRetainPtr<WKStringRef> mimeType = adoptWK(WKBundleFrameCopyMIMETypeForResourceWithURL(frame, urlRef.get()));
     854    if (url.find("dumpAsText/") != notFound || WKStringIsEqualToUTF8CString(mimeType.get(), "text/plain"))
    853855        InjectedBundle::shared().testRunner()->dumpAsText(false);
    854856
Note: See TracChangeset for help on using the changeset viewer.