| OLD | NEW |
| 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 | 8 |
| 9 | 9 |
| 10 #include "SkBitmapHeap.h" | 10 #include "SkBitmapHeap.h" |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 break; | 46 break; |
| 47 case kShader_PaintFlat: | 47 case kShader_PaintFlat: |
| 48 paint->setShader((SkShader*)obj); | 48 paint->setShader((SkShader*)obj); |
| 49 break; | 49 break; |
| 50 case kImageFilter_PaintFlat: | 50 case kImageFilter_PaintFlat: |
| 51 paint->setImageFilter((SkImageFilter*)obj); | 51 paint->setImageFilter((SkImageFilter*)obj); |
| 52 break; | 52 break; |
| 53 case kXfermode_PaintFlat: | 53 case kXfermode_PaintFlat: |
| 54 paint->setXfermode((SkXfermode*)obj); | 54 paint->setXfermode((SkXfermode*)obj); |
| 55 break; | 55 break; |
| 56 case kAnnotation_PaintFlat: |
| 57 paint->setAnnotation((SkAnnotation*)obj); |
| 58 break; |
| 56 default: | 59 default: |
| 57 SkDEBUGFAIL("never gets here"); | 60 SkDEBUGFAIL("never gets here"); |
| 58 } | 61 } |
| 59 } | 62 } |
| 60 | 63 |
| 61 template <typename T> class SkRefCntTDArray : public SkTDArray<T> { | 64 template <typename T> class SkRefCntTDArray : public SkTDArray<T> { |
| 62 public: | 65 public: |
| 63 ~SkRefCntTDArray() { this->unrefAll(); } | 66 ~SkRefCntTDArray() { this->unrefAll(); } |
| 64 }; | 67 }; |
| 65 | 68 |
| (...skipping 764 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 830 status = kReadAtom_Status; | 833 status = kReadAtom_Status; |
| 831 break; | 834 break; |
| 832 } | 835 } |
| 833 } | 836 } |
| 834 | 837 |
| 835 if (bytesRead) { | 838 if (bytesRead) { |
| 836 *bytesRead = reader.offset(); | 839 *bytesRead = reader.offset(); |
| 837 } | 840 } |
| 838 return status; | 841 return status; |
| 839 } | 842 } |
| OLD | NEW |