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/surfaces/surface.h" | 8 #include "cc/surfaces/surface.h" |
9 #include "cc/surfaces/surface_manager.h" | 9 #include "cc/surfaces/surface_manager.h" |
10 #include "components/exo/buffer.h" | 10 #include "components/exo/buffer.h" |
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
184 surface->Commit(); | 184 surface->Commit(); |
185 EXPECT_EQ(crop_size.ToString(), | 185 EXPECT_EQ(crop_size.ToString(), |
186 surface->window()->bounds().size().ToString()); | 186 surface->window()->bounds().size().ToString()); |
187 EXPECT_EQ(crop_size.ToString(), surface->content_size().ToString()); | 187 EXPECT_EQ(crop_size.ToString(), surface->content_size().ToString()); |
188 } | 188 } |
189 | 189 |
190 const cc::DelegatedFrameData* GetFrameFromSurface(Surface* surface) { | 190 const cc::DelegatedFrameData* GetFrameFromSurface(Surface* surface) { |
191 cc::SurfaceId surface_id = surface->surface_id(); | 191 cc::SurfaceId surface_id = surface->surface_id(); |
192 cc::SurfaceManager* surface_manager = | 192 cc::SurfaceManager* surface_manager = |
193 aura::Env::GetInstance()->context_factory()->GetSurfaceManager(); | 193 aura::Env::GetInstance()->context_factory()->GetSurfaceManager(); |
194 const cc::CompositorFrame* frame = | 194 const cc::CompositorFrame& frame = |
195 surface_manager->GetSurfaceForId(surface_id)->GetEligibleFrame(); | 195 surface_manager->GetSurfaceForId(surface_id)->GetEligibleFrame(); |
196 return frame->delegated_frame_data.get(); | 196 return frame.delegated_frame_data.get(); |
197 } | 197 } |
198 | 198 |
199 TEST_F(SurfaceTest, SetBlendMode) { | 199 TEST_F(SurfaceTest, SetBlendMode) { |
200 gfx::Size buffer_size(1, 1); | 200 gfx::Size buffer_size(1, 1); |
201 std::unique_ptr<Buffer> buffer( | 201 std::unique_ptr<Buffer> buffer( |
202 new Buffer(exo_test_helper()->CreateGpuMemoryBuffer(buffer_size))); | 202 new Buffer(exo_test_helper()->CreateGpuMemoryBuffer(buffer_size))); |
203 std::unique_ptr<Surface> surface(new Surface); | 203 std::unique_ptr<Surface> surface(new Surface); |
204 | 204 |
205 surface->Attach(buffer.get()); | 205 surface->Attach(buffer.get()); |
206 surface->SetBlendMode(SkXfermode::kSrc_Mode); | 206 surface->SetBlendMode(SkXfermode::kSrc_Mode); |
(...skipping 22 matching lines...) Expand all Loading... |
229 | 229 |
230 TEST_F(SurfaceTest, Commit) { | 230 TEST_F(SurfaceTest, Commit) { |
231 std::unique_ptr<Surface> surface(new Surface); | 231 std::unique_ptr<Surface> surface(new Surface); |
232 | 232 |
233 // Calling commit without a buffer should succeed. | 233 // Calling commit without a buffer should succeed. |
234 surface->Commit(); | 234 surface->Commit(); |
235 } | 235 } |
236 | 236 |
237 } // namespace | 237 } // namespace |
238 } // namespace exo | 238 } // namespace exo |
OLD | NEW |