third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp - Issue 1508903002: Use GrGLTextureInfo for Skia texture handles.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp

Issue 1508903002: Use GrGLTextureInfo for Skia texture handles. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ignore_gl_target

Patch Set: Address dcastagna's comments Created 5 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

« third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.cpp ('K') | « third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp

diff --git a/third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp b/third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp

index 53c7d44fc560980b3cbf55031099720b0337c3f1..c012260156872f59c36a888650896ce118a37194 100644

--- a/third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp

+++ b/third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp

@@ -52,6 +52,7 @@

#include "public/platform/WebGraphicsContext3D.h"

#include "public/platform/WebGraphicsContext3DProvider.h"

#include "third_party/skia/include/core/SkPicture.h"

+#include "third_party/skia/include/gpu/gl/GrGLTypes.h"

#include "wtf/ArrayBufferContents.h"

#include "wtf/MathExtras.h"

#include "wtf/Vector.h"

@@ -194,7 +195,7 @@ bool ImageBuffer::copyToPlatformTexture(WebGraphicsContext3D* context, Platform3

ASSERT(textureImage->isTextureBacked()); // isAccelerated() check above should guarantee this

// Get the texture ID, flushing pending operations if needed.

- Platform3DObject textureId = textureImage->getTextureHandle(true);

+ Platform3DObject textureId = reinterpret_cast<const GrGLTextureInfo*>(textureImage->getTextureHandle(true))->fID;

if (!textureId)

return false;