Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1184)

Unified Diff: cc/layers/texture_layer_unittest.cc

Issue 132163004: Remove WebGraphicsContext3D getter from cc::ContextProvider (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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 | « no previous file | cc/output/context_provider.h » ('j') | cc/test/layer_tree_test.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 3ae0c2944cd9124d9f97b23239eb79ddbe264cd5..2db505d9ee27129eef9363ff716fbb0a5fb2460e 100644
--- a/cc/layers/texture_layer_unittest.cc
+++ b/cc/layers/texture_layer_unittest.cc
@@ -1198,8 +1198,8 @@ TEST_F(TextureLayerImplWithMailboxTest, TestWillDraw) {
impl_layer->SetDrawsContent(true);
ContextProvider* context_provider =
host_impl_.output_surface()->context_provider();
- unsigned texture =
- context_provider->Context3d()->createTexture();
+ GLuint texture = 0;
+ context_provider->ContextGL()->GenTextures(1, &texture);
impl_layer->set_texture_id(texture);
EXPECT_TRUE(WillDraw(impl_layer.get(), DRAW_MODE_HARDWARE));
}
@@ -1249,8 +1249,8 @@ TEST_F(TextureLayerImplWithMailboxTest, TestWillDraw) {
impl_layer->SetDrawsContent(true);
ContextProvider* context_provider =
host_impl_.output_surface()->context_provider();
- unsigned texture =
- context_provider->Context3d()->createTexture();
+ GLuint texture = 0;
+ context_provider->ContextGL()->GenTextures(1, &texture);
impl_layer->set_texture_id(texture);
EXPECT_FALSE(WillDraw(impl_layer.get(), DRAW_MODE_SOFTWARE));
}
@@ -1280,8 +1280,8 @@ TEST_F(TextureLayerImplWithMailboxTest, TestWillDraw) {
impl_layer->SetDrawsContent(true);
ContextProvider* context_provider =
host_impl_.output_surface()->context_provider();
- unsigned texture =
- context_provider->Context3d()->createTexture();
+ GLuint texture = 0;
+ context_provider->ContextGL()->GenTextures(1, &texture);
impl_layer->set_texture_id(texture);
EXPECT_FALSE(WillDraw(impl_layer.get(), DRAW_MODE_RESOURCELESS_SOFTWARE));
}
@@ -1491,8 +1491,8 @@ class TextureLayerClientTest
private:
TestWebGraphicsContext3D* ContextForImplThread(LayerTreeHostImpl* host_impl) {
- return static_cast<TestWebGraphicsContext3D*>(
- host_impl->output_surface()->context_provider()->Context3d());
+ return static_cast<TestContextProvider*>(
+ host_impl->output_surface()->context_provider().get())->TestContext3d();
}
scoped_refptr<TextureLayer> texture_layer_;
@@ -1653,8 +1653,8 @@ class TextureLayerChangeInvisibleTest
private:
TestWebGraphicsContext3D* ContextForImplThread(LayerTreeHostImpl* host_impl) {
- return static_cast<TestWebGraphicsContext3D*>(
- host_impl->output_surface()->context_provider()->Context3d());
+ return static_cast<TestContextProvider*>(
+ host_impl->output_surface()->context_provider().get())->TestContext3d();
}
scoped_refptr<SolidColorLayer> solid_layer_;
« no previous file with comments | « no previous file | cc/output/context_provider.h » ('j') | cc/test/layer_tree_test.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698