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

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

Issue 372053003: Revert of Make GrDrawState and GrPaint take GrEffect* instead of GrEffectRef*. (Closed) Base URL: https://skia.googlesource.com/skia.git@no_ref
Patch Set: Created 6 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/SkBitmapProcShader.h ('k') | src/core/SkColorFilter.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 /* 2 /*
3 * Copyright 2011 Google Inc. 3 * Copyright 2011 Google Inc.
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 #include "SkColorPriv.h" 8 #include "SkColorPriv.h"
9 #include "SkReadBuffer.h" 9 #include "SkReadBuffer.h"
10 #include "SkWriteBuffer.h" 10 #include "SkWriteBuffer.h"
(...skipping 453 matching lines...) Expand 10 before | Expand all | Expand 10 after
464 } 464 }
465 GrUnlockAndUnrefCachedBitmapTexture(texture); 465 GrUnlockAndUnrefCachedBitmapTexture(texture);
466 466
467 return true; 467 return true;
468 } 468 }
469 469
470 #else 470 #else
471 471
472 bool SkBitmapProcShader::asNewEffect(GrContext* context, const SkPaint& paint, 472 bool SkBitmapProcShader::asNewEffect(GrContext* context, const SkPaint& paint,
473 const SkMatrix* localMatrix, GrColor* grCol or, 473 const SkMatrix* localMatrix, GrColor* grCol or,
474 GrEffect** grEffect) const { 474 GrEffectRef** grEffect) const {
475 SkDEBUGFAIL("Should not call in GPU-less build"); 475 SkDEBUGFAIL("Should not call in GPU-less build");
476 return false; 476 return false;
477 } 477 }
478 478
479 #endif 479 #endif
OLDNEW
« no previous file with comments | « src/core/SkBitmapProcShader.h ('k') | src/core/SkColorFilter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698