OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 "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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
78 } | 78 } |
79 compositor_.reset(new ui::Compositor(this, window_)); | 79 compositor_.reset(new ui::Compositor(this, window_)); |
80 compositor_->SetScaleAndSize(1.0f, bounds_.size()); | 80 compositor_->SetScaleAndSize(1.0f, bounds_.size()); |
81 } | 81 } |
82 | 82 |
83 ui::Compositor* TestCompositorHostLinux::GetCompositor() { | 83 ui::Compositor* TestCompositorHostLinux::GetCompositor() { |
84 return compositor_.get(); | 84 return compositor_.get(); |
85 } | 85 } |
86 | 86 |
87 void TestCompositorHostLinux::ScheduleDraw() { | 87 void TestCompositorHostLinux::ScheduleDraw() { |
| 88 DCHECK(!ui::Compositor::WasInitializedWithThread()); |
88 if (!method_factory_.HasWeakPtrs()) { | 89 if (!method_factory_.HasWeakPtrs()) { |
89 MessageLoopForUI::current()->PostTask( | 90 MessageLoopForUI::current()->PostTask( |
90 FROM_HERE, | 91 FROM_HERE, |
91 base::Bind(&TestCompositorHostLinux::Draw, | 92 base::Bind(&TestCompositorHostLinux::Draw, |
92 method_factory_.GetWeakPtr())); | 93 method_factory_.GetWeakPtr())); |
93 } | 94 } |
94 } | 95 } |
95 | 96 |
96 void TestCompositorHostLinux::Draw() { | 97 void TestCompositorHostLinux::Draw() { |
97 if (compositor_.get()) | 98 if (compositor_.get()) |
98 compositor_->Draw(false); | 99 compositor_->Draw(false); |
99 } | 100 } |
100 | 101 |
101 // static | 102 // static |
102 TestCompositorHost* TestCompositorHost::Create(const gfx::Rect& bounds) { | 103 TestCompositorHost* TestCompositorHost::Create(const gfx::Rect& bounds) { |
103 return new TestCompositorHostLinux(bounds); | 104 return new TestCompositorHostLinux(bounds); |
104 } | 105 } |
105 | 106 |
106 } // namespace ui | 107 } // namespace ui |
OLD | NEW |