| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2012 Google Inc. | 2 * Copyright 2012 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 "SkPictureUtils.h" | 8 #include "SkPictureUtils.h" |
| 9 #include "SkCanvas.h" | 9 #include "SkCanvas.h" |
| 10 #include "SkData.h" | 10 #include "SkData.h" |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 const SkPaint& paint, const SkMatrix* prePathMatrix, | 101 const SkPaint& paint, const SkMatrix* prePathMatrix, |
| 102 bool pathIsMutable) SK_OVERRIDE { | 102 bool pathIsMutable) SK_OVERRIDE { |
| 103 this->addBitmapFromPaint(paint); | 103 this->addBitmapFromPaint(paint); |
| 104 } | 104 } |
| 105 virtual void drawBitmap(const SkDraw&, const SkBitmap& bitmap, | 105 virtual void drawBitmap(const SkDraw&, const SkBitmap& bitmap, |
| 106 const SkMatrix&, const SkPaint&) SK_OVERRIDE { | 106 const SkMatrix&, const SkPaint&) SK_OVERRIDE { |
| 107 this->addBitmap(bitmap); | 107 this->addBitmap(bitmap); |
| 108 } | 108 } |
| 109 virtual void drawBitmapRect(const SkDraw&, const SkBitmap& bitmap, | 109 virtual void drawBitmapRect(const SkDraw&, const SkBitmap& bitmap, |
| 110 const SkRect* srcOrNull, const SkRect& dst, | 110 const SkRect* srcOrNull, const SkRect& dst, |
| 111 const SkPaint&) SK_OVERRIDE { | 111 const SkPaint&, |
| 112 SkCanvas::DrawBitmapRectFlags flags) SK_OVERRIDE
{ |
| 112 this->addBitmap(bitmap); | 113 this->addBitmap(bitmap); |
| 113 } | 114 } |
| 114 virtual void drawSprite(const SkDraw&, const SkBitmap& bitmap, | 115 virtual void drawSprite(const SkDraw&, const SkBitmap& bitmap, |
| 115 int x, int y, const SkPaint& paint) SK_OVERRIDE { | 116 int x, int y, const SkPaint& paint) SK_OVERRIDE { |
| 116 this->addBitmap(bitmap); | 117 this->addBitmap(bitmap); |
| 117 } | 118 } |
| 118 virtual void drawText(const SkDraw&, const void* text, size_t len, | 119 virtual void drawText(const SkDraw&, const void* text, size_t len, |
| 119 SkScalar x, SkScalar y, | 120 SkScalar x, SkScalar y, |
| 120 const SkPaint& paint) SK_OVERRIDE { | 121 const SkPaint& paint) SK_OVERRIDE { |
| 121 this->addBitmapFromPaint(paint); | 122 this->addBitmapFromPaint(paint); |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 215 canvas.clipRect(area, SkRegion::kIntersect_Op, false); | 216 canvas.clipRect(area, SkRegion::kIntersect_Op, false); |
| 216 canvas.drawPicture(*pict); | 217 canvas.drawPicture(*pict); |
| 217 | 218 |
| 218 SkData* data = NULL; | 219 SkData* data = NULL; |
| 219 int count = array.count(); | 220 int count = array.count(); |
| 220 if (count > 0) { | 221 if (count > 0) { |
| 221 data = SkData::NewFromMalloc(array.detach(), count * sizeof(SkPixelRef*)
); | 222 data = SkData::NewFromMalloc(array.detach(), count * sizeof(SkPixelRef*)
); |
| 222 } | 223 } |
| 223 return data; | 224 return data; |
| 224 } | 225 } |
| OLD | NEW |