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

Unified Diff: dm/DMImageTask.cpp

Issue 849103004: Make SkStream *not* ref counted. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Treat SkFontMgr::createFromStream as taking ownership of the stream (is this correct?) Created 5 years, 11 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 | « dm/DM.cpp ('k') | dm/DMPDFRasterizeTask.cpp » ('j') | gm/gmmain.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: dm/DMImageTask.cpp
diff --git a/dm/DMImageTask.cpp b/dm/DMImageTask.cpp
index 1657984f1ee71d6ed4956320142aa9f1bf053619..6fb7f7d613f1deecb968237a315e1883a589cad2 100644
--- a/dm/DMImageTask.cpp
+++ b/dm/DMImageTask.cpp
@@ -38,14 +38,15 @@ void ImageTask::draw() {
return;
}
- SkMemoryStream stream(fEncoded->data(), fEncoded->size());
- SkAutoTDelete<SkImageDecoder> decoder(SkImageDecoder::Factory(&stream));
+ SkAutoTDelete<SkMemoryStream> stream(SkNEW_ARGS(SkMemoryStream,
+ (fEncoded->data(), fEncoded->size())));
+ SkAutoTDelete<SkImageDecoder> decoder(SkImageDecoder::Factory(stream));
if (!decoder) {
return this->fail("Can't find good decoder.");
}
int w,h;
- if (!decoder->buildTileIndex(&stream, &w, &h) || w*h == 1) {
+ if (!decoder->buildTileIndex(stream.detach(), &w, &h) || w*h == 1) {
return; // Subset decoding is not always supported.
}
« no previous file with comments | « dm/DM.cpp ('k') | dm/DMPDFRasterizeTask.cpp » ('j') | gm/gmmain.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698