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

Side by Side Diff: src/core/SkShader.cpp

Issue 260863007: Remove setLocalMatrix calls from picture shader GM. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: pass the localMatrix... Created 6 years, 7 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/SkPictureShader.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 2006 The Android Open Source Project 2 * Copyright 2006 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 "SkBitmapProcShader.h" 8 #include "SkBitmapProcShader.h"
9 #include "SkReadBuffer.h" 9 #include "SkReadBuffer.h"
10 #include "SkMallocPixelRef.h" 10 #include "SkMallocPixelRef.h"
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 186
187 GrEffectRef* SkShader::asNewEffect(GrContext*, const SkPaint&) const { 187 GrEffectRef* SkShader::asNewEffect(GrContext*, const SkPaint&) const {
188 return NULL; 188 return NULL;
189 } 189 }
190 190
191 SkShader* SkShader::CreateBitmapShader(const SkBitmap& src, TileMode tmx, TileMo de tmy, 191 SkShader* SkShader::CreateBitmapShader(const SkBitmap& src, TileMode tmx, TileMo de tmy,
192 const SkMatrix* localMatrix) { 192 const SkMatrix* localMatrix) {
193 return ::CreateBitmapShader(src, tmx, tmy, localMatrix, NULL); 193 return ::CreateBitmapShader(src, tmx, tmy, localMatrix, NULL);
194 } 194 }
195 195
196 SkShader* SkShader::CreatePictureShader(SkPicture* src, TileMode tmx, TileMode t my) { 196 SkShader* SkShader::CreatePictureShader(SkPicture* src, TileMode tmx, TileMode t my,
197 return SkPictureShader::Create(src, tmx, tmy); 197 const SkMatrix* localMatrix) {
198 return SkPictureShader::Create(src, tmx, tmy, localMatrix);
198 } 199 }
199 200
200 #ifndef SK_IGNORE_TO_STRING 201 #ifndef SK_IGNORE_TO_STRING
201 void SkShader::toString(SkString* str) const { 202 void SkShader::toString(SkString* str) const {
202 if (this->hasLocalMatrix()) { 203 if (this->hasLocalMatrix()) {
203 str->append(" "); 204 str->append(" ");
204 this->getLocalMatrix().toString(str); 205 this->getLocalMatrix().toString(str);
205 } 206 }
206 } 207 }
207 #endif 208 #endif
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
331 #include "SkEmptyShader.h" 332 #include "SkEmptyShader.h"
332 333
333 void SkEmptyShader::toString(SkString* str) const { 334 void SkEmptyShader::toString(SkString* str) const {
334 str->append("SkEmptyShader: ("); 335 str->append("SkEmptyShader: (");
335 336
336 this->INHERITED::toString(str); 337 this->INHERITED::toString(str);
337 338
338 str->append(")"); 339 str->append(")");
339 } 340 }
340 #endif 341 #endif
OLDNEW
« no previous file with comments | « src/core/SkPictureShader.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698