diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-08-14 11:38:45 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-08-14 17:16:47 +0000 |
| commit | 3a97ca8dd9b96b599ae2d33e40df0dd2f7ea5859 (patch) | |
| tree | 43cc572ba067417c7341db81f71ae7cc6e0fcc3e /chromium/cc/layers/surface_layer_impl_unittest.cc | |
| parent | f61ab1ac7f855cd281809255c0aedbb1895e1823 (diff) | |
BASELINE: Update chromium to 45.0.2454.40
Change-Id: Id2121d9f11a8fc633677236c65a3e41feef589e4
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'chromium/cc/layers/surface_layer_impl_unittest.cc')
| -rw-r--r-- | chromium/cc/layers/surface_layer_impl_unittest.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chromium/cc/layers/surface_layer_impl_unittest.cc b/chromium/cc/layers/surface_layer_impl_unittest.cc index 74543a84428..3ff8255f151 100644 --- a/chromium/cc/layers/surface_layer_impl_unittest.cc +++ b/chromium/cc/layers/surface_layer_impl_unittest.cc @@ -19,10 +19,11 @@ TEST(SurfaceLayerImplTest, Occlusion) { SurfaceLayerImpl* surface_layer_impl = impl.AddChildToRoot<SurfaceLayerImpl>(); surface_layer_impl->SetBounds(layer_size); - surface_layer_impl->SetContentBounds(layer_size); surface_layer_impl->SetDrawsContent(true); SurfaceId surface_id(9); surface_layer_impl->SetSurfaceId(surface_id); + surface_layer_impl->SetSurfaceScale(1.f); + surface_layer_impl->SetSurfaceSize(layer_size); impl.CalcDrawProps(viewport_size); @@ -38,7 +39,7 @@ TEST(SurfaceLayerImplTest, Occlusion) { { SCOPED_TRACE("Full occlusion"); - gfx::Rect occluded(surface_layer_impl->visible_content_rect()); + gfx::Rect occluded(surface_layer_impl->visible_layer_rect()); impl.AppendQuadsWithOcclusion(surface_layer_impl, occluded); LayerTestCommon::VerifyQuadsExactlyCoverRect(impl.quad_list(), gfx::Rect()); |