| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/bind.h" | 5 #include "base/bind.h" |
| 6 #include "cc/output/compositor_frame.h" | 6 #include "cc/output/compositor_frame.h" |
| 7 #include "cc/output/delegated_frame_data.h" | 7 #include "cc/output/delegated_frame_data.h" |
| 8 #include "cc/quads/texture_draw_quad.h" | 8 #include "cc/quads/texture_draw_quad.h" |
| 9 #include "cc/surfaces/surface.h" | 9 #include "cc/surfaces/surface.h" |
| 10 #include "cc/surfaces/surface_manager.h" | 10 #include "cc/surfaces/surface_manager.h" |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 surface->SetBufferScale(kBufferScale); | 122 surface->SetBufferScale(kBufferScale); |
| 123 surface->Commit(); | 123 surface->Commit(); |
| 124 EXPECT_EQ( | 124 EXPECT_EQ( |
| 125 gfx::ScaleToFlooredSize(buffer_size, 1.0f / kBufferScale).ToString(), | 125 gfx::ScaleToFlooredSize(buffer_size, 1.0f / kBufferScale).ToString(), |
| 126 surface->window()->bounds().size().ToString()); | 126 surface->window()->bounds().size().ToString()); |
| 127 EXPECT_EQ( | 127 EXPECT_EQ( |
| 128 gfx::ScaleToFlooredSize(buffer_size, 1.0f / kBufferScale).ToString(), | 128 gfx::ScaleToFlooredSize(buffer_size, 1.0f / kBufferScale).ToString(), |
| 129 surface->content_size().ToString()); | 129 surface->content_size().ToString()); |
| 130 } | 130 } |
| 131 | 131 |
| 132 TEST_F(SurfaceTest, RecreateLayer) { | 132 TEST_F(SurfaceTest, MirrorLayers) { |
| 133 gfx::Size buffer_size(512, 512); | 133 gfx::Size buffer_size(512, 512); |
| 134 std::unique_ptr<Buffer> buffer( | 134 std::unique_ptr<Buffer> buffer( |
| 135 new Buffer(exo_test_helper()->CreateGpuMemoryBuffer(buffer_size))); | 135 new Buffer(exo_test_helper()->CreateGpuMemoryBuffer(buffer_size))); |
| 136 std::unique_ptr<Surface> surface(new Surface); | 136 std::unique_ptr<Surface> surface(new Surface); |
| 137 | 137 |
| 138 surface->Attach(buffer.get()); | 138 surface->Attach(buffer.get()); |
| 139 surface->Commit(); | 139 surface->Commit(); |
| 140 | 140 |
| 141 EXPECT_EQ(buffer_size, surface->window()->bounds().size()); | 141 EXPECT_EQ(buffer_size, surface->window()->bounds().size()); |
| 142 EXPECT_EQ(buffer_size, surface->window()->layer()->bounds().size()); | 142 EXPECT_EQ(buffer_size, surface->window()->layer()->bounds().size()); |
| 143 std::unique_ptr<ui::LayerTreeOwner> old_layer_owner = | 143 std::unique_ptr<ui::LayerTreeOwner> old_layer_owner = |
| 144 ::wm::RecreateLayers(surface->window(), nullptr); | 144 ::wm::MirrorLayers(surface->window(), false /* sync_bounds */); |
| 145 EXPECT_EQ(buffer_size, surface->window()->bounds().size()); | 145 EXPECT_EQ(buffer_size, surface->window()->bounds().size()); |
| 146 EXPECT_EQ(buffer_size, surface->window()->layer()->bounds().size()); | 146 EXPECT_EQ(buffer_size, surface->window()->layer()->bounds().size()); |
| 147 EXPECT_EQ(buffer_size, old_layer_owner->root()->bounds().size()); | 147 EXPECT_EQ(buffer_size, old_layer_owner->root()->bounds().size()); |
| 148 EXPECT_TRUE(surface->window()->layer()->has_external_content()); | 148 EXPECT_TRUE(surface->window()->layer()->has_external_content()); |
| 149 EXPECT_TRUE(old_layer_owner->root()->has_external_content()); | 149 EXPECT_TRUE(old_layer_owner->root()->has_external_content()); |
| 150 } | 150 } |
| 151 | 151 |
| 152 TEST_F(SurfaceTest, SetViewport) { | 152 TEST_F(SurfaceTest, SetViewport) { |
| 153 gfx::Size buffer_size(1, 1); | 153 gfx::Size buffer_size(1, 1); |
| 154 std::unique_ptr<Buffer> buffer( | 154 std::unique_ptr<Buffer> buffer( |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 249 | 249 |
| 250 TEST_F(SurfaceTest, Commit) { | 250 TEST_F(SurfaceTest, Commit) { |
| 251 std::unique_ptr<Surface> surface(new Surface); | 251 std::unique_ptr<Surface> surface(new Surface); |
| 252 | 252 |
| 253 // Calling commit without a buffer should succeed. | 253 // Calling commit without a buffer should succeed. |
| 254 surface->Commit(); | 254 surface->Commit(); |
| 255 } | 255 } |
| 256 | 256 |
| 257 } // namespace | 257 } // namespace |
| 258 } // namespace exo | 258 } // namespace exo |
| OLD | NEW |