diff options
| author |  halcanary <halcanary@google.com> | 2014-06-27 11:36:20 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-06-27 11:36:20 -0700 |
| commit | 67ec1f8eecfb48bc0a6ba04c0057f103c1c9696f (patch) | |
| tree | 44826f6816c7d0ca8f1fdd7f92e2a70f0dd33e1d /src/images/SkImageDecoder_libico.cpp | |
| parent | 89443aba5bfa2b040dc9fd24938b7d0b3decd737 (diff) | |
Switch SkPDFStream's internal storage from SkStream to SkData
Motivation: This makes SkPDFStream thread-safe for two threads
serializing it at once, since a SkStream has an internal position.
Updated SkPDFFont, SkPDFGraphicState, and SkPDFPage's use of
SkPDFStream to use the SkData constructor rather than the SkStream
constructor (saving a memcpy).
BUG=skia:2683
Committed: https://skia.googlesource.com/skia/+/c1dfa14b645ae274780f026dd86c9b633fbdad06
R=mtklein@google.com, djsollen@google.com, rmistry@google.com, robertphillips@google.com
Author: halcanary@google.com
Review URL: https://codereview.chromium.org/340783013
Diffstat (limited to 'src/images/SkImageDecoder_libico.cpp')
| -rw-r--r-- | src/images/SkImageDecoder_libico.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/images/SkImageDecoder_libico.cpp b/src/images/SkImageDecoder_libico.cpp index e6ae16f0bd..d415d2be6d 100644 --- a/src/images/SkImageDecoder_libico.cpp +++ b/src/images/SkImageDecoder_libico.cpp @@ -8,7 +8,7 @@ #include "SkColorPriv.h" #include "SkImageDecoder.h" #include "SkStream.h" -#include "SkStreamHelpers.h" +#include "SkStreamPriv.h" #include "SkTypes.h" class SkICOImageDecoder : public SkImageDecoder { @@ -75,7 +75,7 @@ static int calculateRowBytesFor8888(int w, int bitCount) bool SkICOImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) { SkAutoMalloc autoMal; - const size_t length = CopyStreamToStorage(&autoMal, stream); + const size_t length = SkCopyStreamToStorage(&autoMal, stream); if (0 == length) { return false; } |