diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-04 14:17:57 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-05 10:05:06 +0000 |
| commit | 39d357e3248f80abea0159765ff39554affb40db (patch) | |
| tree | aba0e6bfb76de0244bba0f5fdbd64b830dd6e621 /chromium/cc/layers/surface_layer_impl_unittest.cc | |
| parent | 87778abf5a1f89266f37d1321b92a21851d8244d (diff) | |
BASELINE: Update Chromium to 55.0.2883.105
And updates ninja to 1.7.2
Change-Id: I20d43c737f82764d857ada9a55586901b18b9243
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/cc/layers/surface_layer_impl_unittest.cc')
| -rw-r--r-- | chromium/cc/layers/surface_layer_impl_unittest.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chromium/cc/layers/surface_layer_impl_unittest.cc b/chromium/cc/layers/surface_layer_impl_unittest.cc index e88f3e548a1..954aaf81367 100644 --- a/chromium/cc/layers/surface_layer_impl_unittest.cc +++ b/chromium/cc/layers/surface_layer_impl_unittest.cc @@ -12,6 +12,8 @@ namespace cc { namespace { +static constexpr FrameSinkId kArbitraryFrameSinkId(1, 1); + TEST(SurfaceLayerImplTest, Occlusion) { gfx::Size layer_size(1000, 1000); gfx::Size viewport_size(1000, 1000); @@ -22,7 +24,7 @@ TEST(SurfaceLayerImplTest, Occlusion) { impl.AddChildToRoot<SurfaceLayerImpl>(); surface_layer_impl->SetBounds(layer_size); surface_layer_impl->SetDrawsContent(true); - SurfaceId surface_id(0, 9, 0); + SurfaceId surface_id(kArbitraryFrameSinkId, LocalFrameId(9, 0)); surface_layer_impl->SetSurfaceId(surface_id); surface_layer_impl->SetSurfaceScale(1.f); surface_layer_impl->SetSurfaceSize(layer_size); |