| OLD | NEW |
| 1 | 1 |
| 2 /* | 2 /* |
| 3 * Copyright 2006 The Android Open Source Project | 3 * Copyright 2006 The Android Open Source Project |
| 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 | 8 |
| 9 | 9 |
| 10 #include "SkDrawBitmap.h" | 10 #include "SkDrawBitmap.h" |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 123 SK_MEMBER(base64, Base64), | 123 SK_MEMBER(base64, Base64), |
| 124 SK_MEMBER_PROPERTY(height, Int), | 124 SK_MEMBER_PROPERTY(height, Int), |
| 125 SK_MEMBER(src, String), | 125 SK_MEMBER(src, String), |
| 126 SK_MEMBER_PROPERTY(width, Int) | 126 SK_MEMBER_PROPERTY(width, Int) |
| 127 }; | 127 }; |
| 128 | 128 |
| 129 #endif | 129 #endif |
| 130 | 130 |
| 131 DEFINE_GET_MEMBER(SkImageBaseBitmap); | 131 DEFINE_GET_MEMBER(SkImageBaseBitmap); |
| 132 | 132 |
| 133 SkImageBaseBitmap::SkImageBaseBitmap() : fDirty(true), fUriBase(NULL) { | 133 SkImageBaseBitmap::SkImageBaseBitmap() : fDirty(true), fUriBase(nullptr) { |
| 134 base64.fData = NULL; | 134 base64.fData = nullptr; |
| 135 base64.fLength = 0; | 135 base64.fLength = 0; |
| 136 } | 136 } |
| 137 | 137 |
| 138 SkImageBaseBitmap::~SkImageBaseBitmap() { | 138 SkImageBaseBitmap::~SkImageBaseBitmap() { |
| 139 delete[] base64.fData; | 139 delete[] base64.fData; |
| 140 } | 140 } |
| 141 | 141 |
| 142 SkDisplayable* SkImageBaseBitmap::deepCopy(SkAnimateMaker* maker) { | 142 SkDisplayable* SkImageBaseBitmap::deepCopy(SkAnimateMaker* maker) { |
| 143 SkDisplayable* copy = INHERITED::deepCopy(maker); | 143 SkDisplayable* copy = INHERITED::deepCopy(maker); |
| 144 ((SkImageBaseBitmap*) copy)->fUriBase = ((SkImageBaseBitmap*) this)->fUriBas
e; | 144 ((SkImageBaseBitmap*) copy)->fUriBase = ((SkImageBaseBitmap*) this)->fUriBas
e; |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 188 fLast.set(src); | 188 fLast.set(src); |
| 189 fBitmap.reset(); | 189 fBitmap.reset(); |
| 190 | 190 |
| 191 //SkStream* stream = SkStream::GetURIStream(fUriBase, src.c_str()); | 191 //SkStream* stream = SkStream::GetURIStream(fUriBase, src.c_str()); |
| 192 SkAutoTDelete<SkStreamAsset> stream(SkStream::NewFromFile(src.c_str())); | 192 SkAutoTDelete<SkStreamAsset> stream(SkStream::NewFromFile(src.c_str())); |
| 193 if (stream.get()) { | 193 if (stream.get()) { |
| 194 SkImageDecoder::DecodeStream(stream, &fBitmap); | 194 SkImageDecoder::DecodeStream(stream, &fBitmap); |
| 195 } | 195 } |
| 196 } | 196 } |
| 197 } | 197 } |
| OLD | NEW |