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

Side by Side Diff: src/images/SkMovie.cpp

Issue 849103004: Make SkStream *not* ref counted. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Rebase, just in case. 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 unified diff | Download patch
« no previous file with comments | « src/images/SkJpegUtility.cpp ('k') | src/pdf/SkPDFFont.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 1
2 /* 2 /*
3 * Copyright 2011 Google Inc. 3 * Copyright 2011 Google Inc.
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 #include "SkMovie.h" 8 #include "SkMovie.h"
9 #include "SkCanvas.h" 9 #include "SkCanvas.h"
10 #include "SkPaint.h" 10 #include "SkPaint.h"
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 //////////////////////////////////////////////////////////////////// 83 ////////////////////////////////////////////////////////////////////
84 84
85 #include "SkStream.h" 85 #include "SkStream.h"
86 86
87 SkMovie* SkMovie::DecodeMemory(const void* data, size_t length) { 87 SkMovie* SkMovie::DecodeMemory(const void* data, size_t length) {
88 SkMemoryStream stream(data, length, false); 88 SkMemoryStream stream(data, length, false);
89 return SkMovie::DecodeStream(&stream); 89 return SkMovie::DecodeStream(&stream);
90 } 90 }
91 91
92 SkMovie* SkMovie::DecodeFile(const char path[]) { 92 SkMovie* SkMovie::DecodeFile(const char path[]) {
93 SkAutoTUnref<SkStreamRewindable> stream(SkStream::NewFromFile(path)); 93 SkAutoTDelete<SkStreamRewindable> stream(SkStream::NewFromFile(path));
94 return stream.get() ? SkMovie::DecodeStream(stream) : NULL; 94 return stream.get() ? SkMovie::DecodeStream(stream) : NULL;
95 } 95 }
OLDNEW
« no previous file with comments | « src/images/SkJpegUtility.cpp ('k') | src/pdf/SkPDFFont.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698