| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "cc/test/fake_layer_tree_host_client.h" | 5 #include "cc/test/fake_layer_tree_host_client.h" |
| 6 | 6 |
| 7 namespace cc { | 7 namespace cc { |
| 8 | 8 |
| 9 scoped_ptr<WebKit::WebCompositorOutputSurface> FakeLayerImplTreeHostClient::crea
teOutputSurface() | 9 scoped_ptr<OutputSurface> FakeLayerImplTreeHostClient::createOutputSurface() |
| 10 { | 10 { |
| 11 if (m_useSoftwareRendering) { | 11 if (m_useSoftwareRendering) { |
| 12 return WebKit::FakeWebCompositorOutputSurface::createSoftware(make_scope
d_ptr(new WebKit::FakeWebCompositorSoftwareOutputDevice).PassAs<WebKit::WebCompo
sitorSoftwareOutputDevice>()).PassAs<WebKit::WebCompositorOutputSurface>(); | 12 return FakeOutputSurface::CreateSoftware(make_scoped_ptr(new FakeSoftwar
eOutputDevice).PassAs<SoftwareOutputDevice>()).PassAs<OutputSurface>(); |
| 13 } | 13 } |
| 14 | 14 |
| 15 WebKit::WebGraphicsContext3D::Attributes attrs; | 15 WebKit::WebGraphicsContext3D::Attributes attrs; |
| 16 return WebKit::FakeWebCompositorOutputSurface::create(WebKit::CompositorFake
WebGraphicsContext3D::create(attrs).PassAs<WebKit::WebGraphicsContext3D>()).Pass
As<WebKit::WebCompositorOutputSurface>(); | 16 return FakeOutputSurface::Create3d(WebKit::CompositorFakeWebGraphicsContext3
D::create(attrs).PassAs<WebKit::WebGraphicsContext3D>()).PassAs<OutputSurface>()
; |
| 17 } | 17 } |
| 18 | 18 |
| 19 scoped_ptr<InputHandler> FakeLayerImplTreeHostClient::createInputHandler() | 19 scoped_ptr<InputHandler> FakeLayerImplTreeHostClient::createInputHandler() |
| 20 { | 20 { |
| 21 return scoped_ptr<InputHandler>(); | 21 return scoped_ptr<InputHandler>(); |
| 22 } | 22 } |
| 23 | 23 |
| 24 scoped_ptr<FontAtlas> FakeLayerImplTreeHostClient::createFontAtlas() | 24 scoped_ptr<FontAtlas> FakeLayerImplTreeHostClient::createFontAtlas() |
| 25 { | 25 { |
| 26 return scoped_ptr<FontAtlas>(); | 26 return scoped_ptr<FontAtlas>(); |
| 27 } | 27 } |
| 28 | 28 |
| 29 } | 29 } |
| OLD | NEW |