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

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

Issue 26371002: Change SkImageFilter's cropRect from SkIRect to a CropRect struct (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Alternate version, using a single fFlags member. Created 7 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « src/effects/SkLightingImageFilter.cpp ('k') | src/effects/SkMorphologyImageFilter.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 "SkMergeImageFilter.h" 8 #include "SkMergeImageFilter.h"
9 #include "SkCanvas.h" 9 #include "SkCanvas.h"
10 #include "SkDevice.h" 10 #include "SkDevice.h"
(...skipping 22 matching lines...) Expand all
33 for (int i = 0; i < inputCount; ++i) { 33 for (int i = 0; i < inputCount; ++i) {
34 fModes[i] = SkToU8(modes[i]); 34 fModes[i] = SkToU8(modes[i]);
35 } 35 }
36 } else { 36 } else {
37 fModes = NULL; 37 fModes = NULL;
38 } 38 }
39 } 39 }
40 40
41 SkMergeImageFilter::SkMergeImageFilter(SkImageFilter* first, SkImageFilter* seco nd, 41 SkMergeImageFilter::SkMergeImageFilter(SkImageFilter* first, SkImageFilter* seco nd,
42 SkXfermode::Mode mode, 42 SkXfermode::Mode mode,
43 const SkIRect* cropRect) : INHERITED(firs t, second, cropRect) { 43 const CropRect* cropRect) : INHERITED(fir st, second, cropRect) {
44 if (SkXfermode::kSrcOver_Mode != mode) { 44 if (SkXfermode::kSrcOver_Mode != mode) {
45 SkXfermode::Mode modes[] = { mode, mode }; 45 SkXfermode::Mode modes[] = { mode, mode };
46 this->initModes(modes); 46 this->initModes(modes);
47 } else { 47 } else {
48 fModes = NULL; 48 fModes = NULL;
49 } 49 }
50 } 50 }
51 51
52 SkMergeImageFilter::SkMergeImageFilter(SkImageFilter* filters[], int count, 52 SkMergeImageFilter::SkMergeImageFilter(SkImageFilter* filters[], int count,
53 const SkXfermode::Mode modes[], 53 const SkXfermode::Mode modes[],
54 const SkIRect* cropRect) : INHERITED(coun t, filters, cropRect) { 54 const CropRect* cropRect) : INHERITED(cou nt, filters, cropRect) {
55 this->initModes(modes); 55 this->initModes(modes);
56 } 56 }
57 57
58 SkMergeImageFilter::~SkMergeImageFilter() { 58 SkMergeImageFilter::~SkMergeImageFilter() {
59 59
60 if (fModes != SkTCast<uint8_t*>(fStorage)) { 60 if (fModes != SkTCast<uint8_t*>(fStorage)) {
61 sk_free(fModes); 61 sk_free(fModes);
62 } 62 }
63 } 63 }
64 64
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 SkMergeImageFilter::SkMergeImageFilter(SkFlattenableReadBuffer& buffer) : INHERI TED(buffer) { 158 SkMergeImageFilter::SkMergeImageFilter(SkFlattenableReadBuffer& buffer) : INHERI TED(buffer) {
159 bool hasModes = buffer.readBool(); 159 bool hasModes = buffer.readBool();
160 if (hasModes) { 160 if (hasModes) {
161 this->initAllocModes(); 161 this->initAllocModes();
162 SkASSERT(buffer.getArrayCount() == countInputs() * sizeof(fModes[0])); 162 SkASSERT(buffer.getArrayCount() == countInputs() * sizeof(fModes[0]));
163 buffer.readByteArray(fModes); 163 buffer.readByteArray(fModes);
164 } else { 164 } else {
165 fModes = 0; 165 fModes = 0;
166 } 166 }
167 } 167 }
OLDNEW
« no previous file with comments | « src/effects/SkLightingImageFilter.cpp ('k') | src/effects/SkMorphologyImageFilter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698