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

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

Issue 503833002: Reimplement deserialization of SkImageFilter's uniqueID. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 4 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') | no next file » | 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 : INHERITED(2, inputs, cropRect), fMode(mode) { 26 uint32_t uniqueID)
27 : INHERITED(2, inputs, cropRect, uniqueID), fMode(mode) {
27 SkSafeRef(fMode); 28 SkSafeRef(fMode);
28 } 29 }
29 30
30 SkXfermodeImageFilter::~SkXfermodeImageFilter() { 31 SkXfermodeImageFilter::~SkXfermodeImageFilter() {
31 SkSafeUnref(fMode); 32 SkSafeUnref(fMode);
32 } 33 }
33 34
34 #ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING 35 #ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
35 SkXfermodeImageFilter::SkXfermodeImageFilter(SkReadBuffer& buffer) 36 SkXfermodeImageFilter::SkXfermodeImageFilter(SkReadBuffer& buffer)
36 : INHERITED(2, buffer) { 37 : INHERITED(2, buffer) {
37 fMode = buffer.readXfermode(); 38 fMode = buffer.readXfermode();
38 } 39 }
39 #endif 40 #endif
40 41
41 SkFlattenable* SkXfermodeImageFilter::CreateProc(SkReadBuffer& buffer) { 42 SkFlattenable* SkXfermodeImageFilter::CreateProc(SkReadBuffer& buffer) {
42 SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 2); 43 SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 2);
43 SkAutoTUnref<SkXfermode> mode(buffer.readXfermode()); 44 SkAutoTUnref<SkXfermode> mode(buffer.readXfermode());
44 return Create(mode, common.getInput(0), common.getInput(1), &common.cropRect ()); 45 return Create(mode, common.getInput(0), common.getInput(1), &common.cropRect (), common.uniqueID());
45 } 46 }
46 47
47 void SkXfermodeImageFilter::flatten(SkWriteBuffer& buffer) const { 48 void SkXfermodeImageFilter::flatten(SkWriteBuffer& buffer) const {
48 this->INHERITED::flatten(buffer); 49 this->INHERITED::flatten(buffer);
49 buffer.writeFlattenable(fMode); 50 buffer.writeFlattenable(fMode);
50 } 51 }
51 52
52 bool SkXfermodeImageFilter::onFilterImage(Proxy* proxy, 53 bool SkXfermodeImageFilter::onFilterImage(Proxy* proxy,
53 const SkBitmap& src, 54 const SkBitmap& src,
54 const Context& ctx, 55 const Context& ctx,
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 paint.addColorEffect(xferEffect)->unref(); 167 paint.addColorEffect(xferEffect)->unref();
167 context->drawRect(paint, srcRect); 168 context->drawRect(paint, srcRect);
168 169
169 offset->fX = backgroundOffset.fX; 170 offset->fX = backgroundOffset.fX;
170 offset->fY = backgroundOffset.fY; 171 offset->fY = backgroundOffset.fY;
171 WrapTexture(dst, src.width(), src.height(), result); 172 WrapTexture(dst, src.width(), src.height(), result);
172 return true; 173 return true;
173 } 174 }
174 175
175 #endif 176 #endif
OLDNEW
« no previous file with comments | « src/effects/SkTileImageFilter.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698