diff options
| author | sievers@chromium.org <sievers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-21 10:03:37 +0000 |
|---|---|---|
| committer | sievers@chromium.org <sievers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-21 10:03:37 +0000 |
| commit | 59fe2c3b8b23b8fe3631e8a53d7678d09ef2cb11 (patch) | |
| tree | 8b43ced9cfb5834229880d25b452c643e0d249d8 /cc | |
| parent | 9f3809b09055f98e420d5528cdb4c4868ff8c504 (diff) | |
| download | chromium_src-59fe2c3b8b23b8fe3631e8a53d7678d09ef2cb11.zip chromium_src-59fe2c3b8b23b8fe3631e8a53d7678d09ef2cb11.tar.gz chromium_src-59fe2c3b8b23b8fe3631e8a53d7678d09ef2cb11.tar.bz2 | |
Change WGC3DInProcessCBImpl factories to return a base class pointer.
TBR=sky@chromium.org for ui/aura/bench/bench_main.cc
Review URL: https://chromiumcodereview.appspot.com/17447007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207782 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/test/layer_tree_pixel_test.cc | 8 | ||||
| -rw-r--r-- | cc/test/pixel_test.cc | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/cc/test/layer_tree_pixel_test.cc b/cc/test/layer_tree_pixel_test.cc index b948302..dd7eedf 100644 --- a/cc/test/layer_tree_pixel_test.cc +++ b/cc/test/layer_tree_pixel_test.cc @@ -50,11 +50,9 @@ scoped_ptr<OutputSurface> LayerTreePixelTest::CreateOutputSurface() { using WebKit::WebGraphicsContext3D; using webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl; - scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl> context3d( + output_surface = make_scoped_ptr(new PixelTestOutputSurface( WebGraphicsContext3DInProcessCommandBufferImpl:: - CreateOffscreenContext(WebGraphicsContext3D::Attributes())); - output_surface = make_scoped_ptr( - new PixelTestOutputSurface(context3d.PassAs<WebGraphicsContext3D>())); + CreateOffscreenContext(WebGraphicsContext3D::Attributes()))); break; } } @@ -189,7 +187,7 @@ scoped_ptr<SkBitmap> LayerTreePixelTest::CopyTextureMailboxToBitmap( return scoped_ptr<SkBitmap>(); using webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl; - scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl> context3d( + scoped_ptr<WebKit::WebGraphicsContext3D> context3d( WebGraphicsContext3DInProcessCommandBufferImpl::CreateOffscreenContext( WebKit::WebGraphicsContext3D::Attributes())); diff --git a/cc/test/pixel_test.cc b/cc/test/pixel_test.cc index 6e66002..5d02e58 100644 --- a/cc/test/pixel_test.cc +++ b/cc/test/pixel_test.cc @@ -142,7 +142,7 @@ void PixelTest::SetUpGLRenderer(bool use_skia_gpu_backend) { CHECK(gfx::InitializeGLBindings(gfx::kGLImplementationOSMesaGL)); using webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl; - scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl> context3d( + scoped_ptr<WebKit::WebGraphicsContext3D> context3d( WebGraphicsContext3DInProcessCommandBufferImpl::CreateOffscreenContext( WebKit::WebGraphicsContext3D::Attributes())); output_surface_.reset(new PixelTestOutputSurface( |