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

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

Issue 1019493002: Remove uniqueID from all filter serialization. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Restore deprecated factory fn (Chrome still calls it) 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
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() , common.uniqueID()); 98 return Create(offset.x(), offset.y(), common.getInput(0), &common.cropRect() );
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, uint32_t uniq ueID) 107 const CropRect* cropRect)
108 : INHERITED(1, &input, cropRect, uniqueID) { 108 : INHERITED(1, &input, cropRect) {
109 fOffset.set(dx, dy); 109 fOffset.set(dx, dy);
110 } 110 }
111 111
112 #ifndef SK_IGNORE_TO_STRING 112 #ifndef SK_IGNORE_TO_STRING
113 void SkOffsetImageFilter::toString(SkString* str) const { 113 void SkOffsetImageFilter::toString(SkString* str) const {
114 str->appendf("SkOffsetImageFilter: ("); 114 str->appendf("SkOffsetImageFilter: (");
115 str->appendf("offset: (%f, %f) ", fOffset.fX, fOffset.fY); 115 str->appendf("offset: (%f, %f) ", fOffset.fX, fOffset.fY);
116 str->append("input: ("); 116 str->append("input: (");
117 if (this->getInput(0)) { 117 if (this->getInput(0)) {
118 this->getInput(0)->toString(str); 118 this->getInput(0)->toString(str);
119 } 119 }
120 str->append("))"); 120 str->append("))");
121 } 121 }
122 #endif 122 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698