Changeset 143547 in webkit


Ignore:
Timestamp:
Feb 20, 2013 6:09:53 PM (11 years ago)
Author:
jamesr@google.com
Message:

[chromium] Request WebLayerTreeView for DumpRenderTree via explicit testing path
​https://bugs.webkit.org/show_bug.cgi?id=109634

Reviewed by Adrienne Walker.

Source/Platform:

  • chromium/public/WebUnitTestSupport.h:

Tools:

  • DumpRenderTree/chromium/WebViewHost.cpp:

(WebViewHost::createOutputSurface):
(WebViewHost::initializeLayerTreeView):

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/Platform/ChangeLog

    r143496 r143547  
     12013-02-14  James Robinson  <jamesr@chromium.org>
     2
     3        [chromium] Request WebLayerTreeView for DumpRenderTree via explicit testing path
     4        https://bugs.webkit.org/show_bug.cgi?id=109634
     5
     6        Reviewed by Adrienne Walker.
     7
     8        * chromium/public/WebUnitTestSupport.h:
     9
    1102013-02-20  Mark Pilgrim  <pilgrim@chromium.org>
    211

  • trunk/Source/Platform/chromium/public/WebUnitTestSupport.h

    r142860 r143547  
    3333
    3434class WebLayerTreeView;
     35class WebLayerTreeViewClient;
    3536class WebURL;
    3637class WebURLResponse;
    … …  
    5657
    5758    // Constructs a WebLayerTreeView set up with reasonable defaults for
    58     // testing. A LayerTreeTypeUnitTest view can initialize and perform most
    59     // operations, but is not capable of rendering pixels. A
    60     // LayerTreeTypeLayoutTest view can render.
     59    // testing.
    6160
     61    virtual WebLayerTreeView* createLayerTreeViewForTesting() { return 0; }
     62
     63    // DEPRECATED, use the version above.
    6264#define HAVE_CREATELAYERTREEVIEWFORTESTING 1
    6365    enum TestViewType {
    … …  
    6567        TestViewTypeLayoutTest
    6668    };
    67     virtual WebLayerTreeView* createLayerTreeViewForTesting(TestViewType type) { return 0; }
     69    virtual WebLayerTreeView* createLayerTreeViewForTesting(TestViewType) { return 0; }
    6870};
    6971

  • trunk/Tools/ChangeLog

    r143532 r143547  
     12013-02-14  James Robinson  <jamesr@chromium.org>
     2
     3        [chromium] Request WebLayerTreeView for DumpRenderTree via explicit testing path
     4        https://bugs.webkit.org/show_bug.cgi?id=109634
     5
     6        Reviewed by Adrienne Walker.
     7
     8        * DumpRenderTree/chromium/WebViewHost.cpp:
     9        (WebViewHost::createOutputSurface):
     10        (WebViewHost::initializeLayerTreeView):
     11
    1122013-02-20  Martin Robinson  <mrobinson@igalia.com>
    213

  • trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp

    r143480 r143547  
    122122}
    123123
    124 WebCompositorOutputSurface* WebViewHost::createOutputSurface()
    125 {
    126     if (!webView())
    127         return 0;
    128 
    129     if (m_shell->softwareCompositingEnabled())
    130         return WebKit::Platform::current()->compositorSupport()->createOutputSurfaceForSoftware();
    131 
    132     WebGraphicsContext3D* context = webkit_support::CreateGraphicsContext3D(WebGraphicsContext3D::Attributes(), webView());
    133     return WebKit::Platform::current()->compositorSupport()->createOutputSurfaceFor3D(context);
    134 }
    135 
    136124void WebViewHost::didAddMessageToConsole(const WebConsoleMessage& message, const WebString& sourceName, unsigned sourceLine)
    137125{
    … …  
    277265void WebViewHost::initializeLayerTreeView(WebLayerTreeViewClient* client, const WebLayer& rootLayer, const WebLayerTreeView::Settings& settings)
    278266{
    279     m_layerTreeView = adoptPtr(Platform::current()->compositorSupport()->createLayerTreeView(client, rootLayer, settings));
    280     if (m_layerTreeView)
    281         m_layerTreeView->setSurfaceReady();
     267    if (m_shell->softwareCompositingEnabled())
     268        m_layerTreeView = adoptPtr(webkit_support::CreateLayerTreeViewSoftware(client));
     269    else
     270        m_layerTreeView = adoptPtr(webkit_support::CreateLayerTreeView3d(client));
     271
     272    ASSERT(m_layerTreeView);
     273    m_layerTreeView->setRootLayer(rootLayer);
     274    m_layerTreeView->setSurfaceReady();
    282275}
    283276

  • trunk/Tools/DumpRenderTree/chromium/WebViewHost.h

    r143480 r143547  
    133133    virtual WebKit::WebWidget* createPopupMenu(const WebKit::WebPopupMenuInfo&);
    134134    virtual WebKit::WebStorageNamespace* createSessionStorageNamespace(unsigned quota);
    135     virtual WebKit::WebCompositorOutputSurface* createOutputSurface();
    136135    virtual void didAddMessageToConsole(const WebKit::WebConsoleMessage&, const WebKit::WebString& sourceName, unsigned sourceLine);
    137136    virtual void didStartLoading();
Note: See TracChangeset for help on using the changeset viewer.