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

Side by Side Diff: src/effects/SkXfermodeImageFilter.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/SkTileImageFilter.cpp ('k') | tests/ImageFilterTest.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 "SkXfermodeImageFilter.h" 8 #include "SkXfermodeImageFilter.h"
9 #include "SkCanvas.h" 9 #include "SkCanvas.h"
10 #include "SkDevice.h" 10 #include "SkDevice.h"
11 #include "SkColorPriv.h" 11 #include "SkColorPriv.h"
12 #include "SkReadBuffer.h" 12 #include "SkReadBuffer.h"
13 #include "SkWriteBuffer.h" 13 #include "SkWriteBuffer.h"
14 #include "SkXfermode.h" 14 #include "SkXfermode.h"
15 #if SK_SUPPORT_GPU 15 #if SK_SUPPORT_GPU
16 #include "GrContext.h" 16 #include "GrContext.h"
17 #include "effects/GrSimpleTextureEffect.h" 17 #include "effects/GrSimpleTextureEffect.h"
18 #include "SkGr.h" 18 #include "SkGr.h"
19 #endif 19 #endif
20 20
21 /////////////////////////////////////////////////////////////////////////////// 21 ///////////////////////////////////////////////////////////////////////////////
22 22
23 SkXfermodeImageFilter::SkXfermodeImageFilter(SkXfermode* mode, 23 SkXfermodeImageFilter::SkXfermodeImageFilter(SkXfermode* mode,
24 SkImageFilter* inputs[2], 24 SkImageFilter* inputs[2],
25 const CropRect* cropRect, 25 const CropRect* cropRect)
26 uint32_t uniqueID) 26 : INHERITED(2, inputs, cropRect), fMode(mode) {
27 : INHERITED(2, inputs, cropRect, uniqueID), fMode(mode) {
28 SkSafeRef(fMode); 27 SkSafeRef(fMode);
29 } 28 }
30 29
31 SkXfermodeImageFilter::~SkXfermodeImageFilter() { 30 SkXfermodeImageFilter::~SkXfermodeImageFilter() {
32 SkSafeUnref(fMode); 31 SkSafeUnref(fMode);
33 } 32 }
34 33
35 SkFlattenable* SkXfermodeImageFilter::CreateProc(SkReadBuffer& buffer) { 34 SkFlattenable* SkXfermodeImageFilter::CreateProc(SkReadBuffer& buffer) {
36 SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 2); 35 SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 2);
37 SkAutoTUnref<SkXfermode> mode(buffer.readXfermode()); 36 SkAutoTUnref<SkXfermode> mode(buffer.readXfermode());
38 return Create(mode, common.getInput(0), common.getInput(1), &common.cropRect (), common.uniqueID()); 37 return Create(mode, common.getInput(0), common.getInput(1), &common.cropRect ());
39 } 38 }
40 39
41 void SkXfermodeImageFilter::flatten(SkWriteBuffer& buffer) const { 40 void SkXfermodeImageFilter::flatten(SkWriteBuffer& buffer) const {
42 this->INHERITED::flatten(buffer); 41 this->INHERITED::flatten(buffer);
43 buffer.writeFlattenable(fMode); 42 buffer.writeFlattenable(fMode);
44 } 43 }
45 44
46 bool SkXfermodeImageFilter::onFilterImage(Proxy* proxy, 45 bool SkXfermodeImageFilter::onFilterImage(Proxy* proxy,
47 const SkBitmap& src, 46 const SkBitmap& src,
48 const Context& ctx, 47 const Context& ctx,
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 context->drawRect(dst->asRenderTarget(), GrClip::WideOpen(), paint, SkMatrix ::I(), srcRect); 174 context->drawRect(dst->asRenderTarget(), GrClip::WideOpen(), paint, SkMatrix ::I(), srcRect);
176 175
177 offset->fX = backgroundOffset.fX; 176 offset->fX = backgroundOffset.fX;
178 offset->fY = backgroundOffset.fY; 177 offset->fY = backgroundOffset.fY;
179 WrapTexture(dst, src.width(), src.height(), result); 178 WrapTexture(dst, src.width(), src.height(), result);
180 return true; 179 return true;
181 } 180 }
182 181
183 #endif 182 #endif
184 183
OLDNEW
« no previous file with comments | « src/effects/SkTileImageFilter.cpp ('k') | tests/ImageFilterTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698