summaryrefslogtreecommitdiffstats
path: root/cc/layers
diff options
context:
space:
mode:
Diffstat (limited to 'cc/layers')
-rw-r--r--cc/layers/layer_unittest.cc7
-rw-r--r--cc/layers/nine_patch_layer_unittest.cc2
-rw-r--r--cc/layers/scrollbar_layer_unittest.cc2
-rw-r--r--cc/layers/texture_layer_unittest.cc2
-rw-r--r--cc/layers/tiled_layer_unittest.cc3
-rw-r--r--cc/layers/ui_resource_layer_unittest.cc2
6 files changed, 10 insertions, 8 deletions
diff --git a/cc/layers/layer_unittest.cc b/cc/layers/layer_unittest.cc
index 3a7a1c1..c66eb85 100644
--- a/cc/layers/layer_unittest.cc
+++ b/cc/layers/layer_unittest.cc
@@ -39,7 +39,7 @@ namespace {
class MockLayerTreeHost : public LayerTreeHost {
public:
explicit MockLayerTreeHost(LayerTreeHostClient* client)
- : LayerTreeHost(client, LayerTreeSettings()) {
+ : LayerTreeHost(client, NULL, LayerTreeSettings()) {
Initialize(NULL);
}
@@ -803,11 +803,12 @@ class LayerTreeHostFactory {
: client_(FakeLayerTreeHostClient::DIRECT_3D) {}
scoped_ptr<LayerTreeHost> Create() {
- return LayerTreeHost::Create(&client_, LayerTreeSettings(), NULL).Pass();
+ return LayerTreeHost::Create(&client_, NULL, LayerTreeSettings(), NULL)
+ .Pass();
}
scoped_ptr<LayerTreeHost> Create(LayerTreeSettings settings) {
- return LayerTreeHost::Create(&client_, settings, NULL).Pass();
+ return LayerTreeHost::Create(&client_, NULL, settings, NULL).Pass();
}
private:
diff --git a/cc/layers/nine_patch_layer_unittest.cc b/cc/layers/nine_patch_layer_unittest.cc
index f616560..7213a51 100644
--- a/cc/layers/nine_patch_layer_unittest.cc
+++ b/cc/layers/nine_patch_layer_unittest.cc
@@ -32,7 +32,7 @@ namespace {
class MockLayerTreeHost : public LayerTreeHost {
public:
explicit MockLayerTreeHost(LayerTreeHostClient* client)
- : LayerTreeHost(client, LayerTreeSettings()) {
+ : LayerTreeHost(client, NULL, LayerTreeSettings()) {
Initialize(NULL);
}
};
diff --git a/cc/layers/scrollbar_layer_unittest.cc b/cc/layers/scrollbar_layer_unittest.cc
index 250d610..0423cdc 100644
--- a/cc/layers/scrollbar_layer_unittest.cc
+++ b/cc/layers/scrollbar_layer_unittest.cc
@@ -514,7 +514,7 @@ class MockLayerTreeHost : public LayerTreeHost {
public:
MockLayerTreeHost(LayerTreeHostClient* client,
const LayerTreeSettings& settings)
- : LayerTreeHost(client, settings),
+ : LayerTreeHost(client, NULL, settings),
next_id_(1),
total_ui_resource_created_(0),
total_ui_resource_deleted_(0) {
diff --git a/cc/layers/texture_layer_unittest.cc b/cc/layers/texture_layer_unittest.cc
index bdb1358..c576341 100644
--- a/cc/layers/texture_layer_unittest.cc
+++ b/cc/layers/texture_layer_unittest.cc
@@ -44,7 +44,7 @@ namespace {
class MockLayerTreeHost : public LayerTreeHost {
public:
explicit MockLayerTreeHost(LayerTreeHostClient* client)
- : LayerTreeHost(client, LayerTreeSettings()) {
+ : LayerTreeHost(client, NULL, LayerTreeSettings()) {
Initialize(NULL);
}
diff --git a/cc/layers/tiled_layer_unittest.cc b/cc/layers/tiled_layer_unittest.cc
index 47d694b..9bdb907 100644
--- a/cc/layers/tiled_layer_unittest.cc
+++ b/cc/layers/tiled_layer_unittest.cc
@@ -60,6 +60,7 @@ class TiledLayerTest : public testing::Test {
virtual void SetUp() {
impl_thread_.Start();
layer_tree_host_ = LayerTreeHost::Create(&fake_layer_tree_host_client_,
+ NULL,
settings_,
impl_thread_.message_loop_proxy());
proxy_ = layer_tree_host_->proxy();
@@ -73,7 +74,7 @@ class TiledLayerTest : public testing::Test {
DebugScopedSetImplThreadAndMainThreadBlocked
impl_thread_and_main_thread_blocked(proxy_);
resource_provider_ =
- ResourceProvider::Create(output_surface_.get(), 0, false);
+ ResourceProvider::Create(output_surface_.get(), NULL, 0, false);
host_impl_ = make_scoped_ptr(new FakeLayerTreeHostImpl(proxy_));
}
diff --git a/cc/layers/ui_resource_layer_unittest.cc b/cc/layers/ui_resource_layer_unittest.cc
index 1720b81..a2c75c1 100644
--- a/cc/layers/ui_resource_layer_unittest.cc
+++ b/cc/layers/ui_resource_layer_unittest.cc
@@ -32,7 +32,7 @@ namespace {
class MockLayerTreeHost : public LayerTreeHost {
public:
explicit MockLayerTreeHost(LayerTreeHostClient* client)
- : LayerTreeHost(client, LayerTreeSettings()) {
+ : LayerTreeHost(client, NULL, LayerTreeSettings()) {
Initialize(NULL);
}
};