summaryrefslogtreecommitdiffstats
path: root/cc/layer_unittest.cc
diff options
context:
space:
mode:
authorjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-30 22:59:56 +0000
committerjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-30 22:59:56 +0000
commite5e9c02081e6b37f49febeba87863a1dac598949 (patch)
tree3e2c4fcd2926cc064fd7937e3cdee49e9ef62fd6 /cc/layer_unittest.cc
parent760d9886b9d56182f6c91944e06f250df6677d33 (diff)
downloadchromium_src-e5e9c02081e6b37f49febeba87863a1dac598949.zip
chromium_src-e5e9c02081e6b37f49febeba87863a1dac598949.tar.gz
chromium_src-e5e9c02081e6b37f49febeba87863a1dac598949.tar.bz2
Remove WebKit::Platform dependencies from cc
This removes all dependencies on the static WebKit::Platform pointer from cc. The biggest change is implementing cc::Thread on top of base::MessageLoopProxy instead of WebKit::WebThread. For the main thread cc::Thread simply binds to the current thread's MessageLoopProxy. For the impl thread, the bindings layer (specifically webkit/compositor_bindings/web_compositor_impl) extracts the MessageLoopProxy out of the passed in WebThread. BUG=144539 Review URL: https://codereview.chromium.org/11344004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165050 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/layer_unittest.cc')
-rw-r--r--cc/layer_unittest.cc10
1 files changed, 0 insertions, 10 deletions
diff --git a/cc/layer_unittest.cc b/cc/layer_unittest.cc
index 60a0539..33f37e7 100644
--- a/cc/layer_unittest.cc
+++ b/cc/layer_unittest.cc
@@ -15,7 +15,6 @@
#include "cc/test/fake_layer_tree_host_client.h"
#include "cc/test/geometry_test_utils.h"
#include "cc/test/test_common.h"
-#include "cc/test/web_compositor_initializer.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include <public/WebTransformationMatrix.h>
@@ -59,7 +58,6 @@ public:
class LayerTest : public testing::Test {
public:
LayerTest()
- : m_compositorInitializer(0)
{
}
@@ -135,7 +133,6 @@ protected:
scoped_ptr<MockLayerImplTreeHost> m_layerTreeHost;
scoped_refptr<Layer> m_parent, m_child1, m_child2, m_child3, m_grandChild1, m_grandChild2, m_grandChild3;
- WebCompositorInitializer m_compositorInitializer;
};
TEST_F(LayerTest, basicCreateAndDestroy)
@@ -638,7 +635,6 @@ void assertLayerTreeHostMatchesForSubtree(Layer* layer, LayerTreeHost* host)
TEST(LayerLayerTreeHostTest, enteringTree)
{
- WebCompositorInitializer compositorInitializer(0);
scoped_refptr<Layer> parent = Layer::create();
scoped_refptr<Layer> child = Layer::create();
scoped_refptr<Layer> mask = Layer::create();
@@ -667,7 +663,6 @@ TEST(LayerLayerTreeHostTest, enteringTree)
TEST(LayerLayerTreeHostTest, addingLayerSubtree)
{
- WebCompositorInitializer compositorInitializer(0);
scoped_refptr<Layer> parent = Layer::create();
scoped_ptr<FakeLayerImplTreeHost> layerTreeHost(FakeLayerImplTreeHost::create());
@@ -696,7 +691,6 @@ TEST(LayerLayerTreeHostTest, addingLayerSubtree)
TEST(LayerLayerTreeHostTest, changeHost)
{
- WebCompositorInitializer compositorInitializer(0);
scoped_refptr<Layer> parent = Layer::create();
scoped_refptr<Layer> child = Layer::create();
scoped_refptr<Layer> mask = Layer::create();
@@ -726,7 +720,6 @@ TEST(LayerLayerTreeHostTest, changeHost)
TEST(LayerLayerTreeHostTest, changeHostInSubtree)
{
- WebCompositorInitializer compositorInitializer(0);
scoped_refptr<Layer> firstParent = Layer::create();
scoped_refptr<Layer> firstChild = Layer::create();
scoped_refptr<Layer> secondParent = Layer::create();
@@ -760,7 +753,6 @@ TEST(LayerLayerTreeHostTest, changeHostInSubtree)
TEST(LayerLayerTreeHostTest, replaceMaskAndReplicaLayer)
{
- WebCompositorInitializer compositorInitializer(0);
scoped_refptr<Layer> parent = Layer::create();
scoped_refptr<Layer> mask = Layer::create();
scoped_refptr<Layer> replica = Layer::create();
@@ -795,7 +787,6 @@ TEST(LayerLayerTreeHostTest, replaceMaskAndReplicaLayer)
TEST(LayerLayerTreeHostTest, destroyHostWithNonNullRootLayer)
{
- WebCompositorInitializer compositorInitializer(0);
scoped_refptr<Layer> root = Layer::create();
scoped_refptr<Layer> child = Layer::create();
root->addChild(child);
@@ -823,7 +814,6 @@ TEST(LayerLayerTreeHostTest, shouldNotAddAnimationWithoutLayerTreeHost)
ScopedSettings scopedSettings;
Settings::setAcceleratedAnimationEnabled(true);
- WebCompositorInitializer compositorInitializer(0);
scoped_refptr<Layer> layer = Layer::create();
// Case 1: without a layerTreeHost, the animation should not be accepted.