Chromium Code Reviews| Index: cc/test/test_context_provider.cc |
| diff --git a/cc/test/test_context_provider.cc b/cc/test/test_context_provider.cc |
| index 734ef790c1aa2a8e5702746ddf0b36bf37f817c0..96a89f778024e1caa255e718c55553fce6335499 100644 |
| --- a/cc/test/test_context_provider.cc |
| +++ b/cc/test/test_context_provider.cc |
| @@ -16,7 +16,7 @@ |
| #include "cc/test/test_gles2_interface.h" |
| #include "cc/test/test_web_graphics_context_3d.h" |
| #include "third_party/skia/include/gpu/GrContext.h" |
| -#include "third_party/skia/include/gpu/gl/SkNullGLContext.h" |
| +#include "third_party/skia/include/gpu/gl/GrGLInterface.h" |
| namespace cc { |
| @@ -112,10 +112,10 @@ class GrContext* TestContextProvider::GrContext() { |
| if (gr_context_) |
| return gr_context_.get(); |
| - scoped_ptr<class SkGLContext> gl_context(SkNullGLContext::Create()); |
| - gl_context->makeCurrent(); |
| + auto gl_interface = skia::AdoptRef(GrGLCreateNullInterface()); |
|
danakj
2016/03/25 18:09:36
re: past chromium-dev threads, don't use auto for
bsalomon
2016/03/25 19:02:45
Done.
|
| gr_context_ = skia::AdoptRef(GrContext::Create( |
| - kOpenGL_GrBackend, reinterpret_cast<GrBackendContext>(gl_context->gl()))); |
| + kOpenGL_GrBackend, |
| + reinterpret_cast<GrBackendContext>(gl_interface.get()))); |
| // If GlContext is already lost, also abandon the new GrContext. |
| if (ContextGL()->GetGraphicsResetStatusKHR() != GL_NO_ERROR) |