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):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@142569 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/Platform/ChangeLog b/Source/Platform/ChangeLog
index 8c58ca5b83355aa62d6589a447f6e65930ac742e..e7e345496f1ba4840576655964f474eaa5739412 100644 (file)
--- a/Source/Platform/ChangeLog
+++ b/Source/Platform/ChangeLog
@@ -1,3 +1,17 @@
+2013-02-11  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        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).
+
+        * chromium/public/WebCompositorSupport.h:
+        (WebCompositorSupport):
+        (WebKit::WebCompositorSupport::createLayerTreeView):
+        * chromium/public/WebUnitTestSupport.h:
+
 2013-02-11  James Robinson  <jamesr@chromium.org>
 
         [chromium] Add WebUnitTestSupport::createLayerTreeViewForTesting for webkit_unit_tests

diff --git a/Source/Platform/chromium/public/WebCompositorSupport.h b/Source/Platform/chromium/public/WebCompositorSupport.h
index fecc491d84382118dcaf960d94bea6d7bb99c8d9..5c7f7330a7eafa01795b0b94d09a7d266fd4ebca 100644 (file)
--- a/Source/Platform/chromium/public/WebCompositorSupport.h
+++ b/Source/Platform/chromium/public/WebCompositorSupport.h
@@ -69,6 +69,9 @@ public:
     // after shutdown.
     virtual void shutdown() { }
 
+    // May return 0 if initialization fails.
+    virtual WebLayerTreeView* createLayerTreeView(WebLayerTreeViewClient*, const WebLayer& root, const WebLayerTreeView::Settings&) { return 0; }
+
     // Creates an output surface for the compositor backed by a 3d context.
     virtual WebCompositorOutputSurface* createOutputSurfaceFor3D(WebKit::WebGraphicsContext3D*) { return 0; }
 
@@ -104,13 +107,6 @@ public:
 
     virtual WebTransformOperations* createTransformOperations() { return 0; }
 
-
-    // Testing ------------------------------------------------------
-
-    // DEPRECATED
-    // May return 0 if initialization fails.
-    virtual WebLayerTreeView* createLayerTreeView(WebLayerTreeViewClient*, const WebLayer& root, const WebLayerTreeView::Settings&) { return 0; }
-
 protected:
     virtual ~WebCompositorSupport() { }
 };

diff --git a/Source/Platform/chromium/public/WebUnitTestSupport.h b/Source/Platform/chromium/public/WebUnitTestSupport.h
index bb00bda09a746f6a34c1c9d79e1f7894786529da..9a9e3ecf1e162820043c4f06ad5e0f7f55d74efc 100644 (file)
--- a/Source/Platform/chromium/public/WebUnitTestSupport.h
+++ b/Source/Platform/chromium/public/WebUnitTestSupport.h
@@ -31,7 +31,6 @@
 
 namespace WebKit {
 
-class WebLayerTreeView;
 class WebURL;
 class WebURLResponse;
 struct WebURLError;
@@ -53,18 +52,6 @@ public:
 
     // Returns the root directory of the WebKit code.
     virtual WebString webKitRootDir() { return WebString(); }
-
-    // Constructs a WebLayerTreeView set up with reasonable defaults for
-    // testing. A LayerTreeTypeUnitTest view can initialize and perform most
-    // operations, but is not capable of rendering pixels. A
-    // LayerTreeTypeLayoutTest view can render.
-
-#define HAVE_CREATELAYERTREEVIEWFORTESTING 1
-    enum TestViewType {
-        TestViewTypeUnitTest,
-        TestViewTypeLayoutTest
-    };
-    virtual WebLayerTreeView* createLayerTreeViewForTesting(TestViewType type) { return 0; }
 };
 
 }

diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index 3de6f35c632cad1ca043f0cb64e9af5f7284edb5..2ef65f9c73cf15b362d39caee56bb5db720bc82b 100644 (file)
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,17 @@
+2013-02-11  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        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).
+
+        * tests/GraphicsLayerChromiumTest.cpp:
+        (WebKit::GraphicsLayerChromiumTest::GraphicsLayerChromiumTest):
+        * tests/ScrollingCoordinatorChromiumTest.cpp:
+        (WebKit::FakeWebViewClient::initializeLayerTreeView):
+
 2013-02-11  James Robinson  <jamesr@chromium.org>
 
         [chromium] Add WebUnitTestSupport::createLayerTreeViewForTesting for webkit_unit_tests

diff --git a/Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp b/Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp
index b16e72d6c85db7cc103adb3191c55cc53cef7ca0..44af5f5fd3733ca38e5a6b91e1c009fc9081cf60 100644 (file)
--- a/Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp
+++ b/Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp
@@ -35,11 +35,11 @@
 #include "WebLayerTreeViewTestCommon.h"
 #include <gtest/gtest.h>
 #include <public/Platform.h>
+#include <public/WebCompositorSupport.h>
 #include <public/WebFloatAnimationCurve.h>
 #include <public/WebGraphicsContext3D.h>
 #include <public/WebLayerTreeView.h>
 #include <public/WebTransformationMatrix.h>
-#include <public/WebUnitTestSupport.h>
 #include <wtf/PassOwnPtr.h>
 
 using namespace WebCore;
@@ -62,9 +62,7 @@ public:
         Platform::current()->compositorSupport()->initialize(0);
         m_graphicsLayer = adoptPtr(new GraphicsLayerChromium(&m_client));
         m_platformLayer = m_graphicsLayer->platformLayer();
-        m_layerTreeView = adoptPtr(Platform::current()->unitTestSupport()->createLayerTreeViewForTesting(WebUnitTestSupport::TestViewTypeUnitTest));
-        ASSERT_TRUE(m_layerTreeView);
-        m_layerTreeView->setRootLayer(*m_platformLayer);
+        m_layerTreeView = adoptPtr(Platform::current()->compositorSupport()->createLayerTreeView(&m_layerTreeViewClient, *m_platformLayer, WebLayerTreeView::Settings()));
         m_layerTreeView->setViewportSize(WebSize(1, 1), WebSize(1, 1));
     }
 

diff --git a/Source/WebKit/chromium/tests/ScrollingCoordinatorChromiumTest.cpp b/Source/WebKit/chromium/tests/ScrollingCoordinatorChromiumTest.cpp
index 2667cb5666932f16716f2dfbf7beb91f87664155..bc6914feb2ce76daf425769f4c9acc117e638458 100644 (file)
--- a/Source/WebKit/chromium/tests/ScrollingCoordinatorChromiumTest.cpp
+++ b/Source/WebKit/chromium/tests/ScrollingCoordinatorChromiumTest.cpp
@@ -59,9 +59,8 @@ public:
 
     virtual void initializeLayerTreeView(WebLayerTreeViewClient* client, const WebLayer& rootLayer, const WebLayerTreeView::Settings& settings)
     {
-        m_layerTreeView = adoptPtr(Platform::current()->unitTestSupport()->createLayerTreeViewForTesting(WebUnitTestSupport::TestViewTypeUnitTest));
+        m_layerTreeView = adoptPtr(Platform::current()->compositorSupport()->createLayerTreeView(client, rootLayer, settings));
         ASSERT(m_layerTreeView);
-        m_layerTreeView->setRootLayer(rootLayer);
     }
 
     virtual WebLayerTreeView* layerTreeView()