| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2011 Google Inc. | 2 * Copyright 2011 Google Inc. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 7 | 7 |
| 8 #include "SkDevice.h" | 8 #include "SkDevice.h" |
| 9 #include "SkMetaData.h" | 9 #include "SkMetaData.h" |
| 10 | 10 |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 94 // metadata users are rare, so we lazily allocate it. If that changes we | 94 // metadata users are rare, so we lazily allocate it. If that changes we |
| 95 // can decide to just make it a field in the device (rather than a ptr) | 95 // can decide to just make it a field in the device (rather than a ptr) |
| 96 if (NULL == fMetaData) { | 96 if (NULL == fMetaData) { |
| 97 fMetaData = new SkMetaData; | 97 fMetaData = new SkMetaData; |
| 98 } | 98 } |
| 99 return *fMetaData; | 99 return *fMetaData; |
| 100 } | 100 } |
| 101 | 101 |
| 102 // TODO: should make this guy pure-virtual. | 102 // TODO: should make this guy pure-virtual. |
| 103 SkImageInfo SkBaseDevice::imageInfo() const { | 103 SkImageInfo SkBaseDevice::imageInfo() const { |
| 104 return SkImageInfo::Make(this->width(), this->height(), | 104 return SkImageInfo::MakeUnknown(this->width(), this->height()); |
| 105 kUnknown_SkColorType, kIgnore_SkAlphaType); | |
| 106 } | 105 } |
| 107 | 106 |
| 108 const SkBitmap& SkBaseDevice::accessBitmap(bool changePixels) { | 107 const SkBitmap& SkBaseDevice::accessBitmap(bool changePixels) { |
| 109 const SkBitmap& bitmap = this->onAccessBitmap(); | 108 const SkBitmap& bitmap = this->onAccessBitmap(); |
| 110 if (changePixels) { | 109 if (changePixels) { |
| 111 bitmap.notifyPixelsChanged(); | 110 bitmap.notifyPixelsChanged(); |
| 112 } | 111 } |
| 113 return bitmap; | 112 return bitmap; |
| 114 } | 113 } |
| 115 | 114 |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 152 config8888); | 151 config8888); |
| 153 if (result && bmp == &tmp) { | 152 if (result && bmp == &tmp) { |
| 154 tmp.swap(*bitmap); | 153 tmp.swap(*bitmap); |
| 155 } | 154 } |
| 156 return result; | 155 return result; |
| 157 } | 156 } |
| 158 | 157 |
| 159 SkSurface* SkBaseDevice::newSurface(const SkImageInfo&) { return NULL; } | 158 SkSurface* SkBaseDevice::newSurface(const SkImageInfo&) { return NULL; } |
| 160 | 159 |
| 161 const void* SkBaseDevice::peekPixels(SkImageInfo*, size_t*) { return NULL; } | 160 const void* SkBaseDevice::peekPixels(SkImageInfo*, size_t*) { return NULL; } |
| OLD | NEW |