third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.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/Canvas2DLayerBridgeTest.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/Canvas2DLayerBridge.cpp ('K') | « third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.cpp ('k') | third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 859b612f74a5283d8c8fb8c5f25c192547d10e8b..8da75948563745a303c84345427ba63f8207662b 100644

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

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

@@ -40,6 +40,7 @@

#include "testing/gtest/include/gtest/gtest.h"

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

#include "third_party/skia/include/gpu/GrContext.h"

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

#include "third_party/skia/include/gpu/gl/SkNullGLContext.h"

#include "wtf/RefPtr.h"

@@ -157,7 +158,7 @@ protected:

::testing::Mock::VerifyAndClearExpectations(&mainMock);

- unsigned textureId = bridge->newImageSnapshot(PreferAcceleration)->getTextureHandle(true);

+ unsigned textureId = reinterpret_cast<const GrGLTextureInfo*>(bridge->newImageSnapshot(PreferAcceleration)->getTextureHandle(true))->fID;

Daniele Castagna 2015/12/16 19:30:18 nit: line too long? Did you run "git cl format"?

bsalomon 2015/12/16 20:06:36 I did and it didn't produce a diff. Am I wrong tha

EXPECT_EQ(textureId, 0u);

::testing::Mock::VerifyAndClearExpectations(&mainMock);