| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright 2015 Google Inc. | 2  * Copyright 2015 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 #ifndef SkPDFBitmap_DEFINED | 7 #ifndef SkPDFBitmap_DEFINED | 
| 8 #define SkPDFBitmap_DEFINED | 8 #define SkPDFBitmap_DEFINED | 
| 9 | 9 | 
| 10 #include "SkPDFTypes.h" | 10 #include "SkPDFTypes.h" | 
| (...skipping 22 matching lines...) Expand all  Loading... | 
| 33     void emitObject(SkWStream*, SkPDFCatalog*) SK_OVERRIDE; | 33     void emitObject(SkWStream*, SkPDFCatalog*) SK_OVERRIDE; | 
| 34     void addResources(SkTSet<SkPDFObject*>* resourceSet, | 34     void addResources(SkTSet<SkPDFObject*>* resourceSet, | 
| 35                       SkPDFCatalog* catalog) const SK_OVERRIDE; | 35                       SkPDFCatalog* catalog) const SK_OVERRIDE; | 
| 36     bool equals(const SkBitmap& other) const { | 36     bool equals(const SkBitmap& other) const { | 
| 37         return fBitmap.getGenerationID() == other.getGenerationID() && | 37         return fBitmap.getGenerationID() == other.getGenerationID() && | 
| 38                fBitmap.pixelRefOrigin() == other.pixelRefOrigin() && | 38                fBitmap.pixelRefOrigin() == other.pixelRefOrigin() && | 
| 39                fBitmap.dimensions() == other.dimensions(); | 39                fBitmap.dimensions() == other.dimensions(); | 
| 40     } | 40     } | 
| 41 | 41 | 
| 42 private: | 42 private: | 
| 43     SkPDFCanon* const fCanon; |  | 
| 44     const SkBitmap fBitmap; | 43     const SkBitmap fBitmap; | 
| 45     const SkAutoTUnref<SkPDFObject> fSMask; | 44     const SkAutoTUnref<SkPDFObject> fSMask; | 
| 46     SkPDFBitmap(SkPDFCanon*, const SkBitmap&, SkPDFObject*); | 45     SkPDFBitmap(const SkBitmap&, SkPDFObject*); | 
| 47     void emitDict(SkWStream*, SkPDFCatalog*, size_t, bool) const; | 46     void emitDict(SkWStream*, SkPDFCatalog*, size_t, bool) const; | 
| 48 }; | 47 }; | 
| 49 | 48 | 
| 50 #endif  // SkPDFBitmap_DEFINED | 49 #endif  // SkPDFBitmap_DEFINED | 
| OLD | NEW | 
|---|