Chromium Code Reviews| Index: cc/raster/tile_task_worker_pool_perftest.cc |
| diff --git a/cc/raster/tile_task_worker_pool_perftest.cc b/cc/raster/tile_task_worker_pool_perftest.cc |
| index d2c7e6c50f29d24207040c3b2ea0200831f99c6a..fee1a08a226039cfa3393dd5892d209c3958ab32 100644 |
| --- a/cc/raster/tile_task_worker_pool_perftest.cc |
| +++ b/cc/raster/tile_task_worker_pool_perftest.cc |
| @@ -88,9 +88,8 @@ class PerfContextProvider : public ContextProvider { |
| if (gr_context_) |
| return gr_context_.get(); |
| - skia::RefPtr<const GrGLInterface> null_interface = |
| - skia::AdoptRef(GrGLCreateNullInterface()); |
| - gr_context_ = skia::AdoptRef(GrContext::Create( |
| + sk_sp<const GrGLInterface> null_interface(GrGLCreateNullInterface()); |
| + gr_context_ = sk_sp<class GrContext>(GrContext::Create( |
| kOpenGL_GrBackend, |
| reinterpret_cast<GrBackendContext>(null_interface.get()))); |
| return gr_context_.get(); |
| @@ -107,8 +106,8 @@ class PerfContextProvider : public ContextProvider { |
| private: |
| ~PerfContextProvider() override {} |
| - std::unique_ptr<PerfGLES2Interface> context_gl_; |
| - skia::RefPtr<class GrContext> gr_context_; |
| + scoped_ptr<PerfGLES2Interface> context_gl_; |
|
danakj
2016/04/14 19:37:32
undo
tomhudson
2016/04/25 20:48:13
Done.
|
| + sk_sp<class GrContext> gr_context_; |
| TestContextSupport support_; |
| base::Lock context_lock_; |
| }; |