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

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

Issue 195163004: Fix SkOffsetImageFilter to use a temporary for bounds computations. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Fix expectations 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 | « expectations/gm/ignored-tests.txt ('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 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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 SkRect copy = *dst; 77 SkRect copy = *dst;
78 dst->offset(fOffset.fX, fOffset.fY); 78 dst->offset(fOffset.fX, fOffset.fY);
79 dst->join(copy); 79 dst->join(copy);
80 } 80 }
81 81
82 bool SkOffsetImageFilter::onFilterBounds(const SkIRect& src, const SkMatrix& ctm , 82 bool SkOffsetImageFilter::onFilterBounds(const SkIRect& src, const SkMatrix& ctm ,
83 SkIRect* dst) const { 83 SkIRect* dst) const {
84 SkVector vec; 84 SkVector vec;
85 ctm.mapVectors(&vec, &fOffset, 1); 85 ctm.mapVectors(&vec, &fOffset, 1);
86 86
87 *dst = src; 87 SkIRect bounds = src;
88 dst->offset(-SkScalarCeilToInt(vec.fX), -SkScalarCeilToInt(vec.fY)); 88 bounds.offset(-SkScalarCeilToInt(vec.fX), -SkScalarCeilToInt(vec.fY));
89 dst->join(src); 89 bounds.join(src);
90 *dst = bounds;
90 return true; 91 return true;
91 } 92 }
92 93
93 void SkOffsetImageFilter::flatten(SkWriteBuffer& buffer) const { 94 void SkOffsetImageFilter::flatten(SkWriteBuffer& buffer) const {
94 this->INHERITED::flatten(buffer); 95 this->INHERITED::flatten(buffer);
95 buffer.writePoint(fOffset); 96 buffer.writePoint(fOffset);
96 } 97 }
97 98
98 SkOffsetImageFilter::SkOffsetImageFilter(SkScalar dx, SkScalar dy, SkImageFilter * input, 99 SkOffsetImageFilter::SkOffsetImageFilter(SkScalar dx, SkScalar dy, SkImageFilter * input,
99 const CropRect* cropRect) : INHERITED(i nput, cropRect) { 100 const CropRect* cropRect) : INHERITED(i nput, cropRect) {
100 fOffset.set(dx, dy); 101 fOffset.set(dx, dy);
101 } 102 }
102 103
103 SkOffsetImageFilter::SkOffsetImageFilter(SkReadBuffer& buffer) 104 SkOffsetImageFilter::SkOffsetImageFilter(SkReadBuffer& buffer)
104 : INHERITED(1, buffer) { 105 : INHERITED(1, buffer) {
105 buffer.readPoint(&fOffset); 106 buffer.readPoint(&fOffset);
106 buffer.validate(SkScalarIsFinite(fOffset.fX) && 107 buffer.validate(SkScalarIsFinite(fOffset.fX) &&
107 SkScalarIsFinite(fOffset.fY)); 108 SkScalarIsFinite(fOffset.fY));
108 } 109 }
OLDNEW
« no previous file with comments | « expectations/gm/ignored-tests.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698