Changeset 142569 in webkit


Ignore:
Timestamp:
Feb 11, 2013 8:17:40 PM (11 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r142568.
http://trac.webkit.org/changeset/142568
https://bugs.webkit.org/show_bug.cgi?id=109541

Broke the build, won't compile. (Requested by alancutter on
#webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2013-02-11

Source/Platform:

  • chromium/public/WebCompositorSupport.h:

(WebCompositorSupport):
(WebKit::WebCompositorSupport::createLayerTreeView):

  • chromium/public/WebUnitTestSupport.h:

Source/WebKit/chromium:

  • tests/GraphicsLayerChromiumTest.cpp:

(WebKit::GraphicsLayerChromiumTest::GraphicsLayerChromiumTest):

  • tests/ScrollingCoordinatorChromiumTest.cpp:

(WebKit::FakeWebViewClient::initializeLayerTreeView):

Location:
trunk/Source
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/Platform/ChangeLog

    r142568 r142569  
     12013-02-11  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r142568.
     4        http://trac.webkit.org/changeset/142568
     5        https://bugs.webkit.org/show_bug.cgi?id=109541
     6
     7        Broke the build, won't compile. (Requested by alancutter on
     8        #webkit).
     9
     10        * chromium/public/WebCompositorSupport.h:
     11        (WebCompositorSupport):
     12        (WebKit::WebCompositorSupport::createLayerTreeView):
     13        * chromium/public/WebUnitTestSupport.h:
     14
    1152013-02-11  James Robinson  <jamesr@chromium.org>
    216
  • trunk/Source/Platform/chromium/public/WebCompositorSupport.h

    r142568 r142569  
    7070    virtual void shutdown() { }
    7171
     72    // May return 0 if initialization fails.
     73    virtual WebLayerTreeView* createLayerTreeView(WebLayerTreeViewClient*, const WebLayer& root, const WebLayerTreeView::Settings&) { return 0; }
     74
    7275    // Creates an output surface for the compositor backed by a 3d context.
    7376    virtual WebCompositorOutputSurface* createOutputSurfaceFor3D(WebKit::WebGraphicsContext3D*) { return 0; }
     
    105108    virtual WebTransformOperations* createTransformOperations() { return 0; }
    106109
    107 
    108     // Testing ------------------------------------------------------
    109 
    110     // DEPRECATED
    111     // May return 0 if initialization fails.
    112     virtual WebLayerTreeView* createLayerTreeView(WebLayerTreeViewClient*, const WebLayer& root, const WebLayerTreeView::Settings&) { return 0; }
    113 
    114110protected:
    115111    virtual ~WebCompositorSupport() { }
  • trunk/Source/Platform/chromium/public/WebUnitTestSupport.h

    r142568 r142569  
    3232namespace WebKit {
    3333
    34 class WebLayerTreeView;
    3534class WebURL;
    3635class WebURLResponse;
     
    5453    // Returns the root directory of the WebKit code.
    5554    virtual WebString webKitRootDir() { return WebString(); }
    56 
    57     // 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.
    61 
    62 #define HAVE_CREATELAYERTREEVIEWFORTESTING 1
    63     enum TestViewType {
    64         TestViewTypeUnitTest,
    65         TestViewTypeLayoutTest
    66     };
    67     virtual WebLayerTreeView* createLayerTreeViewForTesting(TestViewType type) { return 0; }
    6855};
    6956
  • trunk/Source/WebKit/chromium/ChangeLog

    r142568 r142569  
     12013-02-11  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r142568.
     4        http://trac.webkit.org/changeset/142568
     5        https://bugs.webkit.org/show_bug.cgi?id=109541
     6
     7        Broke the build, won't compile. (Requested by alancutter on
     8        #webkit).
     9
     10        * tests/GraphicsLayerChromiumTest.cpp:
     11        (WebKit::GraphicsLayerChromiumTest::GraphicsLayerChromiumTest):
     12        * tests/ScrollingCoordinatorChromiumTest.cpp:
     13        (WebKit::FakeWebViewClient::initializeLayerTreeView):
     14
    1152013-02-11  James Robinson  <jamesr@chromium.org>
    216
  • trunk/Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp

    r142568 r142569  
    3636#include <gtest/gtest.h>
    3737#include <public/Platform.h>
     38#include <public/WebCompositorSupport.h>
    3839#include <public/WebFloatAnimationCurve.h>
    3940#include <public/WebGraphicsContext3D.h>
    4041#include <public/WebLayerTreeView.h>
    4142#include <public/WebTransformationMatrix.h>
    42 #include <public/WebUnitTestSupport.h>
    4343#include <wtf/PassOwnPtr.h>
    4444
     
    6363        m_graphicsLayer = adoptPtr(new GraphicsLayerChromium(&m_client));
    6464        m_platformLayer = m_graphicsLayer->platformLayer();
    65         m_layerTreeView = adoptPtr(Platform::current()->unitTestSupport()->createLayerTreeViewForTesting(WebUnitTestSupport::TestViewTypeUnitTest));
    66         ASSERT_TRUE(m_layerTreeView);
    67         m_layerTreeView->setRootLayer(*m_platformLayer);
     65        m_layerTreeView = adoptPtr(Platform::current()->compositorSupport()->createLayerTreeView(&m_layerTreeViewClient, *m_platformLayer, WebLayerTreeView::Settings()));
    6866        m_layerTreeView->setViewportSize(WebSize(1, 1), WebSize(1, 1));
    6967    }
  • trunk/Source/WebKit/chromium/tests/ScrollingCoordinatorChromiumTest.cpp

    r142568 r142569  
    6060    virtual void initializeLayerTreeView(WebLayerTreeViewClient* client, const WebLayer& rootLayer, const WebLayerTreeView::Settings& settings)
    6161    {
    62         m_layerTreeView = adoptPtr(Platform::current()->unitTestSupport()->createLayerTreeViewForTesting(WebUnitTestSupport::TestViewTypeUnitTest));
     62        m_layerTreeView = adoptPtr(Platform::current()->compositorSupport()->createLayerTreeView(client, rootLayer, settings));
    6363        ASSERT(m_layerTreeView);
    64         m_layerTreeView->setRootLayer(rootLayer);
    6564    }
    6665
Note: See TracChangeset for help on using the changeset viewer.