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 #ifndef CC_TEST_FAKE_GRAPHICS_CONTEXT_H_ | 5 #ifndef CC_TEST_FAKE_GRAPHICS_CONTEXT_H_ |
6 #define CC_TEST_FAKE_GRAPHICS_CONTEXT_H_ | 6 #define CC_TEST_FAKE_GRAPHICS_CONTEXT_H_ |
7 | 7 |
8 #include "cc/graphics_context.h" | 8 #include "cc/graphics_context.h" |
9 #include "cc/test/compositor_fake_web_graphics_context_3d.h" | 9 #include "cc/test/compositor_fake_web_graphics_context_3d.h" |
10 #include "cc/test/fake_web_compositor_output_surface.h" | 10 #include "cc/test/fake_output_surface.h" |
11 #include <public/WebCompositorOutputSurface.h> | |
12 | 11 |
13 namespace WebKit { | 12 namespace WebKit { |
jamesr
2012/12/04 07:06:51
whaaa?
danakj
2012/12/04 18:15:34
ya.. changed to cc!
We have a bunch of namespace
| |
14 | 13 |
15 static inline scoped_ptr<cc::GraphicsContext> createFakeGraphicsContext() | 14 static inline scoped_ptr<cc::GraphicsContext> createFakeGraphicsContext() |
16 { | 15 { |
17 return FakeWebCompositorOutputSurface::create(CompositorFakeWebGraphicsConte xt3D::create(WebGraphicsContext3D::Attributes()).PassAs<WebKit::WebGraphicsConte xt3D>()).PassAs<cc::GraphicsContext>(); | 16 return cc::FakeOutputSurface::Create(CompositorFakeWebGraphicsContext3D::creat e(WebGraphicsContext3D::Attributes()).PassAs<WebKit::WebGraphicsContext3D>()).Pa ssAs<cc::GraphicsContext>(); |
18 } | 17 } |
19 | 18 |
20 } // namespace WebKit | 19 } // namespace WebKit |
21 | 20 |
22 #endif // CC_TEST_FAKE_GRAPHICS_CONTEXT_H_ | 21 #endif // CC_TEST_FAKE_GRAPHICS_CONTEXT_H_ |
OLD | NEW |