Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(968)

Side by Side Diff: src/effects/SkPictureImageFilter.cpp

Issue 1019493002: Remove uniqueID from all filter serialization. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Null out fUniqueID deserialization Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/effects/SkOffsetImageFilter.cpp ('k') | src/effects/SkRectShaderImageFilter.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2013 The Android Open Source Project 2 * Copyright 2013 The Android Open Source Project
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 "SkPictureImageFilter.h" 8 #include "SkPictureImageFilter.h"
9 #include "SkDevice.h" 9 #include "SkDevice.h"
10 #include "SkCanvas.h" 10 #include "SkCanvas.h"
11 #include "SkReadBuffer.h" 11 #include "SkReadBuffer.h"
12 #include "SkSurfaceProps.h" 12 #include "SkSurfaceProps.h"
13 #include "SkWriteBuffer.h" 13 #include "SkWriteBuffer.h"
14 #include "SkValidationUtils.h" 14 #include "SkValidationUtils.h"
15 15
16 SkPictureImageFilter::SkPictureImageFilter(const SkPicture* picture, uint32_t un iqueID) 16 SkPictureImageFilter::SkPictureImageFilter(const SkPicture* picture)
17 : INHERITED(0, 0, NULL, uniqueID) 17 : INHERITED(0, 0, NULL)
18 , fPicture(SkSafeRef(picture)) 18 , fPicture(SkSafeRef(picture))
19 , fCropRect(picture ? picture->cullRect() : SkRect::MakeEmpty()) 19 , fCropRect(picture ? picture->cullRect() : SkRect::MakeEmpty())
20 , fPictureResolution(kDeviceSpace_PictureResolution) 20 , fPictureResolution(kDeviceSpace_PictureResolution)
21 , fFilterQuality(kLow_SkFilterQuality) { 21 , fFilterQuality(kLow_SkFilterQuality) {
22 } 22 }
23 23
24 SkPictureImageFilter::SkPictureImageFilter(const SkPicture* picture, const SkRec t& cropRect, 24 SkPictureImageFilter::SkPictureImageFilter(const SkPicture* picture, const SkRec t& cropRect,
25 uint32_t uniqueID, PictureResolution pictureResolution, 25 PictureResolution pictureResolution,
26 SkFilterQuality filterQuality) 26 SkFilterQuality filterQuality)
27 : INHERITED(0, 0, NULL, uniqueID) 27 : INHERITED(0, 0, NULL)
28 , fPicture(SkSafeRef(picture)) 28 , fPicture(SkSafeRef(picture))
29 , fCropRect(cropRect) 29 , fCropRect(cropRect)
30 , fPictureResolution(pictureResolution) 30 , fPictureResolution(pictureResolution)
31 , fFilterQuality(filterQuality) { 31 , fFilterQuality(filterQuality) {
32 } 32 }
33 33
34 SkPictureImageFilter::~SkPictureImageFilter() { 34 SkPictureImageFilter::~SkPictureImageFilter() {
35 SkSafeUnref(fPicture); 35 SkSafeUnref(fPicture);
36 } 36 }
37 37
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 str->appendf("crop: (%f,%f,%f,%f) ", 180 str->appendf("crop: (%f,%f,%f,%f) ",
181 fCropRect.fLeft, fCropRect.fTop, fCropRect.fRight, fCropRect.fB ottom); 181 fCropRect.fLeft, fCropRect.fTop, fCropRect.fRight, fCropRect.fB ottom);
182 if (fPicture) { 182 if (fPicture) {
183 str->appendf("picture: (%f,%f,%f,%f)", 183 str->appendf("picture: (%f,%f,%f,%f)",
184 fPicture->cullRect().fLeft, fPicture->cullRect().fTop, 184 fPicture->cullRect().fLeft, fPicture->cullRect().fTop,
185 fPicture->cullRect().fRight, fPicture->cullRect().fBottom); 185 fPicture->cullRect().fRight, fPicture->cullRect().fBottom);
186 } 186 }
187 str->append(")"); 187 str->append(")");
188 } 188 }
189 #endif 189 #endif
OLDNEW
« no previous file with comments | « src/effects/SkOffsetImageFilter.cpp ('k') | src/effects/SkRectShaderImageFilter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698