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

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

Issue 638653003: Make ui::Compositor use ui::Scheduler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 10 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
« no previous file with comments | « ui/compositor/test/test_compositor_host_win.cc ('k') | ui/snapshot/snapshot_aura_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <X11/Xlib.h> 7 #include <X11/Xlib.h>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 12 matching lines...) Expand all
23 public: 23 public:
24 TestCompositorHostX11(const gfx::Rect& bounds, 24 TestCompositorHostX11(const gfx::Rect& bounds,
25 ui::ContextFactory* context_factory); 25 ui::ContextFactory* context_factory);
26 ~TestCompositorHostX11() override; 26 ~TestCompositorHostX11() override;
27 27
28 private: 28 private:
29 // Overridden from TestCompositorHost: 29 // Overridden from TestCompositorHost:
30 void Show() override; 30 void Show() override;
31 ui::Compositor* GetCompositor() override; 31 ui::Compositor* GetCompositor() override;
32 32
33 void Draw();
34
35 gfx::Rect bounds_; 33 gfx::Rect bounds_;
36 34
37 ui::ContextFactory* context_factory_; 35 ui::ContextFactory* context_factory_;
38 36
39 scoped_ptr<ui::Compositor> compositor_; 37 scoped_ptr<ui::Compositor> compositor_;
40 38
41 XID window_; 39 XID window_;
42 40
43 DISALLOW_COPY_AND_ASSIGN(TestCompositorHostX11); 41 DISALLOW_COPY_AND_ASSIGN(TestCompositorHostX11);
44 }; 42 };
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 compositor_.reset(new ui::Compositor(window_, 76 compositor_.reset(new ui::Compositor(window_,
79 context_factory_, 77 context_factory_,
80 base::ThreadTaskRunnerHandle::Get())); 78 base::ThreadTaskRunnerHandle::Get()));
81 compositor_->SetScaleAndSize(1.0f, bounds_.size()); 79 compositor_->SetScaleAndSize(1.0f, bounds_.size());
82 } 80 }
83 81
84 ui::Compositor* TestCompositorHostX11::GetCompositor() { 82 ui::Compositor* TestCompositorHostX11::GetCompositor() {
85 return compositor_.get(); 83 return compositor_.get();
86 } 84 }
87 85
88 void TestCompositorHostX11::Draw() {
89 if (compositor_.get())
90 compositor_->Draw();
91 }
92
93 // static 86 // static
94 TestCompositorHost* TestCompositorHost::Create( 87 TestCompositorHost* TestCompositorHost::Create(
95 const gfx::Rect& bounds, 88 const gfx::Rect& bounds,
96 ui::ContextFactory* context_factory) { 89 ui::ContextFactory* context_factory) {
97 return new TestCompositorHostX11(bounds, context_factory); 90 return new TestCompositorHostX11(bounds, context_factory);
98 } 91 }
99 92
100 } // namespace ui 93 } // namespace ui
OLDNEW
« no previous file with comments | « ui/compositor/test/test_compositor_host_win.cc ('k') | ui/snapshot/snapshot_aura_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698