Changeset 69151 in webkit


Ignore:
Timestamp:
Oct 5, 2010 3:11:35 PM (14 years ago)
Author:
kbr@google.com
Message:

2010-10-05 Kenneth Russell <​kbr@google.com>

Reviewed by Tony Chang.

[chromium] Implement layerTreeAsText in DumpRenderTree
​https://bugs.webkit.org/show_bug.cgi?id=47216

Plumbed Frame::layerTreeAsText through Chromium's WebKit API to
make it callable from DumpRenderTree.

No new tests; verified with existing compositor layout tests.

  • public/WebFrame.h:
  • src/WebFrameImpl.cpp: (WebKit::WebFrameImpl::layerTreeAsText):
  • src/WebFrameImpl.h:

2010-10-05 Kenneth Russell <​kbr@google.com>

Reviewed by Tony Chang.

[chromium] Implement layerTreeAsText in DumpRenderTree
​https://bugs.webkit.org/show_bug.cgi?id=47216

Plumbed Frame::layerTreeAsText through Chromium's WebKit API to
make it callable from DumpRenderTree.

No new tests; verified with existing compositor layout tests.

  • DumpRenderTree/chromium/LayoutTestController.cpp: (LayoutTestController::LayoutTestController): (LayoutTestController::layerTreeAsText):
  • DumpRenderTree/chromium/LayoutTestController.h:
Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKit/chromium/ChangeLog

    r69143 r69151  
     12010-10-05  Kenneth Russell  <kbr@google.com>
     2
     3        Reviewed by Tony Chang.
     4
     5        [chromium] Implement layerTreeAsText in DumpRenderTree
     6        https://bugs.webkit.org/show_bug.cgi?id=47216
     7
     8        Plumbed Frame::layerTreeAsText through Chromium's WebKit API to
     9        make it callable from DumpRenderTree.
     10
     11        No new tests; verified with existing compositor layout tests.
     12
     13        * public/WebFrame.h:
     14        * src/WebFrameImpl.cpp:
     15        (WebKit::WebFrameImpl::layerTreeAsText):
     16        * src/WebFrameImpl.h:
     17
    1182010-10-05  Andrew Wilson  <atwilson@chromium.org>
    219

  • trunk/WebKit/chromium/public/WebFrame.h

    r68871 r69151  
    551551                                   double time,
    552552                                   const WebString& elementId) = 0;
     553
     554    // Dumps the layer tree, used by the accelerated compositor, in
     555    // text form. This is used only by layout tests.
     556    virtual WebString layerTreeAsText() const = 0;
    553557protected:
    554558    ~WebFrame() { }

  • trunk/WebKit/chromium/src/WebFrameImpl.cpp

    r69039 r69151  
    17711771}
    17721772
     1773WebString WebFrameImpl::layerTreeAsText() const
     1774{
     1775    if (!m_frame)
     1776        return WebString();
     1777    return WebString(m_frame->layerTreeAsText());
     1778}
     1779
    17731780// WebFrameImpl public ---------------------------------------------------------
    17741781

  • trunk/WebKit/chromium/src/WebFrameImpl.h

    r68871 r69151  
    191191                                   double time,
    192192                                   const WebString& elementId);
     193    virtual WebString layerTreeAsText() const;
    193194
    194195    static PassRefPtr<WebFrameImpl> create(WebFrameClient* client);

  • trunk/WebKitTools/ChangeLog

    r69146 r69151  
     12010-10-05  Kenneth Russell  <kbr@google.com>
     2
     3        Reviewed by Tony Chang.
     4
     5        [chromium] Implement layerTreeAsText in DumpRenderTree
     6        https://bugs.webkit.org/show_bug.cgi?id=47216
     7
     8        Plumbed Frame::layerTreeAsText through Chromium's WebKit API to
     9        make it callable from DumpRenderTree.
     10
     11        No new tests; verified with existing compositor layout tests.
     12
     13        * DumpRenderTree/chromium/LayoutTestController.cpp:
     14        (LayoutTestController::LayoutTestController):
     15        (LayoutTestController::layerTreeAsText):
     16        * DumpRenderTree/chromium/LayoutTestController.h:
     17
    1182010-10-05  Brent Fulgham  <bfulgham@webkit.org>
    219

  • trunk/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp

    r68216 r69151  
    107107    bindMethod("grantDesktopNotificationPermission", &LayoutTestController::grantDesktopNotificationPermission);
    108108    bindMethod("isCommandEnabled", &LayoutTestController::isCommandEnabled);
     109    bindMethod("layerTreeAsText", &LayoutTestController::layerTreeAsText);
    109110    bindMethod("markerTextForListItem", &LayoutTestController::markerTextForListItem);
    110111    bindMethod("notifyDone", &LayoutTestController::notifyDone);
    … …  
    15381539}
    15391540
     1541void LayoutTestController::layerTreeAsText(const CppArgumentList& args, CppVariant* result)
     1542{
     1543    result->set(m_shell->webView()->mainFrame()->layerTreeAsText().utf8());
     1544}
     1545
    15401546void LayoutTestController::markerTextForListItem(const CppArgumentList& args, CppVariant* result)
    15411547{

  • trunk/WebKitTools/DumpRenderTree/chromium/LayoutTestController.h

    r68216 r69151  
    326326    void setMockSpeechInputResult(const CppArgumentList&, CppVariant*);
    327327
     328    void layerTreeAsText(const CppArgumentList& args, CppVariant* result);
     329
    328330    void markerTextForListItem(const CppArgumentList&, CppVariant*);
    329331
Note: See TracChangeset for help on using the changeset viewer.