| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "ui/compositor/test/test_compositor_host.h" | 5 #include "ui/compositor/test/test_compositor_host.h" |
| 6 | 6 |
| 7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| 11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
| 12 #include "base/memory/weak_ptr.h" | 12 #include "base/memory/weak_ptr.h" |
| 13 #include "base/message_loop/message_loop.h" | 13 #include "base/message_loop/message_loop.h" |
| 14 #include "ui/compositor/compositor.h" | 14 #include "ui/compositor/compositor.h" |
| 15 #include "ui/gfx/rect.h" | 15 #include "ui/gfx/rect.h" |
| 16 | 16 |
| 17 namespace ui { | 17 namespace ui { |
| 18 | 18 |
| 19 class TestCompositorHostOzone : public TestCompositorHost { | 19 class TestCompositorHostOzone : public TestCompositorHost { |
| 20 public: | 20 public: |
| 21 TestCompositorHostOzone(const gfx::Rect& bounds, | 21 TestCompositorHostOzone(const gfx::Rect& bounds, |
| 22 ui::ContextFactory* context_factory); | 22 ui::ContextFactory* context_factory); |
| 23 virtual ~TestCompositorHostOzone(); | 23 virtual ~TestCompositorHostOzone(); |
| 24 | 24 |
| 25 private: | 25 private: |
| 26 // Overridden from TestCompositorHost: | 26 // Overridden from TestCompositorHost: |
| 27 virtual void Show() OVERRIDE; | 27 virtual void Show() OVERRIDE; |
| 28 virtual ui::Compositor* GetCompositor() OVERRIDE; | 28 virtual ui::Compositor* GetCompositor() OVERRIDE; |
| 29 | 29 |
| 30 void Draw(); | |
| 31 | |
| 32 gfx::Rect bounds_; | 30 gfx::Rect bounds_; |
| 33 | 31 |
| 34 ui::ContextFactory* context_factory_; | 32 ui::ContextFactory* context_factory_; |
| 35 | 33 |
| 36 scoped_ptr<ui::Compositor> compositor_; | 34 scoped_ptr<ui::Compositor> compositor_; |
| 37 | 35 |
| 38 DISALLOW_COPY_AND_ASSIGN(TestCompositorHostOzone); | 36 DISALLOW_COPY_AND_ASSIGN(TestCompositorHostOzone); |
| 39 }; | 37 }; |
| 40 | 38 |
| 41 TestCompositorHostOzone::TestCompositorHostOzone( | 39 TestCompositorHostOzone::TestCompositorHostOzone( |
| (...skipping 13 matching lines...) Expand all Loading... |
| 55 // TODO(rjkroege): Use a "real" ozone widget when it is | 53 // TODO(rjkroege): Use a "real" ozone widget when it is |
| 56 // available: http://crbug.com/255128 | 54 // available: http://crbug.com/255128 |
| 57 compositor_.reset(new ui::Compositor(1, context_factory_)); | 55 compositor_.reset(new ui::Compositor(1, context_factory_)); |
| 58 compositor_->SetScaleAndSize(1.0f, bounds_.size()); | 56 compositor_->SetScaleAndSize(1.0f, bounds_.size()); |
| 59 } | 57 } |
| 60 | 58 |
| 61 ui::Compositor* TestCompositorHostOzone::GetCompositor() { | 59 ui::Compositor* TestCompositorHostOzone::GetCompositor() { |
| 62 return compositor_.get(); | 60 return compositor_.get(); |
| 63 } | 61 } |
| 64 | 62 |
| 65 void TestCompositorHostOzone::Draw() { | |
| 66 if (compositor_.get()) | |
| 67 compositor_->Draw(); | |
| 68 } | |
| 69 | |
| 70 // static | 63 // static |
| 71 TestCompositorHost* TestCompositorHost::Create( | 64 TestCompositorHost* TestCompositorHost::Create( |
| 72 const gfx::Rect& bounds, | 65 const gfx::Rect& bounds, |
| 73 ui::ContextFactory* context_factory) { | 66 ui::ContextFactory* context_factory) { |
| 74 return new TestCompositorHostOzone(bounds, context_factory); | 67 return new TestCompositorHostOzone(bounds, context_factory); |
| 75 } | 68 } |
| 76 | 69 |
| 77 } // namespace ui | 70 } // namespace ui |
| OLD | NEW |