diff options
author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-07 21:43:16 +0000 |
---|---|---|
committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-07 21:43:16 +0000 |
commit | a46f329337fb3568d73453a28e23124933b8fda7 (patch) | |
tree | ff3f80e9527604104b6b47341ba89c0ebef870ba /cc/resource_update_controller_unittest.cc | |
parent | f850763f96d4b98b4ebf8fa0270b3ac77da169e7 (diff) | |
download | chromium_src-a46f329337fb3568d73453a28e23124933b8fda7.zip chromium_src-a46f329337fb3568d73453a28e23124933b8fda7.tar.gz chromium_src-a46f329337fb3568d73453a28e23124933b8fda7.tar.bz2 |
cc: Move WebCompositorOutputSurface and related classes into cc/
This moves:
- WebKit::WebCompositorOutputSurface to cc::OutputSurface
- WebKit::WebCompositorOutputSurfaceClient to cc::OutputSurfaceClient
- Webkit::WebCompositorSoftwareOutputDevice to cc::SoftwareOutputDevice
They become new files in cc/ so they are chromified style. This affects
the various call-sites. This allows us to pass cc::CompositorFrame
directly, without any need for WebCompositorFrame.
BUG=146080
Depends on: https://bugs.webkit.org/show_bug.cgi?id=103967
Review URL: https://codereview.chromium.org/11348371
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171847 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/resource_update_controller_unittest.cc')
-rw-r--r-- | cc/resource_update_controller_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/resource_update_controller_unittest.cc b/cc/resource_update_controller_unittest.cc index 4b324b6..3056f6e 100644 --- a/cc/resource_update_controller_unittest.cc +++ b/cc/resource_update_controller_unittest.cc @@ -5,8 +5,8 @@ #include "cc/resource_update_controller.h" #include "cc/single_thread_proxy.h" // For DebugScopedSetImplThread +#include "cc/test/fake_output_surface.h" #include "cc/test/fake_proxy.h" -#include "cc/test/fake_web_compositor_output_surface.h" #include "cc/test/fake_web_graphics_context_3d.h" #include "cc/test/scheduler_test_common.h" #include "cc/test/tiled_layer_test_common.h" @@ -121,7 +121,7 @@ public: protected: virtual void SetUp() { - m_outputSurface = FakeWebCompositorOutputSurface::create(scoped_ptr<WebKit::WebGraphicsContext3D>(new WebGraphicsContext3DForUploadTest(this))); + m_outputSurface = FakeOutputSurface::Create3d(scoped_ptr<WebKit::WebGraphicsContext3D>(new WebGraphicsContext3DForUploadTest(this))); m_bitmap.setConfig(SkBitmap::kARGB_8888_Config, 300, 150); m_bitmap.allocPixels(); |