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

Unified Diff: cc/test/test_context_provider.cc

Issue 93433004: Use GLES2Interface for shaders and programs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix android_aosp warning Created 7 years 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/test/test_context_provider.h ('k') | cc/test/test_gles2_interface.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/test_context_provider.cc
diff --git a/cc/test/test_context_provider.cc b/cc/test/test_context_provider.cc
index 8484b38f8901aa45c37fc7cf3f31884f313cd772..501570bc314006632ba73479e227f496172def3c 100644
--- a/cc/test/test_context_provider.cc
+++ b/cc/test/test_context_provider.cc
@@ -11,6 +11,7 @@
#include "base/callback_helpers.h"
#include "base/logging.h"
#include "base/strings/string_split.h"
+#include "cc/test/test_gles2_interface.h"
#include "cc/test/test_web_graphics_context_3d.h"
namespace cc {
@@ -72,6 +73,7 @@ scoped_refptr<TestContextProvider> TestContextProvider::Create(
TestContextProvider::TestContextProvider(
scoped_ptr<TestWebGraphicsContext3D> context)
: context3d_(context.Pass()),
+ context_gl_(new TestGLES2Interface(context3d_.get())),
bound_(false),
destroyed_(false) {
DCHECK(main_thread_checker_.CalledOnValidThread());
@@ -125,7 +127,7 @@ gpu::gles2::GLES2Interface* TestContextProvider::ContextGL() {
DCHECK(bound_);
DCHECK(context_thread_checker_.CalledOnValidThread());
- return &context_gl_stub_;
+ return context_gl_.get();
}
gpu::ContextSupport* TestContextProvider::ContextSupport() {
« no previous file with comments | « cc/test/test_context_provider.h ('k') | cc/test/test_gles2_interface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698