diff options
author | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-07 20:31:45 +0000 |
---|---|---|
committer | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-07 20:31:45 +0000 |
commit | 586d51edafeeed9705656ac871fcd3d7653e4456 (patch) | |
tree | 7eab0309c1bca3a7a22f45540504acc962f503d7 /cc/test/tiled_layer_test_common.cc | |
parent | 59ba87e3cb9b408e9c0f33e9b5ebdcd5aaf959a1 (diff) | |
download | chromium_src-586d51edafeeed9705656ac871fcd3d7653e4456.zip chromium_src-586d51edafeeed9705656ac871fcd3d7653e4456.tar.gz chromium_src-586d51edafeeed9705656ac871fcd3d7653e4456.tar.bz2 |
cc: Pass LayerTreeHostImpl to LayerImpl constructor
In order to allow for LayerImpl to notify its host when one of its property
changes, it needs to more robustly have its host set (which is not the case in
most tests). To avoid a recursive pass when adding children or after layer
synchronization, instead just pass it to the constructor of LayerImpl, since a
given LayerImpl will never move from one host to another.
NOTRY=true
BUG=none
Review URL: https://chromiumcodereview.appspot.com/11472021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171830 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test/tiled_layer_test_common.cc')
-rw-r--r-- | cc/test/tiled_layer_test_common.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cc/test/tiled_layer_test_common.cc b/cc/test/tiled_layer_test_common.cc index 2279fe4..0d52ad0 100644 --- a/cc/test/tiled_layer_test_common.cc +++ b/cc/test/tiled_layer_test_common.cc @@ -13,7 +13,7 @@ using cc::RenderingStats; using cc::ResourceUpdate; using cc::ResourceUpdateQueue; -namespace WebKitTests { +namespace cc { FakeLayerUpdater::Resource::Resource(FakeLayerUpdater* layer, scoped_ptr<PrioritizedResource> texture) : LayerUpdater::Resource(texture.Pass()) @@ -73,8 +73,8 @@ scoped_ptr<LayerUpdater::Resource> FakeLayerUpdater::createResource(PrioritizedR return scoped_ptr<LayerUpdater::Resource>(new Resource(this, PrioritizedResource::create(manager))); } -FakeTiledLayerImpl::FakeTiledLayerImpl(int id) - : TiledLayerImpl(id) +FakeTiledLayerImpl::FakeTiledLayerImpl(LayerTreeHostImpl* hostImpl, int id) + : TiledLayerImpl(hostImpl, id) { } |