Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(370)

Side by Side Diff: ui/compositor/test/test_compositor_host_ozone.cc

Issue 359103003: Revert of Make SingleThreadProxy a SchedulerClient (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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
30 gfx::Rect bounds_; 32 gfx::Rect bounds_;
31 33
32 ui::ContextFactory* context_factory_; 34 ui::ContextFactory* context_factory_;
33 35
34 scoped_ptr<ui::Compositor> compositor_; 36 scoped_ptr<ui::Compositor> compositor_;
35 37
36 DISALLOW_COPY_AND_ASSIGN(TestCompositorHostOzone); 38 DISALLOW_COPY_AND_ASSIGN(TestCompositorHostOzone);
37 }; 39 };
38 40
39 TestCompositorHostOzone::TestCompositorHostOzone( 41 TestCompositorHostOzone::TestCompositorHostOzone(
(...skipping 13 matching lines...) Expand all
53 // TODO(rjkroege): Use a "real" ozone widget when it is 55 // TODO(rjkroege): Use a "real" ozone widget when it is
54 // available: http://crbug.com/255128 56 // available: http://crbug.com/255128
55 compositor_.reset(new ui::Compositor(1, context_factory_)); 57 compositor_.reset(new ui::Compositor(1, context_factory_));
56 compositor_->SetScaleAndSize(1.0f, bounds_.size()); 58 compositor_->SetScaleAndSize(1.0f, bounds_.size());
57 } 59 }
58 60
59 ui::Compositor* TestCompositorHostOzone::GetCompositor() { 61 ui::Compositor* TestCompositorHostOzone::GetCompositor() {
60 return compositor_.get(); 62 return compositor_.get();
61 } 63 }
62 64
65 void TestCompositorHostOzone::Draw() {
66 if (compositor_.get())
67 compositor_->Draw();
68 }
69
63 // static 70 // static
64 TestCompositorHost* TestCompositorHost::Create( 71 TestCompositorHost* TestCompositorHost::Create(
65 const gfx::Rect& bounds, 72 const gfx::Rect& bounds,
66 ui::ContextFactory* context_factory) { 73 ui::ContextFactory* context_factory) {
67 return new TestCompositorHostOzone(bounds, context_factory); 74 return new TestCompositorHostOzone(bounds, context_factory);
68 } 75 }
69 76
70 } // namespace ui 77 } // namespace ui
OLDNEW
« no previous file with comments | « ui/compositor/test/test_compositor_host_mac.mm ('k') | ui/compositor/test/test_compositor_host_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698