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

Unified Diff: Source/platform/graphics/gpu/WebGLImageConversion.h

Issue 1001703003: Take NativeImageSkia out behind the woodshed. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Switch to skia-style API (return bool instead of SkBitmap) Created 5 years, 9 months 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: Source/platform/graphics/gpu/WebGLImageConversion.h
diff --git a/Source/platform/graphics/gpu/WebGLImageConversion.h b/Source/platform/graphics/gpu/WebGLImageConversion.h
index 7a42a6077352759a60f92b779b4daa037d702fb9..66098aea6400de59515e460fcd55d802774a27da 100644
--- a/Source/platform/graphics/gpu/WebGLImageConversion.h
+++ b/Source/platform/graphics/gpu/WebGLImageConversion.h
@@ -9,6 +9,7 @@
#include "platform/graphics/Image.h"
#include "third_party/khronos/GLES2/gl2.h"
#include "third_party/khronos/GLES2/gl2ext.h"
+#include "third_party/skia/include/core/SkBitmap.h"
#include "wtf/RefPtr.h"
namespace blink {
@@ -95,8 +96,8 @@ public:
// This needs to lock the resources or relevant data if needed and return true upon success
bool extractImage(bool premultiplyAlpha, bool ignoreGammaAndColorProfile);
- RefPtr<NativeImageSkia> m_nativeImage;
- RefPtr<NativeImageSkia> m_skiaImage;
+ SkBitmap m_bitmap;
+ SkBitmap m_skiaBitmap;
Image* m_image;
ImageHtmlDomSource m_imageHtmlDomSource;
bool m_extractSucceeded;
« no previous file with comments | « Source/platform/graphics/StaticBitmapImage.cpp ('k') | Source/platform/graphics/gpu/WebGLImageConversion.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698