cc/layers/texture_layer_unittest.cc - Issue 20185002: ContextProvider in OutputSurface

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: cc/layers/texture_layer_unittest.cc

Issue 20185002: ContextProvider in OutputSurface (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: contextprovider: fix android output surface impls Created 7 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « cc/layers/picture_layer_impl_unittest.cc ('k') | cc/layers/tiled_layer_unittest.cc » ('j') | content/browser/renderer_host/compositor_impl_android.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: cc/layers/texture_layer_unittest.cc

diff --git a/cc/layers/texture_layer_unittest.cc b/cc/layers/texture_layer_unittest.cc

index 744bf004956332f54f70dbc15bf0be6a892ad8f6..46f9d5138b2da336c11c5332c4813670c46bbf2b 100644

--- a/cc/layers/texture_layer_unittest.cc

+++ b/cc/layers/texture_layer_unittest.cc

@@ -620,8 +620,10 @@ TEST_F(TextureLayerImplWithMailboxTest, TestWillDraw) {

{

scoped_ptr<TextureLayerImpl> impl_layer =

TextureLayerImpl::Create(host_impl_.active_tree(), 1, false);

+ ContextProvider* context_provider =

+ host_impl_.output_surface()->context_provider();

unsigned texture =

- host_impl_.output_surface()->context3d()->createTexture();

+ context_provider->Context3d()->createTexture();

impl_layer->set_texture_id(texture);

EXPECT_TRUE(WillDraw(impl_layer.get(), DRAW_MODE_HARDWARE));

}

@@ -659,8 +661,10 @@ TEST_F(TextureLayerImplWithMailboxTest, TestWillDraw) {

{

scoped_ptr<TextureLayerImpl> impl_layer =

TextureLayerImpl::Create(host_impl_.active_tree(), 1, false);

+ ContextProvider* context_provider =

+ host_impl_.output_surface()->context_provider();

unsigned texture =

- host_impl_.output_surface()->context3d()->createTexture();

+ context_provider->Context3d()->createTexture();

impl_layer->set_texture_id(texture);

EXPECT_FALSE(WillDraw(impl_layer.get(), DRAW_MODE_SOFTWARE));

}

@@ -683,8 +687,10 @@ TEST_F(TextureLayerImplWithMailboxTest, TestWillDraw) {

{

scoped_ptr<TextureLayerImpl> impl_layer =

TextureLayerImpl::Create(host_impl_.active_tree(), 1, false);

+ ContextProvider* context_provider =

+ host_impl_.output_surface()->context_provider();

unsigned texture =

- host_impl_.output_surface()->context3d()->createTexture();

+ context_provider->Context3d()->createTexture();

impl_layer->set_texture_id(texture);

EXPECT_FALSE(WillDraw(impl_layer.get(), DRAW_MODE_RESOURCELESS_SOFTWARE));

}

@@ -801,8 +807,7 @@ class TextureLayerClientTest

TestWebGraphicsContext3D::Create());

context_ = context.get();

texture_ = context->createTexture();

- return FakeOutputSurface::Create3d(

- context.PassAs<WebKit::WebGraphicsContext3D>()).PassAs<OutputSurface>();

+ return FakeOutputSurface::Create3d(context.Pass()).PassAs<OutputSurface>();

}

virtual unsigned PrepareTexture() OVERRIDE {

« no previous file with comments | « cc/layers/picture_layer_impl_unittest.cc ('k') | cc/layers/tiled_layer_unittest.cc » ('j') | content/browser/renderer_host/compositor_impl_android.cc » ('J')