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
+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
// 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; }
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() { }
};
namespace WebKit {
-class WebLayerTreeView;
class WebURL;
class WebURLResponse;
struct WebURLError;
// 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; }
};
}
+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
#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;
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));
}
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()