Changeset 142569 in webkit
- Timestamp:
- Feb 11, 2013 8:17:40 PM (11 years ago)
- Location:
- trunk/Source
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/Platform/ChangeLog
r142568 r142569 1 2013-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 1 15 2013-02-11 James Robinson <jamesr@chromium.org> 2 16 -
trunk/Source/Platform/chromium/public/WebCompositorSupport.h
r142568 r142569 70 70 virtual void shutdown() { } 71 71 72 // May return 0 if initialization fails. 73 virtual WebLayerTreeView* createLayerTreeView(WebLayerTreeViewClient*, const WebLayer& root, const WebLayerTreeView::Settings&) { return 0; } 74 72 75 // Creates an output surface for the compositor backed by a 3d context. 73 76 virtual WebCompositorOutputSurface* createOutputSurfaceFor3D(WebKit::WebGraphicsContext3D*) { return 0; } … … 105 108 virtual WebTransformOperations* createTransformOperations() { return 0; } 106 109 107 108 // Testing ------------------------------------------------------109 110 // DEPRECATED111 // May return 0 if initialization fails.112 virtual WebLayerTreeView* createLayerTreeView(WebLayerTreeViewClient*, const WebLayer& root, const WebLayerTreeView::Settings&) { return 0; }113 114 110 protected: 115 111 virtual ~WebCompositorSupport() { } -
trunk/Source/Platform/chromium/public/WebUnitTestSupport.h
r142568 r142569 32 32 namespace WebKit { 33 33 34 class WebLayerTreeView;35 34 class WebURL; 36 35 class WebURLResponse; … … 54 53 // Returns the root directory of the WebKit code. 55 54 virtual WebString webKitRootDir() { return WebString(); } 56 57 // Constructs a WebLayerTreeView set up with reasonable defaults for58 // testing. A LayerTreeTypeUnitTest view can initialize and perform most59 // operations, but is not capable of rendering pixels. A60 // LayerTreeTypeLayoutTest view can render.61 62 #define HAVE_CREATELAYERTREEVIEWFORTESTING 163 enum TestViewType {64 TestViewTypeUnitTest,65 TestViewTypeLayoutTest66 };67 virtual WebLayerTreeView* createLayerTreeViewForTesting(TestViewType type) { return 0; }68 55 }; 69 56 -
trunk/Source/WebKit/chromium/ChangeLog
r142568 r142569 1 2013-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 1 15 2013-02-11 James Robinson <jamesr@chromium.org> 2 16 -
trunk/Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp
r142568 r142569 36 36 #include <gtest/gtest.h> 37 37 #include <public/Platform.h> 38 #include <public/WebCompositorSupport.h> 38 39 #include <public/WebFloatAnimationCurve.h> 39 40 #include <public/WebGraphicsContext3D.h> 40 41 #include <public/WebLayerTreeView.h> 41 42 #include <public/WebTransformationMatrix.h> 42 #include <public/WebUnitTestSupport.h>43 43 #include <wtf/PassOwnPtr.h> 44 44 … … 63 63 m_graphicsLayer = adoptPtr(new GraphicsLayerChromium(&m_client)); 64 64 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())); 68 66 m_layerTreeView->setViewportSize(WebSize(1, 1), WebSize(1, 1)); 69 67 } -
trunk/Source/WebKit/chromium/tests/ScrollingCoordinatorChromiumTest.cpp
r142568 r142569 60 60 virtual void initializeLayerTreeView(WebLayerTreeViewClient* client, const WebLayer& rootLayer, const WebLayerTreeView::Settings& settings) 61 61 { 62 m_layerTreeView = adoptPtr(Platform::current()-> unitTestSupport()->createLayerTreeViewForTesting(WebUnitTestSupport::TestViewTypeUnitTest));62 m_layerTreeView = adoptPtr(Platform::current()->compositorSupport()->createLayerTreeView(client, rootLayer, settings)); 63 63 ASSERT(m_layerTreeView); 64 m_layerTreeView->setRootLayer(rootLayer);65 64 } 66 65
Note: See TracChangeset
for help on using the changeset viewer.