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

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

Issue 1219193002: Revert of Fix SkTileImageFilter clipping/cropRect interaction issue (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 5 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/core/SkImageFilter.cpp ('k') | src/effects/SkDisplacementMapEffect.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 "SkColorFilterImageFilter.h" 8 #include "SkColorFilterImageFilter.h"
9 #include "SkBitmap.h" 9 #include "SkBitmap.h"
10 #include "SkCanvas.h" 10 #include "SkCanvas.h"
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 *filter = SkRef(fColorFilter); 94 *filter = SkRef(fColorFilter);
95 } 95 }
96 return true; 96 return true;
97 } 97 }
98 return false; 98 return false;
99 } 99 }
100 100
101 #ifndef SK_IGNORE_TO_STRING 101 #ifndef SK_IGNORE_TO_STRING
102 void SkColorFilterImageFilter::toString(SkString* str) const { 102 void SkColorFilterImageFilter::toString(SkString* str) const {
103 str->appendf("SkColorFilterImageFilter: ("); 103 str->appendf("SkColorFilterImageFilter: (");
104 this->getCropRect().toString(str);
105 104
106 str->appendf("input: ("); 105 str->appendf("input: (");
107 106
108 if (this->getInput(0)) { 107 if (this->getInput(0)) {
109 this->getInput(0)->toString(str); 108 this->getInput(0)->toString(str);
110 } 109 }
111 110
112 str->appendf(") color filter: "); 111 str->appendf(") color filter: ");
113 fColorFilter->toString(str); 112 fColorFilter->toString(str);
114 113
115 str->append(")"); 114 str->append(")");
116 } 115 }
117 #endif 116 #endif
OLDNEW
« no previous file with comments | « src/core/SkImageFilter.cpp ('k') | src/effects/SkDisplacementMapEffect.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698