| Index: cc/resources/resource_provider.cc
|
| diff --git a/cc/resources/resource_provider.cc b/cc/resources/resource_provider.cc
|
| index cc639230651fcaf58c0cb5581601de9123f55bfe..1506bd18ffc8bc1f991ebd1d048741d4eff29a1d 100644
|
| --- a/cc/resources/resource_provider.cc
|
| +++ b/cc/resources/resource_provider.cc
|
| @@ -32,6 +32,7 @@
|
| #include "third_party/skia/include/core/SkSurface.h"
|
| #include "third_party/skia/include/gpu/GrContext.h"
|
| #include "third_party/skia/include/gpu/GrTextureProvider.h"
|
| +#include "third_party/skia/include/gpu/gl/GrGLTypes.h"
|
| #include "ui/gfx/geometry/rect.h"
|
| #include "ui/gfx/geometry/vector2d.h"
|
| #include "ui/gl/trace_util.h"
|
| @@ -959,13 +960,16 @@ void ResourceProvider::ScopedWriteLockGr::InitSkSurface(
|
| int msaa_sample_count) {
|
| DCHECK(resource_->locked_for_write);
|
|
|
| + GrGLTextureInfo texture_info;
|
| + texture_info.fID = resource_->gl_id;
|
| + texture_info.fTarget = resource_->target;
|
| GrBackendTextureDesc desc;
|
| desc.fFlags = kRenderTarget_GrBackendTextureFlag;
|
| desc.fWidth = resource_->size.width();
|
| desc.fHeight = resource_->size.height();
|
| desc.fConfig = ToGrPixelConfig(resource_->format);
|
| desc.fOrigin = kTopLeft_GrSurfaceOrigin;
|
| - desc.fTextureHandle = resource_->gl_id;
|
| + desc.fTextureHandle = reinterpret_cast<GrBackendObject>(&texture_info);
|
| desc.fSampleCnt = msaa_sample_count;
|
|
|
| bool use_worker_context = true;
|
|
|