Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(122)

Unified Diff: cc/test/fake_picture_layer_impl.cc

Issue 895853003: Update from https://crrev.com/314320 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/test/fake_picture_layer_impl.h ('k') | cc/test/fake_tile_manager_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/fake_picture_layer_impl.cc
diff --git a/cc/test/fake_picture_layer_impl.cc b/cc/test/fake_picture_layer_impl.cc
index 132160f63a5c3f82dec752d0264e1d111f65e31b..43db7bcf8f2f142273c668032ac0a5c3875bcf43 100644
--- a/cc/test/fake_picture_layer_impl.cc
+++ b/cc/test/fake_picture_layer_impl.cc
@@ -15,7 +15,10 @@ FakePictureLayerImpl::FakePictureLayerImpl(
int id,
scoped_refptr<RasterSource> raster_source,
bool is_mask)
- : PictureLayerImpl(tree_impl, id, is_mask),
+ : PictureLayerImpl(tree_impl,
+ id,
+ is_mask,
+ new LayerImpl::SyncedScrollOffset),
append_quads_count_(0),
did_become_active_call_count_(0),
has_valid_tile_priorities_(false),
@@ -32,7 +35,10 @@ FakePictureLayerImpl::FakePictureLayerImpl(
scoped_refptr<RasterSource> raster_source,
bool is_mask,
const gfx::Size& layer_bounds)
- : PictureLayerImpl(tree_impl, id, is_mask),
+ : PictureLayerImpl(tree_impl,
+ id,
+ is_mask,
+ new LayerImpl::SyncedScrollOffset),
append_quads_count_(0),
did_become_active_call_count_(0),
has_valid_tile_priorities_(false),
@@ -46,7 +52,18 @@ FakePictureLayerImpl::FakePictureLayerImpl(
FakePictureLayerImpl::FakePictureLayerImpl(LayerTreeImpl* tree_impl,
int id,
bool is_mask)
- : PictureLayerImpl(tree_impl, id, 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),
append_quads_count_(0),
did_become_active_call_count_(0),
has_valid_tile_priorities_(false),
@@ -56,7 +73,8 @@ FakePictureLayerImpl::FakePictureLayerImpl(LayerTreeImpl* tree_impl,
scoped_ptr<LayerImpl> FakePictureLayerImpl::CreateLayerImpl(
LayerTreeImpl* tree_impl) {
- return make_scoped_ptr(new FakePictureLayerImpl(tree_impl, id(), is_mask_));
+ return make_scoped_ptr(new FakePictureLayerImpl(tree_impl, id(), is_mask_,
+ synced_scroll_offset()));
}
void FakePictureLayerImpl::PushPropertiesTo(LayerImpl* layer_impl) {
« no previous file with comments | « cc/test/fake_picture_layer_impl.h ('k') | cc/test/fake_tile_manager_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698