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

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

Issue 503833002: Reimplement deserialization of SkImageFilter's uniqueID. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 3 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/SkMorphologyImageFilter.cpp ('k') | src/effects/SkPictureImageFilter.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 2012 The Android Open Source Project 2 * Copyright 2012 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 "SkOffsetImageFilter.h" 8 #include "SkOffsetImageFilter.h"
9 #include "SkBitmap.h" 9 #include "SkBitmap.h"
10 #include "SkCanvas.h" 10 #include "SkCanvas.h"
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 return getInput(0)->filterBounds(bounds, ctm, dst); 88 return getInput(0)->filterBounds(bounds, ctm, dst);
89 } 89 }
90 *dst = bounds; 90 *dst = bounds;
91 return true; 91 return true;
92 } 92 }
93 93
94 SkFlattenable* SkOffsetImageFilter::CreateProc(SkReadBuffer& buffer) { 94 SkFlattenable* SkOffsetImageFilter::CreateProc(SkReadBuffer& buffer) {
95 SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1); 95 SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1);
96 SkPoint offset; 96 SkPoint offset;
97 buffer.readPoint(&offset); 97 buffer.readPoint(&offset);
98 return Create(offset.x(), offset.y(), common.getInput(0), &common.cropRect() ); 98 return Create(offset.x(), offset.y(), common.getInput(0), &common.cropRect() , common.uniqueID());
99 } 99 }
100 100
101 void SkOffsetImageFilter::flatten(SkWriteBuffer& buffer) const { 101 void SkOffsetImageFilter::flatten(SkWriteBuffer& buffer) const {
102 this->INHERITED::flatten(buffer); 102 this->INHERITED::flatten(buffer);
103 buffer.writePoint(fOffset); 103 buffer.writePoint(fOffset);
104 } 104 }
105 105
106 SkOffsetImageFilter::SkOffsetImageFilter(SkScalar dx, SkScalar dy, SkImageFilter * input, 106 SkOffsetImageFilter::SkOffsetImageFilter(SkScalar dx, SkScalar dy, SkImageFilter * input,
107 const CropRect* cropRect) 107 const CropRect* cropRect, uint32_t uniq ueID)
108 : INHERITED(1, &input, cropRect) { 108 : INHERITED(1, &input, cropRect, uniqueID) {
109 fOffset.set(dx, dy); 109 fOffset.set(dx, dy);
110 } 110 }
111 111
112 #ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING 112 #ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
113 SkOffsetImageFilter::SkOffsetImageFilter(SkReadBuffer& buffer) 113 SkOffsetImageFilter::SkOffsetImageFilter(SkReadBuffer& buffer)
114 : INHERITED(1, buffer) { 114 : INHERITED(1, buffer) {
115 buffer.readPoint(&fOffset); 115 buffer.readPoint(&fOffset);
116 buffer.validate(SkScalarIsFinite(fOffset.fX) && 116 buffer.validate(SkScalarIsFinite(fOffset.fX) &&
117 SkScalarIsFinite(fOffset.fY)); 117 SkScalarIsFinite(fOffset.fY));
118 } 118 }
119 #endif 119 #endif
OLDNEW
« no previous file with comments | « src/effects/SkMorphologyImageFilter.cpp ('k') | src/effects/SkPictureImageFilter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698