diff options
author | jbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-22 23:05:57 +0000 |
---|---|---|
committer | jbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-22 23:05:57 +0000 |
commit | a7f3568e1e8421fd6a489a87894e779eeec03dfa (patch) | |
tree | 4d1f5d044121edb0d264db1c29dee4a6fc840eba /cc/layers | |
parent | e936b9ef160643c4272f44562ef743cfe01c1854 (diff) | |
download | chromium_src-a7f3568e1e8421fd6a489a87894e779eeec03dfa.zip chromium_src-a7f3568e1e8421fd6a489a87894e779eeec03dfa.tar.gz chromium_src-a7f3568e1e8421fd6a489a87894e779eeec03dfa.tar.bz2 |
Add delegated rendering support for software renderer.
This patch adds support to cc/ for delegated rendering with a software compositor. A new SharedBitmapManager is added, which will create SharedBitmaps with unique IDs in shared memory. These can be filled in the child, and their IDs can be sent to the browser so it can map them and draw from them.
No implementations of the SharedBitmapManager are added in this patch, so delegated rendering support won't work in practice yet, and it will fall back to not allocating anything in shared memory.
BUG=
Review URL: https://codereview.chromium.org/24632004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230245 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/layers')
-rw-r--r-- | cc/layers/layer_unittest.cc | 7 | ||||
-rw-r--r-- | cc/layers/nine_patch_layer_unittest.cc | 2 | ||||
-rw-r--r-- | cc/layers/scrollbar_layer_unittest.cc | 2 | ||||
-rw-r--r-- | cc/layers/texture_layer_unittest.cc | 2 | ||||
-rw-r--r-- | cc/layers/tiled_layer_unittest.cc | 3 | ||||
-rw-r--r-- | cc/layers/ui_resource_layer_unittest.cc | 2 |
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); } }; |