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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/layers/tiled_layer_unittest.cc

Issue 1101823002: CC Animations: Make LayerAnimationController creation optional (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Plumb LayerSettings parameter for cc::Layer construction. Created 5 years, 7 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
« cc/blink/web_layer_impl.cc ('K') | « cc/layers/tiled_layer.cc ('k') | cc/layers/ui_resource_layer.h » ('j') | chrome/browser/android/compositor/layer/content_layer.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/tiled_layer_unittest.cc
diff --git a/cc/layers/tiled_layer_unittest.cc b/cc/layers/tiled_layer_unittest.cc
index b81e031033d3ac7d7e612881a50ccd5af12d951c..262a5bd51c07368aeca7df97e3b71865e74438cf 100644
--- a/cc/layers/tiled_layer_unittest.cc
+++ b/cc/layers/tiled_layer_unittest.cc
@@ -104,7 +104,7 @@ class TiledLayerTest : public testing::Test {
layer_tree_host_->SetLayerTreeHostClientReady();
CHECK(synchonous_output_surface_client_.EnsureOutputSurfaceCreated());
- layer_tree_host_->SetRootLayer(Layer::Create());
+ layer_tree_host_->SetRootLayer(Layer::Create(layer_settings_));
CHECK(output_surface_->BindToClient(&output_surface_client_));
@@ -234,6 +234,7 @@ class TiledLayerTest : public testing::Test {
public:
Proxy* proxy_;
LayerTreeSettings settings_;
+ LayerSettings layer_settings_;
FakeOutputSurfaceClient output_surface_client_;
scoped_ptr<OutputSurface> output_surface_;
scoped_ptr<SharedBitmapManager> shared_bitmap_manager_;
@@ -251,8 +252,8 @@ class TiledLayerTest : public testing::Test {
TEST_F(TiledLayerTest, PushDirtyTiles) {
layer_tree_host_->SetViewportSize(gfx::Size(1000, 1000));
- scoped_refptr<FakeTiledLayer> layer =
- make_scoped_refptr(new FakeTiledLayer(resource_manager_.get()));
+ scoped_refptr<FakeTiledLayer> layer = make_scoped_refptr(
+ new FakeTiledLayer(layer_settings_, resource_manager_.get()));
scoped_ptr<FakeTiledLayerImpl> layer_impl =
make_scoped_ptr(new FakeTiledLayerImpl(host_impl_->active_tree(), 1));
RenderSurfaceLayerList render_surface_layer_list;
@@ -284,8 +285,8 @@ TEST_F(TiledLayerTest, Scale) {
layer_tree_host_->SetDeviceScaleFactor(1.5);
- scoped_refptr<FakeTiledLayer> layer =
- make_scoped_refptr(new FakeTiledLayer(resource_manager_.get()));
+ scoped_refptr<FakeTiledLayer> layer = make_scoped_refptr(
+ new FakeTiledLayer(layer_settings_, resource_manager_.get()));
scoped_ptr<FakeTiledLayerImpl> layer_impl =
make_scoped_ptr(new FakeTiledLayerImpl(host_impl_->active_tree(), 1));
RenderSurfaceLayerList render_surface_layer_list;
@@ -303,8 +304,8 @@ TEST_F(TiledLayerTest, Scale) {
}
TEST_F(TiledLayerTest, PushOccludedDirtyTiles) {
- scoped_refptr<FakeTiledLayer> layer =
- make_scoped_refptr(new FakeTiledLayer(resource_manager_.get()));
+ scoped_refptr<FakeTiledLayer> layer = make_scoped_refptr(
+ new FakeTiledLayer(layer_settings_, resource_manager_.get()));
scoped_ptr<FakeTiledLayerImpl> layer_impl =
make_scoped_ptr(new FakeTiledLayerImpl(host_impl_->active_tree(), 1));
TestOcclusionTracker occluded;
@@ -346,8 +347,8 @@ TEST_F(TiledLayerTest, PushOccludedDirtyTiles) {
TEST_F(TiledLayerTest, PushDeletedTiles) {
layer_tree_host_->SetViewportSize(gfx::Size(1000, 1000));
- scoped_refptr<FakeTiledLayer> layer =
- make_scoped_refptr(new FakeTiledLayer(resource_manager_.get()));
+ scoped_refptr<FakeTiledLayer> layer = make_scoped_refptr(
+ new FakeTiledLayer(layer_settings_, resource_manager_.get()));
scoped_ptr<FakeTiledLayerImpl> layer_impl =
make_scoped_ptr(new FakeTiledLayerImpl(host_impl_->active_tree(), 1));
RenderSurfaceLayerList render_surface_layer_list;
@@ -385,8 +386,8 @@ TEST_F(TiledLayerTest, PushDeletedTiles) {
}
TEST_F(TiledLayerTest, PushIdlePaintTiles) {
- scoped_refptr<FakeTiledLayer> layer =
- make_scoped_refptr(new FakeTiledLayer(resource_manager_.get()));
+ scoped_refptr<FakeTiledLayer> layer = make_scoped_refptr(
+ new FakeTiledLayer(layer_settings_, resource_manager_.get()));
scoped_ptr<FakeTiledLayerImpl> layer_impl =
make_scoped_ptr(new FakeTiledLayerImpl(host_impl_->active_tree(), 1));
RenderSurfaceLayerList render_surface_layer_list;
@@ -425,8 +426,8 @@ TEST_F(TiledLayerTest, PushIdlePaintTiles) {
}
TEST_F(TiledLayerTest, PredictivePainting) {
- scoped_refptr<FakeTiledLayer> layer =
- make_scoped_refptr(new FakeTiledLayer(resource_manager_.get()));
+ scoped_refptr<FakeTiledLayer> layer = make_scoped_refptr(
+ new FakeTiledLayer(layer_settings_, resource_manager_.get()));
scoped_ptr<FakeTiledLayerImpl> layer_impl =
make_scoped_ptr(new FakeTiledLayerImpl(host_impl_->active_tree(), 1));
@@ -504,12 +505,12 @@ TEST_F(TiledLayerTest, PushTilesAfterIdlePaintFailed) {
// Start with 2mb of memory, but the test is going to try to use just more
// than 1mb, so we reduce to 1mb later.
resource_manager_->SetMaxMemoryLimitBytes(2 * 1024 * 1024);
- scoped_refptr<FakeTiledLayer> layer1 =
- make_scoped_refptr(new FakeTiledLayer(resource_manager_.get()));
+ scoped_refptr<FakeTiledLayer> layer1 = make_scoped_refptr(
+ new FakeTiledLayer(layer_settings_, resource_manager_.get()));
scoped_ptr<FakeTiledLayerImpl> layer_impl1 =
make_scoped_ptr(new FakeTiledLayerImpl(host_impl_->active_tree(), 1));
- scoped_refptr<FakeTiledLayer> layer2 =
- make_scoped_refptr(new FakeTiledLayer(resource_manager_.get()));
+ scoped_refptr<FakeTiledLayer> layer2 = make_scoped_refptr(
+ new FakeTiledLayer(layer_settings_, resource_manager_.get()));
scoped_ptr<FakeTiledLayerImpl> layer_impl2 =
make_scoped_ptr(new FakeTiledLayerImpl(host_impl_->active_tree(), 2));
RenderSurfaceLayerList render_surface_layer_list;
@@ -565,8 +566,8 @@ TEST_F(TiledLayerTest, PushTilesAfterIdlePaintFailed) {
}
TEST_F(TiledLayerTest, PushIdlePaintedOccludedTiles) {
- scoped_refptr<FakeTiledLayer> layer =
- make_scoped_refptr(new FakeTiledLayer(resource_manager_.get()));
+ scoped_refptr<FakeTiledLayer> layer = make_scoped_refptr(
+ new FakeTiledLayer(layer_settings_, resource_manager_.get()));
scoped_ptr<FakeTiledLayerImpl> layer_impl =
make_scoped_ptr(new FakeTiledLayerImpl(host_impl_->active_tree(), 1));
RenderSurfaceLayerList render_surface_layer_list;
@@ -588,8 +589,8 @@ TEST_F(TiledLayerTest, PushIdlePaintedOccludedTiles) {
}
TEST_F(TiledLayerTest, PushTilesMarkedDirtyDuringPaint) {
- scoped_refptr<FakeTiledLayer> layer =
- make_scoped_refptr(new FakeTiledLayer(resource_manager_.get()));
+ scoped_refptr<FakeTiledLayer> layer = make_scoped_refptr(
+ new FakeTiledLayer(layer_settings_, resource_manager_.get()));
scoped_ptr<FakeTiledLayerImpl> layer_impl =
make_scoped_ptr(new FakeTiledLayerImpl(host_impl_->active_tree(), 1));
RenderSurfaceLayerList render_surface_layer_list;
@@ -612,10 +613,10 @@ TEST_F(TiledLayerTest, PushTilesMarkedDirtyDuringPaint) {
}
TEST_F(TiledLayerTest, PushTilesLayerMarkedDirtyDuringPaintOnNextLayer) {
- scoped_refptr<FakeTiledLayer> layer1 =
- make_scoped_refptr(new FakeTiledLayer(resource_manager_.get()));
- scoped_refptr<FakeTiledLayer> layer2 =
- make_scoped_refptr(new FakeTiledLayer(resource_manager_.get()));
+ scoped_refptr<FakeTiledLayer> layer1 = make_scoped_refptr(
+ new FakeTiledLayer(layer_settings_, resource_manager_.get()));
+ scoped_refptr<FakeTiledLayer> layer2 = make_scoped_refptr(
+ new FakeTiledLayer(layer_settings_, resource_manager_.get()));
scoped_ptr<FakeTiledLayerImpl> layer1_impl =
make_scoped_ptr(new FakeTiledLayerImpl(host_impl_->active_tree(), 1));
scoped_ptr<FakeTiledLayerImpl> layer2_impl =
@@ -643,10 +644,10 @@ TEST_F(TiledLayerTest, PushTilesLayerMarkedDirtyDuringPaintOnNextLayer) {
}
TEST_F(TiledLayerTest, PushTilesLayerMarkedDirtyDuringPaintOnPreviousLayer) {
- scoped_refptr<FakeTiledLayer> layer1 =
- make_scoped_refptr(new FakeTiledLayer(resource_manager_.get()));
- scoped_refptr<FakeTiledLayer> layer2 =
- make_scoped_refptr(new FakeTiledLayer(resource_manager_.get()));
+ scoped_refptr<FakeTiledLayer> layer1 = make_scoped_refptr(
+ new FakeTiledLayer(layer_settings_, resource_manager_.get()));
+ scoped_refptr<FakeTiledLayer> layer2 = make_scoped_refptr(
+ new FakeTiledLayer(layer_settings_, resource_manager_.get()));
scoped_ptr<FakeTiledLayerImpl> layer1_impl =
make_scoped_ptr(new FakeTiledLayerImpl(host_impl_->active_tree(), 1));
scoped_ptr<FakeTiledLayerImpl> layer2_impl =
@@ -692,8 +693,8 @@ TEST_F(TiledLayerTest, PaintSmallAnimatedLayersImmediately) {
resource_manager_->SetMaxMemoryLimitBytes(memory_for_layer);
- scoped_refptr<FakeTiledLayer> layer =
- make_scoped_refptr(new FakeTiledLayer(resource_manager_.get()));
+ scoped_refptr<FakeTiledLayer> layer = make_scoped_refptr(
+ new FakeTiledLayer(layer_settings_, resource_manager_.get()));
scoped_ptr<FakeTiledLayerImpl> layer_impl =
make_scoped_ptr(new FakeTiledLayerImpl(host_impl_->active_tree(), 1));
RenderSurfaceLayerList render_surface_layer_list;
@@ -739,8 +740,8 @@ TEST_F(TiledLayerTest, PaintSmallAnimatedLayersImmediately) {
}
TEST_F(TiledLayerTest, IdlePaintOutOfMemory) {
- scoped_refptr<FakeTiledLayer> layer =
- make_scoped_refptr(new FakeTiledLayer(resource_manager_.get()));
+ scoped_refptr<FakeTiledLayer> layer = make_scoped_refptr(
+ new FakeTiledLayer(layer_settings_, resource_manager_.get()));
scoped_ptr<FakeTiledLayerImpl> layer_impl =
make_scoped_ptr(new FakeTiledLayerImpl(host_impl_->active_tree(), 1));
RenderSurfaceLayerList render_surface_layer_list;
@@ -768,8 +769,8 @@ TEST_F(TiledLayerTest, IdlePaintOutOfMemory) {
}
TEST_F(TiledLayerTest, IdlePaintZeroSizedLayer) {
- scoped_refptr<FakeTiledLayer> layer =
- make_scoped_refptr(new FakeTiledLayer(resource_manager_.get()));
+ scoped_refptr<FakeTiledLayer> layer = make_scoped_refptr(
+ new FakeTiledLayer(layer_settings_, resource_manager_.get()));
scoped_ptr<FakeTiledLayerImpl> layer_impl =
make_scoped_ptr(new FakeTiledLayerImpl(host_impl_->active_tree(), 1));
@@ -801,8 +802,8 @@ TEST_F(TiledLayerTest, IdlePaintZeroSizedLayer) {
}
TEST_F(TiledLayerTest, IdlePaintNonVisibleLayers) {
- scoped_refptr<FakeTiledLayer> layer =
- make_scoped_refptr(new FakeTiledLayer(resource_manager_.get()));
+ scoped_refptr<FakeTiledLayer> layer = make_scoped_refptr(
+ new FakeTiledLayer(layer_settings_, resource_manager_.get()));
scoped_ptr<FakeTiledLayerImpl> layer_impl =
make_scoped_ptr(new FakeTiledLayerImpl(host_impl_->active_tree(), 1));
@@ -839,8 +840,8 @@ TEST_F(TiledLayerTest, IdlePaintNonVisibleLayers) {
}
TEST_F(TiledLayerTest, InvalidateFromPrepare) {
- scoped_refptr<FakeTiledLayer> layer =
- make_scoped_refptr(new FakeTiledLayer(resource_manager_.get()));
+ scoped_refptr<FakeTiledLayer> layer = make_scoped_refptr(
+ new FakeTiledLayer(layer_settings_, resource_manager_.get()));
scoped_ptr<FakeTiledLayerImpl> layer_impl =
make_scoped_ptr(new FakeTiledLayerImpl(host_impl_->active_tree(), 1));
RenderSurfaceLayerList render_surface_layer_list;
@@ -881,8 +882,9 @@ TEST_F(TiledLayerTest, InvalidateFromPrepare) {
TEST_F(TiledLayerTest, VerifyUpdateRectWhenContentBoundsAreScaled) {
// The update rect (that indicates what was actually painted) should be in
// layer space, not the content space.
- scoped_refptr<FakeTiledLayerWithScaledBounds> layer = make_scoped_refptr(
- new FakeTiledLayerWithScaledBounds(resource_manager_.get()));
+ scoped_refptr<FakeTiledLayerWithScaledBounds> layer =
+ make_scoped_refptr(new FakeTiledLayerWithScaledBounds(
+ layer_settings_, resource_manager_.get()));
layer_tree_host_->root_layer()->AddChild(layer);
@@ -931,8 +933,8 @@ TEST_F(TiledLayerTest, VerifyUpdateRectWhenContentBoundsAreScaled) {
}
TEST_F(TiledLayerTest, VerifyInvalidationWhenContentsScaleChanges) {
- scoped_refptr<FakeTiledLayer> layer =
- make_scoped_refptr(new FakeTiledLayer(resource_manager_.get()));
+ scoped_refptr<FakeTiledLayer> layer = make_scoped_refptr(
+ new FakeTiledLayer(layer_settings_, resource_manager_.get()));
scoped_ptr<FakeTiledLayerImpl> layer_impl =
make_scoped_ptr(new FakeTiledLayerImpl(host_impl_->active_tree(), 1));
RenderSurfaceLayerList render_surface_layer_list;
@@ -1005,10 +1007,12 @@ TEST_F(TiledLayerTest, SkipsDrawGetsReset) {
// We have enough memory for only one of the two layers.
int memory_limit = 4 * 300 * 300; // 4 bytes per pixel.
- scoped_refptr<FakeTiledLayer> root_layer = make_scoped_refptr(
- new FakeTiledLayer(layer_tree_host_->contents_texture_manager()));
- scoped_refptr<FakeTiledLayer> child_layer = make_scoped_refptr(
- new FakeTiledLayer(layer_tree_host_->contents_texture_manager()));
+ scoped_refptr<FakeTiledLayer> root_layer =
+ make_scoped_refptr(new FakeTiledLayer(
+ layer_settings_, layer_tree_host_->contents_texture_manager()));
+ scoped_refptr<FakeTiledLayer> child_layer =
+ make_scoped_refptr(new FakeTiledLayer(
+ layer_settings_, layer_tree_host_->contents_texture_manager()));
root_layer->AddChild(child_layer);
root_layer->SetBounds(content_bounds);
@@ -1045,8 +1049,8 @@ TEST_F(TiledLayerTest, SkipsDrawGetsReset) {
}
TEST_F(TiledLayerTest, ResizeToSmaller) {
- scoped_refptr<FakeTiledLayer> layer =
- make_scoped_refptr(new FakeTiledLayer(resource_manager_.get()));
+ scoped_refptr<FakeTiledLayer> layer = make_scoped_refptr(
+ new FakeTiledLayer(layer_settings_, resource_manager_.get()));
layer_tree_host_->root_layer()->AddChild(layer);
@@ -1064,8 +1068,8 @@ TEST_F(TiledLayerTest, ResizeToSmaller) {
}
TEST_F(TiledLayerTest, HugeLayerUpdateCrash) {
- scoped_refptr<FakeTiledLayer> layer =
- make_scoped_refptr(new FakeTiledLayer(resource_manager_.get()));
+ scoped_refptr<FakeTiledLayer> layer = make_scoped_refptr(
+ new FakeTiledLayer(layer_settings_, resource_manager_.get()));
layer_tree_host_->root_layer()->AddChild(layer);
@@ -1091,8 +1095,8 @@ TEST_F(TiledLayerPartialUpdateTest, PartialUpdates) {
gfx::Size content_bounds(300, 200);
gfx::Rect content_rect(content_bounds);
- scoped_refptr<FakeTiledLayer> layer = make_scoped_refptr(
- new FakeTiledLayer(layer_tree_host_->contents_texture_manager()));
+ scoped_refptr<FakeTiledLayer> layer = make_scoped_refptr(new FakeTiledLayer(
+ layer_settings_, layer_tree_host_->contents_texture_manager()));
layer->SetBounds(content_bounds);
layer->SetPosition(gfx::PointF(0, 0));
layer->draw_properties().visible_content_rect = content_rect;
@@ -1197,8 +1201,8 @@ TEST_F(TiledLayerPartialUpdateTest, PartialUpdates) {
TEST_F(TiledLayerTest, TilesPaintedWithoutOcclusion) {
layer_tree_host_->SetViewportSize(gfx::Size(1000, 1000));
- scoped_refptr<FakeTiledLayer> layer =
- make_scoped_refptr(new FakeTiledLayer(resource_manager_.get()));
+ scoped_refptr<FakeTiledLayer> layer = make_scoped_refptr(
+ new FakeTiledLayer(layer_settings_, resource_manager_.get()));
RenderSurfaceLayerList render_surface_layer_list;
layer_tree_host_->root_layer()->AddChild(layer);
@@ -1215,8 +1219,8 @@ TEST_F(TiledLayerTest, TilesPaintedWithoutOcclusion) {
}
TEST_F(TiledLayerTest, TilesPaintedWithOcclusion) {
- scoped_refptr<FakeTiledLayer> layer =
- make_scoped_refptr(new FakeTiledLayer(resource_manager_.get()));
+ scoped_refptr<FakeTiledLayer> layer = make_scoped_refptr(
+ new FakeTiledLayer(layer_settings_, resource_manager_.get()));
RenderSurfaceLayerList render_surface_layer_list;
TestOcclusionTracker occluded;
occlusion_ = &occluded;
@@ -1264,8 +1268,8 @@ TEST_F(TiledLayerTest, TilesPaintedWithOcclusion) {
}
TEST_F(TiledLayerTest, TilesPaintedWithOcclusionAndVisiblityConstraints) {
- scoped_refptr<FakeTiledLayer> layer =
- make_scoped_refptr(new FakeTiledLayer(resource_manager_.get()));
+ scoped_refptr<FakeTiledLayer> layer = make_scoped_refptr(
+ new FakeTiledLayer(layer_settings_, resource_manager_.get()));
RenderSurfaceLayerList render_surface_layer_list;
TestOcclusionTracker occluded;
occlusion_ = &occluded;
@@ -1321,8 +1325,8 @@ TEST_F(TiledLayerTest, TilesPaintedWithOcclusionAndVisiblityConstraints) {
}
TEST_F(TiledLayerTest, TilesNotPaintedWithoutInvalidation) {
- scoped_refptr<FakeTiledLayer> layer =
- make_scoped_refptr(new FakeTiledLayer(resource_manager_.get()));
+ scoped_refptr<FakeTiledLayer> layer = make_scoped_refptr(
+ new FakeTiledLayer(layer_settings_, resource_manager_.get()));
RenderSurfaceLayerList render_surface_layer_list;
TestOcclusionTracker occluded;
occlusion_ = &occluded;
@@ -1358,8 +1362,8 @@ TEST_F(TiledLayerTest, TilesNotPaintedWithoutInvalidation) {
}
TEST_F(TiledLayerTest, TilesPaintedWithOcclusionAndTransforms) {
- scoped_refptr<FakeTiledLayer> layer =
- make_scoped_refptr(new FakeTiledLayer(resource_manager_.get()));
+ scoped_refptr<FakeTiledLayer> layer = make_scoped_refptr(
+ new FakeTiledLayer(layer_settings_, resource_manager_.get()));
RenderSurfaceLayerList render_surface_layer_list;
TestOcclusionTracker occluded;
occlusion_ = &occluded;
@@ -1393,13 +1397,13 @@ TEST_F(TiledLayerTest, TilesPaintedWithOcclusionAndTransforms) {
TEST_F(TiledLayerTest, TilesPaintedWithOcclusionAndScaling) {
scoped_refptr<FakeTiledLayer> layer =
- new FakeTiledLayer(resource_manager_.get());
+ new FakeTiledLayer(layer_settings_, resource_manager_.get());
RenderSurfaceLayerList render_surface_layer_list;
TestOcclusionTracker occluded;
occlusion_ = &occluded;
scoped_refptr<FakeTiledLayer> scale_layer =
- new FakeTiledLayer(resource_manager_.get());
+ new FakeTiledLayer(layer_settings_, resource_manager_.get());
gfx::Transform scale_transform;
scale_transform.Scale(2.0, 2.0);
scale_layer->SetTransform(scale_transform);
@@ -1482,13 +1486,13 @@ TEST_F(TiledLayerTest, DontAllocateContentsWhenTargetSurfaceCantBeAllocated) {
gfx::Rect child_rect(0, 0, 300, 100);
gfx::Rect child2_rect(0, 100, 300, 100);
- scoped_refptr<FakeTiledLayer> root = make_scoped_refptr(
- new FakeTiledLayer(layer_tree_host_->contents_texture_manager()));
- scoped_refptr<Layer> surface = Layer::Create();
- scoped_refptr<FakeTiledLayer> child = make_scoped_refptr(
- new FakeTiledLayer(layer_tree_host_->contents_texture_manager()));
- scoped_refptr<FakeTiledLayer> child2 = make_scoped_refptr(
- new FakeTiledLayer(layer_tree_host_->contents_texture_manager()));
+ scoped_refptr<FakeTiledLayer> root = make_scoped_refptr(new FakeTiledLayer(
+ layer_settings_, layer_tree_host_->contents_texture_manager()));
+ scoped_refptr<Layer> surface = Layer::Create(layer_settings_);
+ scoped_refptr<FakeTiledLayer> child = make_scoped_refptr(new FakeTiledLayer(
+ layer_settings_, layer_tree_host_->contents_texture_manager()));
+ scoped_refptr<FakeTiledLayer> child2 = make_scoped_refptr(new FakeTiledLayer(
+ layer_settings_, layer_tree_host_->contents_texture_manager()));
root->SetBounds(root_rect.size());
root->draw_properties().drawable_content_rect = root_rect;
@@ -1656,8 +1660,9 @@ class TrackingLayerPainter : public LayerPainter {
class UpdateTrackingTiledLayer : public FakeTiledLayer {
public:
- explicit UpdateTrackingTiledLayer(PrioritizedResourceManager* manager)
- : FakeTiledLayer(manager) {
+ explicit UpdateTrackingTiledLayer(const LayerSettings& settings,
+ PrioritizedResourceManager* manager)
+ : FakeTiledLayer(settings, manager) {
scoped_ptr<TrackingLayerPainter> painter(TrackingLayerPainter::Create());
tracking_layer_painter_ = painter.get();
layer_updater_ = BitmapContentLayerUpdater::Create(painter.Pass(), 0);
@@ -1676,8 +1681,8 @@ class UpdateTrackingTiledLayer : public FakeTiledLayer {
};
TEST_F(TiledLayerTest, NonIntegerContentsScaleIsNotDistortedDuringPaint) {
- scoped_refptr<UpdateTrackingTiledLayer> layer =
- make_scoped_refptr(new UpdateTrackingTiledLayer(resource_manager_.get()));
+ scoped_refptr<UpdateTrackingTiledLayer> layer = make_scoped_refptr(
+ new UpdateTrackingTiledLayer(layer_settings_, resource_manager_.get()));
layer_tree_host_->root_layer()->AddChild(layer);
@@ -1716,8 +1721,8 @@ TEST_F(TiledLayerTest, NonIntegerContentsScaleIsNotDistortedDuringPaint) {
TEST_F(TiledLayerTest,
NonIntegerContentsScaleIsNotDistortedDuringInvalidation) {
- scoped_refptr<UpdateTrackingTiledLayer> layer =
- make_scoped_refptr(new UpdateTrackingTiledLayer(resource_manager_.get()));
+ scoped_refptr<UpdateTrackingTiledLayer> layer = make_scoped_refptr(
+ new UpdateTrackingTiledLayer(layer_settings_, resource_manager_.get()));
layer_tree_host_->root_layer()->AddChild(layer);
« cc/blink/web_layer_impl.cc ('K') | « cc/layers/tiled_layer.cc ('k') | cc/layers/ui_resource_layer.h » ('j') | chrome/browser/android/compositor/layer/content_layer.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698