Changeset 150046 in webkit


Ignore:
Timestamp:
May 13, 2013 7:00:00 PM (11 years ago)
Author:
commit-queue@webkit.org
Message:

Added testRunner.setPrinting.
​https://bugs.webkit.org/show_bug.cgi?id=42693
rdar://problem/8213845

Patch by Alex Christensen <​achristensen@apple.com> on 2013-05-13
Reviewed by Darin Adler.

Source/WebKit2:

  • WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:

(WKBundlePageCopyRenderTreeExternalRepresentationForPrinting): Added.

  • WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h:

Added WKBundlePageCopyRenderTreeExternalRepresentationForPrinting declaration.

  • WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::renderTreeExternalRepresentationForPrinting): Added.

  • WebProcess/WebPage/WebPage.h:

Added renderTreeExternalRepresentationForPrinting declaration.

Tools:

  • WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:

Added setPrinting JavaScript function.

  • WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:

(WTR::InjectedBundlePage::dump):
Dump the external representation for printing if setPrinting has been called.

  • WebKitTestRunner/InjectedBundle/TestRunner.h:

(WTR::TestRunner::isPrinting): Added.
(WTR::TestRunner::setPrinting): Added.
Added and initialized m_isPrinting member boolean.

LayoutTests:

  • platform/wk2/TestExpectations:

Unskipped printing tests.

Location:
trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r150045 r150046  
     12013-05-13  Alex Christensen  <achristensen@apple.com>
     2
     3        Added testRunner.setPrinting.
     4        https://bugs.webkit.org/show_bug.cgi?id=42693
     5        rdar://problem/8213845
     6
     7        Reviewed by Darin Adler.
     8
     9        * platform/wk2/TestExpectations:
     10        Unskipped printing tests.
     11
    1122013-05-13  Christophe Dumez  <ch.dumez@sisa.samsung.com>
    213

  • trunk/LayoutTests/platform/wk2/TestExpectations

    r149936 r150046  
    183183# <https://bugs.webkit.org/show_bug.cgi?id=69548>
    184184fast/events/show-modal-dialog-onblur-onfocus.html
    185 
    186 # WebKitTestRunner needs layoutTestController.setPrinting
    187 # <https://bugs.webkit.org/show_bug.cgi?id=42693>
    188 printing/compositing-layer-printing.html
    189 printing/iframe-print.html
    190 printing/media-queries-print.html
    191 printing/page-rule-in-media-query.html
    192 printing/setPrinting.html
    193 printing/single-line-must-not-be-split-into-two-pages.html
    194 printing/simultaneous-position-float-change.html
    195 printing/width-overflow.html
    196185
    197186# WebKitTestRunner needs layoutTestController.setWillSendRequestClearHeader

  • trunk/Source/WebKit2/ChangeLog

    r150041 r150046  
     12013-05-13  Alex Christensen  <achristensen@apple.com>
     2
     3        Added testRunner.setPrinting.
     4        https://bugs.webkit.org/show_bug.cgi?id=42693
     5        rdar://problem/8213845
     6
     7        Reviewed by Darin Adler.
     8
     9        * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
     10        (WKBundlePageCopyRenderTreeExternalRepresentationForPrinting): Added.
     11        * WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h:
     12        Added WKBundlePageCopyRenderTreeExternalRepresentationForPrinting declaration.
     13        * WebProcess/WebPage/WebPage.cpp:
     14        (WebKit::WebPage::renderTreeExternalRepresentationForPrinting): Added.
     15        * WebProcess/WebPage/WebPage.h:
     16        Added renderTreeExternalRepresentationForPrinting declaration.
     17
    1182013-05-13  Timothy Hatcher  <timothy@apple.com>
    219

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp

    r149980 r150046  
    251251}
    252252
     253WKStringRef WKBundlePageCopyRenderTreeExternalRepresentationForPrinting(WKBundlePageRef pageRef)
     254{
     255    return toCopiedAPI(toImpl(pageRef)->renderTreeExternalRepresentationForPrinting());
     256}
     257
    253258void WKBundlePageExecuteEditingCommand(WKBundlePageRef pageRef, WKStringRef name, WKStringRef argument)
    254259{

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h

    r147752 r150046  
    3939WK_EXPORT void WKBundlePageClose(WKBundlePageRef page);
    4040WK_EXPORT WKStringRef WKBundlePageCopyRenderTreeExternalRepresentation(WKBundlePageRef page);
     41WK_EXPORT WKStringRef WKBundlePageCopyRenderTreeExternalRepresentationForPrinting(WKBundlePageRef page);
    4142WK_EXPORT void WKBundlePageExecuteEditingCommand(WKBundlePageRef page, WKStringRef commandName, WKStringRef argument);
    4243

  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

    r149848 r150046  
    682682}
    683683
     684String WebPage::renderTreeExternalRepresentationForPrinting() const
     685{
     686    return externalRepresentation(m_mainFrame->coreFrame(), RenderAsTextPrintingMode);
     687}
     688
    684689uint64_t WebPage::renderTreeSize() const
    685690{

  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h

    r149848 r150046  
    296296
    297297    String renderTreeExternalRepresentation() const;
     298    String renderTreeExternalRepresentationForPrinting() const;
    298299    uint64_t renderTreeSize() const;
    299300

  • trunk/Tools/ChangeLog

    r150028 r150046  
     12013-05-13  Alex Christensen  <achristensen@apple.com>
     2
     3        Added testRunner.setPrinting.
     4        https://bugs.webkit.org/show_bug.cgi?id=42693
     5        rdar://problem/8213845
     6
     7        Reviewed by Darin Adler.
     8
     9        * WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
     10        Added setPrinting JavaScript function.
     11        * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
     12        (WTR::InjectedBundlePage::dump):
     13        Dump the external representation for printing if setPrinting has been called.
     14        * WebKitTestRunner/InjectedBundle/TestRunner.h:
     15        (WTR::TestRunner::isPrinting): Added.
     16        (WTR::TestRunner::setPrinting): Added.
     17        Added and initialized m_isPrinting member boolean.
     18
    1192013-05-13  Csaba Osztrogonác  <ossy@webkit.org>
    220

  • trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl

    r149692 r150046  
    7474    void setCacheModel(int model);
    7575    void setAsynchronousSpellCheckingEnabled(boolean value);
     76    void setPrinting();
    7677
    7778    // Special DOM functions.

  • trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp

    r149731 r150046  
    875875    switch (InjectedBundle::shared().testRunner()->whatToDump()) {
    876876    case TestRunner::RenderTree: {
    877         WKRetainPtr<WKStringRef> text(AdoptWK, WKBundlePageCopyRenderTreeExternalRepresentation(m_page));
    878         stringBuilder.append(toWTFString(text));
     877        if (InjectedBundle::shared().testRunner()->isPrinting())
     878            stringBuilder.append(toWTFString(adoptWK(WKBundlePageCopyRenderTreeExternalRepresentationForPrinting(m_page)).get()));
     879        else
     880            stringBuilder.append(toWTFString(adoptWK(WKBundlePageCopyRenderTreeExternalRepresentation(m_page)).get()));
    879881        break;
    880882    }

  • trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp

    r149268 r150046  
    8686    , m_testRepaint(false)
    8787    , m_testRepaintSweepHorizontally(false)
     88    , m_isPrinting(false)
    8889    , m_willSendRequestReturnsNull(false)
    8990    , m_willSendRequestReturnsNullOnRedirect(false)

  • trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h

    r149692 r150046  
    154154    // Printing
    155155    bool isPageBoxVisible(int pageIndex);
     156    bool isPrinting() { return m_isPrinting; }
     157    void setPrinting() { m_isPrinting = true; }
    156158
    157159    // Authentication
    … …  
    304306    bool m_testRepaint;
    305307    bool m_testRepaintSweepHorizontally;
     308    bool m_isPrinting;
    306309
    307310    bool m_willSendRequestReturnsNull;
Note: See TracChangeset for help on using the changeset viewer.