| Index: ui/gfx/compositor/test_compositor.cc
|
| diff --git a/ui/gfx/compositor/test_compositor.cc b/ui/gfx/compositor/test_compositor.cc
|
| index 311a9239b6c27ed4e1a07712803aafa3109c74d4..65703182132c95570875ff9d1edeed7a9c23ad78 100644
|
| --- a/ui/gfx/compositor/test_compositor.cc
|
| +++ b/ui/gfx/compositor/test_compositor.cc
|
| @@ -19,9 +19,11 @@ class TestCompositorDelegate : public ui::CompositorDelegate {
|
| DISALLOW_COPY_AND_ASSIGN(TestCompositorDelegate);
|
| };
|
|
|
| -TestCompositor::TestCompositor()
|
| - : Compositor(new TestCompositorDelegate, gfx::Size(100, 100)) {
|
| - owned_delegate_.reset(static_cast<TestCompositorDelegate*>(delegate()));
|
| +TestCompositor::TestCompositor(CompositorDelegate *owner)
|
| + : Compositor((owner ? owner : new TestCompositorDelegate),
|
| + gfx::Size(100, 100)) {
|
| + if (!owner)
|
| + owned_delegate_.reset(static_cast<TestCompositorDelegate*>(delegate()));
|
| }
|
|
|
| TestCompositor::~TestCompositor() {
|
| @@ -40,6 +42,10 @@ void TestCompositor::OnNotifyEnd() {
|
| void TestCompositor::Blur(const gfx::Rect& bounds) {
|
| }
|
|
|
| +ui::Compositor* TestCompositor::Create(ui::CompositorDelegate* owner) {
|
| + return new ui::TestCompositor(owner);
|
| +}
|
| +
|
| void TestCompositor::OnWidgetSizeChanged() {
|
| }
|
|
|
|
|