OLD | NEW |
---|---|
1 | 1 |
2 /* | 2 /* |
3 * Copyright 2007 The Android Open Source Project | 3 * Copyright 2007 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 "SkPictureFlat.h" | 10 #include "SkPictureFlat.h" |
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
126 SkPicture::SkPicture() | 126 SkPicture::SkPicture() |
127 : fAccelData(NULL) { | 127 : fAccelData(NULL) { |
128 this->needsNewGenID(); | 128 this->needsNewGenID(); |
129 fPlayback = NULL; | 129 fPlayback = NULL; |
130 fWidth = fHeight = 0; | 130 fWidth = fHeight = 0; |
131 } | 131 } |
132 | 132 |
133 // This method makes a SkPicturePlayback object from an in-progress recording. | 133 // This method makes a SkPicturePlayback object from an in-progress recording. |
134 // Unfortunately, it does not include the restoreToCount of a real endRecording | 134 // Unfortunately, it does not include the restoreToCount of a real endRecording |
135 // call. | 135 // call. |
136 SkPicturePlayback* SkPicture::FakeEndRecording(const SkPicture* resourceSrc, | 136 SkPicturePlayback* SkPicture::FakeEndRecording(const SkPicture* resourceSrc, |
scroggo
2014/06/10 14:58:04
As I asked in https://codereview.chromium.org/3160
robertphillips
2014/06/10 15:00:09
This entry point is going away entirely (replaced
scroggo
2014/06/10 15:00:44
sgtm. Thanks for the explanation.
| |
137 const SkPictureRecord& record, | 137 const SkPictureRecord& record) { |
138 bool deepCopy) { | |
139 SkPictInfo info; | 138 SkPictInfo info; |
140 resourceSrc->createHeader(&info); | 139 resourceSrc->createHeader(&info); |
141 return SkNEW_ARGS(SkPicturePlayback, (resourceSrc, record, info, deepCopy)); | 140 return SkNEW_ARGS(SkPicturePlayback, (resourceSrc, record, info)); |
142 } | 141 } |
143 | 142 |
144 SkPicture::SkPicture(const SkPicture& src) | 143 SkPicture::SkPicture(const SkPicture& src) |
145 : INHERITED() | 144 : INHERITED() |
146 , fAccelData(NULL) | 145 , fAccelData(NULL) |
147 , fContentInfo(src.fContentInfo) { | 146 , fContentInfo(src.fContentInfo) { |
148 this->needsNewGenID(); | 147 this->needsNewGenID(); |
149 fWidth = src.fWidth; | 148 fWidth = src.fWidth; |
150 fHeight = src.fHeight; | 149 fHeight = src.fHeight; |
151 | 150 |
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
565 } while (SK_InvalidGenID == genID); | 564 } while (SK_InvalidGenID == genID); |
566 return genID; | 565 return genID; |
567 } | 566 } |
568 | 567 |
569 uint32_t SkPicture::uniqueID() const { | 568 uint32_t SkPicture::uniqueID() const { |
570 if (SK_InvalidGenID == fUniqueID) { | 569 if (SK_InvalidGenID == fUniqueID) { |
571 fUniqueID = next_picture_generation_id(); | 570 fUniqueID = next_picture_generation_id(); |
572 } | 571 } |
573 return fUniqueID; | 572 return fUniqueID; |
574 } | 573 } |
OLD | NEW |