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

Side by Side Diff: src/effects/SkRectShaderImageFilter.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/SkPictureImageFilter.cpp ('k') | src/effects/SkTileImageFilter.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 Google Inc. 2 * Copyright 2013 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 7
8 #include "SkRectShaderImageFilter.h" 8 #include "SkRectShaderImageFilter.h"
9 #include "SkBitmap.h" 9 #include "SkBitmap.h"
10 #include "SkCanvas.h" 10 #include "SkCanvas.h"
11 #include "SkDevice.h" 11 #include "SkDevice.h"
12 #include "SkReadBuffer.h" 12 #include "SkReadBuffer.h"
13 #include "SkWriteBuffer.h" 13 #include "SkWriteBuffer.h"
14 #include "SkShader.h" 14 #include "SkShader.h"
15 15
16 SkRectShaderImageFilter* SkRectShaderImageFilter::Create(SkShader* s, const SkRe ct& rect) { 16 SkRectShaderImageFilter* SkRectShaderImageFilter::Create(SkShader* s, const SkRe ct& rect) {
17 SkASSERT(s); 17 SkASSERT(s);
18 uint32_t flags = CropRect::kHasAll_CropEdge; 18 uint32_t flags = CropRect::kHasAll_CropEdge;
19 if (rect.width() == 0 || rect.height() == 0) { 19 if (rect.width() == 0 || rect.height() == 0) {
20 flags = 0x0; 20 flags = 0x0;
21 } 21 }
22 CropRect cropRect(rect, flags); 22 CropRect cropRect(rect, flags);
23 return s ? SkNEW_ARGS(SkRectShaderImageFilter, (s, &cropRect)) : NULL; 23 return s ? SkNEW_ARGS(SkRectShaderImageFilter, (s, &cropRect)) : NULL;
24 } 24 }
25 25
26 SkRectShaderImageFilter* SkRectShaderImageFilter::Create(SkShader* s, const Crop Rect* cropRect, uint32_t uniqueID) { 26 SkRectShaderImageFilter* SkRectShaderImageFilter::Create(SkShader* s, const Crop Rect* cropRect) {
27 SkASSERT(s); 27 SkASSERT(s);
28 return s ? SkNEW_ARGS(SkRectShaderImageFilter, (s, cropRect, uniqueID)) : NU LL; 28 return s ? SkNEW_ARGS(SkRectShaderImageFilter, (s, cropRect)) : NULL;
29 } 29 }
30 30
31 SkRectShaderImageFilter::SkRectShaderImageFilter(SkShader* s, const CropRect* cr opRect, 31 SkRectShaderImageFilter::SkRectShaderImageFilter(SkShader* s, const CropRect* cr opRect)
32 uint32_t uniqueID) 32 : INHERITED(0, NULL, cropRect)
33 : INHERITED(0, NULL, cropRect, uniqueID)
34 , fShader(SkRef(s)) { 33 , fShader(SkRef(s)) {
35 } 34 }
36 35
37 SkFlattenable* SkRectShaderImageFilter::CreateProc(SkReadBuffer& buffer) { 36 SkFlattenable* SkRectShaderImageFilter::CreateProc(SkReadBuffer& buffer) {
38 SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 0); 37 SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 0);
39 SkAutoTUnref<SkShader> shader(buffer.readShader()); 38 SkAutoTUnref<SkShader> shader(buffer.readShader());
40 return Create(shader.get(), &common.cropRect(), common.uniqueID()); 39 return Create(shader.get(), &common.cropRect());
41 } 40 }
42 41
43 void SkRectShaderImageFilter::flatten(SkWriteBuffer& buffer) const { 42 void SkRectShaderImageFilter::flatten(SkWriteBuffer& buffer) const {
44 this->INHERITED::flatten(buffer); 43 this->INHERITED::flatten(buffer);
45 buffer.writeFlattenable(fShader); 44 buffer.writeFlattenable(fShader);
46 } 45 }
47 46
48 SkRectShaderImageFilter::~SkRectShaderImageFilter() { 47 SkRectShaderImageFilter::~SkRectShaderImageFilter() {
49 fShader->unref(); 48 fShader->unref();
50 } 49 }
(...skipping 28 matching lines...) Expand all
79 offset->fY = bounds.fTop; 78 offset->fY = bounds.fTop;
80 return true; 79 return true;
81 } 80 }
82 81
83 #ifndef SK_IGNORE_TO_STRING 82 #ifndef SK_IGNORE_TO_STRING
84 void SkRectShaderImageFilter::toString(SkString* str) const { 83 void SkRectShaderImageFilter::toString(SkString* str) const {
85 str->appendf("SkRectShaderImageFilter: ("); 84 str->appendf("SkRectShaderImageFilter: (");
86 str->append(")"); 85 str->append(")");
87 } 86 }
88 #endif 87 #endif
OLDNEW
« no previous file with comments | « src/effects/SkPictureImageFilter.cpp ('k') | src/effects/SkTileImageFilter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698