diff options
Diffstat (limited to 'cc/test')
| -rw-r--r-- | cc/test/fake_layer_tree_host.cc | 2 | ||||
| -rw-r--r-- | cc/test/fake_picture_layer_impl.cc | 29 | ||||
| -rw-r--r-- | cc/test/fake_picture_layer_impl.h | 5 |
3 files changed, 7 insertions, 29 deletions
diff --git a/cc/test/fake_layer_tree_host.cc b/cc/test/fake_layer_tree_host.cc index 8d2a0f2..5125a7b 100644 --- a/cc/test/fake_layer_tree_host.cc +++ b/cc/test/fake_layer_tree_host.cc @@ -91,6 +91,7 @@ LayerImpl* FakeLayerTreeHost::CommitAndCreateLayerImplTree() { TreeSynchronizer::PushProperties(root_layer(), layer_impl.get()); active_tree()->SetRootLayer(std::move(layer_impl)); + active_tree()->UpdatePropertyTreeScrollOffset(property_trees()); if (page_scale_layer() && inner_viewport_scroll_layer()) { active_tree()->SetViewportLayersFromIds( @@ -114,6 +115,7 @@ LayerImpl* FakeLayerTreeHost::CommitAndCreatePendingTree() { TreeSynchronizer::PushProperties(root_layer(), layer_impl.get()); pending_tree()->SetRootLayer(std::move(layer_impl)); + pending_tree()->UpdatePropertyTreeScrollOffset(property_trees()); return pending_tree()->root_layer(); } diff --git a/cc/test/fake_picture_layer_impl.cc b/cc/test/fake_picture_layer_impl.cc index 225ee64..cffed1c 100644 --- a/cc/test/fake_picture_layer_impl.cc +++ b/cc/test/fake_picture_layer_impl.cc @@ -17,10 +17,7 @@ FakePictureLayerImpl::FakePictureLayerImpl( int id, scoped_refptr<DisplayListRasterSource> raster_source, bool is_mask) - : PictureLayerImpl(tree_impl, - id, - is_mask, - new LayerImpl::SyncedScrollOffset), + : PictureLayerImpl(tree_impl, id, is_mask), append_quads_count_(0), did_become_active_call_count_(0), has_valid_tile_priorities_(false), @@ -36,10 +33,7 @@ FakePictureLayerImpl::FakePictureLayerImpl( scoped_refptr<DisplayListRasterSource> raster_source, bool is_mask, const gfx::Size& layer_bounds) - : PictureLayerImpl(tree_impl, - id, - is_mask, - new LayerImpl::SyncedScrollOffset), + : PictureLayerImpl(tree_impl, id, is_mask), append_quads_count_(0), did_become_active_call_count_(0), has_valid_tile_priorities_(false), @@ -52,29 +46,16 @@ FakePictureLayerImpl::FakePictureLayerImpl( FakePictureLayerImpl::FakePictureLayerImpl(LayerTreeImpl* tree_impl, int id, bool is_mask) - : FakePictureLayerImpl(tree_impl, - id, - is_mask, - new LayerImpl::SyncedScrollOffset) { -} - -FakePictureLayerImpl::FakePictureLayerImpl( - LayerTreeImpl* tree_impl, - int id, - bool is_mask, - scoped_refptr<LayerImpl::SyncedScrollOffset> synced_scroll_offset) - : PictureLayerImpl(tree_impl, id, is_mask, synced_scroll_offset), + : PictureLayerImpl(tree_impl, id, is_mask), append_quads_count_(0), did_become_active_call_count_(0), has_valid_tile_priorities_(false), use_set_valid_tile_priorities_flag_(false), - release_resources_count_(0) { -} + release_resources_count_(0) {} scoped_ptr<LayerImpl> FakePictureLayerImpl::CreateLayerImpl( LayerTreeImpl* tree_impl) { - return make_scoped_ptr(new FakePictureLayerImpl(tree_impl, id(), is_mask_, - synced_scroll_offset())); + return make_scoped_ptr(new FakePictureLayerImpl(tree_impl, id(), is_mask_)); } void FakePictureLayerImpl::PushPropertiesTo(LayerImpl* layer_impl) { diff --git a/cc/test/fake_picture_layer_impl.h b/cc/test/fake_picture_layer_impl.h index fcc4946..2ba9761 100644 --- a/cc/test/fake_picture_layer_impl.h +++ b/cc/test/fake_picture_layer_impl.h @@ -157,11 +157,6 @@ class FakePictureLayerImpl : public PictureLayerImpl { bool is_mask, const gfx::Size& layer_bounds); FakePictureLayerImpl(LayerTreeImpl* tree_impl, int id, bool is_mask); - FakePictureLayerImpl( - LayerTreeImpl* tree_impl, - int id, - bool is_mask, - scoped_refptr<LayerImpl::SyncedScrollOffset> synced_scroll_offset); private: gfx::Size fixed_tile_size_; |