Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1092)

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: Fix Canvas2DLayerBridgeTest.FullLifecycleSingleThreaded test 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
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..c61b829a4ecddf041ce801ae2e0fd5bd8ed1aac4 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,8 +158,8 @@ protected:
::testing::Mock::VerifyAndClearExpectations(&mainMock);
- unsigned textureId = bridge->newImageSnapshot(PreferAcceleration)->getTextureHandle(true);
- EXPECT_EQ(textureId, 0u);
+ const GrGLTextureInfo* textureInfo = reinterpret_cast<const GrGLTextureInfo*>(bridge->newImageSnapshot(PreferAcceleration)->getTextureHandle(true));
+ EXPECT_EQ(textureInfo, nullptr);
::testing::Mock::VerifyAndClearExpectations(&mainMock);
} // bridge goes out of scope here

Powered by Google App Engine
This is Rietveld 408576698