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

Unified Diff: src/image/SkImage_Raster.cpp

Issue 461043002: Revert of SkImage_Codec is Lazy (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 4 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
« no previous file with comments | « src/image/SkImage_Codec.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/image/SkImage_Raster.cpp
diff --git a/src/image/SkImage_Raster.cpp b/src/image/SkImage_Raster.cpp
index 4841dae25c2a1c64b077fe4361cc29878f46698d..e4768af0ac17865da8e8bbd22881e57a6660439e 100644
--- a/src/image/SkImage_Raster.cpp
+++ b/src/image/SkImage_Raster.cpp
@@ -10,7 +10,6 @@
#include "SkBitmap.h"
#include "SkCanvas.h"
#include "SkData.h"
-#include "SkDecodingImageGenerator.h"
#include "SkMallocPixelRef.h"
class SkImage_Raster : public SkImage_Base {
@@ -70,10 +69,6 @@
SkShader::TileMode,
const SkMatrix* localMatrix) const SK_OVERRIDE;
- SkImage_Raster(const SkBitmap& bitmap)
- :INHERITED(bitmap.width(), bitmap.height())
- , fBitmap(bitmap) { }
-
private:
SkImage_Raster() : INHERITED(0, 0) {}
@@ -211,17 +206,3 @@
SkPixelRef* SkBitmapImageGetPixelRef(SkImage* image) {
return ((SkImage_Raster*)image)->getPixelRef();
}
-
-SkImage* SkImage::NewEncodedData(SkData* data) {
- if (NULL == data) {
- return NULL;
- }
- SkBitmap bitmap;
- if (!SkInstallDiscardablePixelRef(
- SkDecodingImageGenerator::Create(
- data, SkDecodingImageGenerator::Options()),
- &bitmap)) {
- return NULL;
- }
- return SkNEW_ARGS(SkImage_Raster, (bitmap));
-}
« no previous file with comments | « src/image/SkImage_Codec.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698