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

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

Issue 196353021: Revert "Implement support for expanding crop rects in image filters" (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 6 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 | Annotate | Revision Log
« no previous file with comments | « src/effects/SkMorphologyImageFilter.cpp ('k') | src/effects/SkRectShaderImageFilter.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 "SkOffsetImageFilter.h" 8 #include "SkOffsetImageFilter.h"
9 #include "SkBitmap.h" 9 #include "SkBitmap.h"
10 #include "SkCanvas.h" 10 #include "SkCanvas.h"
(...skipping 24 matching lines...) Expand all
35 35
36 offset->fX = srcOffset.fX + SkScalarRoundToInt(vec.fX); 36 offset->fX = srcOffset.fX + SkScalarRoundToInt(vec.fX);
37 offset->fY = srcOffset.fY + SkScalarRoundToInt(vec.fY); 37 offset->fY = srcOffset.fY + SkScalarRoundToInt(vec.fY);
38 *result = src; 38 *result = src;
39 } else { 39 } else {
40 if (input && !input->filterImage(proxy, source, ctx, &src, &srcOffset)) { 40 if (input && !input->filterImage(proxy, source, ctx, &src, &srcOffset)) {
41 return false; 41 return false;
42 } 42 }
43 43
44 SkIRect bounds; 44 SkIRect bounds;
45 if (!this->applyCropRect(ctx, src, srcOffset, &bounds)) { 45 src.getBounds(&bounds);
46 bounds.offset(srcOffset);
47
48 if (!applyCropRect(&bounds, ctx.ctm())) {
46 return false; 49 return false;
47 } 50 }
48 51
49 SkAutoTUnref<SkBaseDevice> device(proxy->createDevice(bounds.width(), bo unds.height())); 52 SkAutoTUnref<SkBaseDevice> device(proxy->createDevice(bounds.width(), bo unds.height()));
50 if (NULL == device.get()) { 53 if (NULL == device.get()) {
51 return false; 54 return false;
52 } 55 }
53 SkCanvas canvas(device); 56 SkCanvas canvas(device);
54 SkPaint paint; 57 SkPaint paint;
55 paint.setXfermodeMode(SkXfermode::kSrc_Mode); 58 paint.setXfermodeMode(SkXfermode::kSrc_Mode);
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 const CropRect* cropRect) : INHERITED(i nput, cropRect) { 100 const CropRect* cropRect) : INHERITED(i nput, cropRect) {
98 fOffset.set(dx, dy); 101 fOffset.set(dx, dy);
99 } 102 }
100 103
101 SkOffsetImageFilter::SkOffsetImageFilter(SkReadBuffer& buffer) 104 SkOffsetImageFilter::SkOffsetImageFilter(SkReadBuffer& buffer)
102 : INHERITED(1, buffer) { 105 : INHERITED(1, buffer) {
103 buffer.readPoint(&fOffset); 106 buffer.readPoint(&fOffset);
104 buffer.validate(SkScalarIsFinite(fOffset.fX) && 107 buffer.validate(SkScalarIsFinite(fOffset.fX) &&
105 SkScalarIsFinite(fOffset.fY)); 108 SkScalarIsFinite(fOffset.fY));
106 } 109 }
OLDNEW
« no previous file with comments | « src/effects/SkMorphologyImageFilter.cpp ('k') | src/effects/SkRectShaderImageFilter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698