| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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 "cc/output/software_renderer.h" | 5 #include "cc/output/software_renderer.h" |
| 6 | 6 |
| 7 #include "base/run_loop.h" | 7 #include "base/run_loop.h" |
| 8 #include "cc/output/compositor_frame_metadata.h" | 8 #include "cc/output/compositor_frame_metadata.h" |
| 9 #include "cc/output/copy_output_request.h" | 9 #include "cc/output/copy_output_request.h" |
| 10 #include "cc/output/copy_output_result.h" | 10 #include "cc/output/copy_output_result.h" |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 this, &settings_, output_surface_.get(), resource_provider()); | 47 this, &settings_, output_surface_.get(), resource_provider()); |
| 48 } | 48 } |
| 49 | 49 |
| 50 ResourceProvider* resource_provider() const { | 50 ResourceProvider* resource_provider() const { |
| 51 return resource_provider_.get(); | 51 return resource_provider_.get(); |
| 52 } | 52 } |
| 53 | 53 |
| 54 SoftwareRenderer* renderer() const { return renderer_.get(); } | 54 SoftwareRenderer* renderer() const { return renderer_.get(); } |
| 55 | 55 |
| 56 // RendererClient implementation. | 56 // RendererClient implementation. |
| 57 virtual void SetFullRootLayerDamage() OVERRIDE {} | 57 virtual void SetFullRootLayerDamage() override {} |
| 58 | 58 |
| 59 scoped_ptr<SkBitmap> DrawAndCopyOutput(RenderPassList* list, | 59 scoped_ptr<SkBitmap> DrawAndCopyOutput(RenderPassList* list, |
| 60 float device_scale_factor, | 60 float device_scale_factor, |
| 61 gfx::Rect device_viewport_rect) { | 61 gfx::Rect device_viewport_rect) { |
| 62 scoped_ptr<SkBitmap> bitmap_result; | 62 scoped_ptr<SkBitmap> bitmap_result; |
| 63 base::RunLoop loop; | 63 base::RunLoop loop; |
| 64 | 64 |
| 65 list->back()->copy_requests.push_back( | 65 list->back()->copy_requests.push_back( |
| 66 CopyOutputRequest::CreateBitmapRequest( | 66 CopyOutputRequest::CreateBitmapRequest( |
| 67 base::Bind(&SoftwareRendererTest::SaveBitmapResult, | 67 base::Bind(&SoftwareRendererTest::SaveBitmapResult, |
| (...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 431 EXPECT_EQ( | 431 EXPECT_EQ( |
| 432 SK_ColorMAGENTA, | 432 SK_ColorMAGENTA, |
| 433 output->getColor(interior_visible_rect.x(), interior_visible_rect.y())); | 433 output->getColor(interior_visible_rect.x(), interior_visible_rect.y())); |
| 434 EXPECT_EQ(SK_ColorMAGENTA, | 434 EXPECT_EQ(SK_ColorMAGENTA, |
| 435 output->getColor(interior_visible_rect.right() - 1, | 435 output->getColor(interior_visible_rect.right() - 1, |
| 436 interior_visible_rect.bottom() - 1)); | 436 interior_visible_rect.bottom() - 1)); |
| 437 } | 437 } |
| 438 | 438 |
| 439 } // namespace | 439 } // namespace |
| 440 } // namespace cc | 440 } // namespace cc |
| OLD | NEW |