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

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

Issue 1763743002: Revert of add support for new bitmapshader context (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 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
« no previous file with comments | « src/core/SkComposeShader.cpp ('k') | src/image/SkImageShader.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 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 "SkAtomics.h" 8 #include "SkAtomics.h"
9 #include "SkBitmapProcShader.h" 9 #include "SkBitmapProcShader.h"
10 #include "SkColorShader.h" 10 #include "SkColorShader.h"
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 colorPtr = &storage; 79 colorPtr = &storage;
80 } 80 }
81 if (this->onAsLuminanceColor(colorPtr)) { 81 if (this->onAsLuminanceColor(colorPtr)) {
82 *colorPtr = SkColorSetA(*colorPtr, 0xFF); // we only return opaque 82 *colorPtr = SkColorSetA(*colorPtr, 0xFF); // we only return opaque
83 return true; 83 return true;
84 } 84 }
85 return false; 85 return false;
86 } 86 }
87 87
88 SkShader::Context* SkShader::createContext(const ContextRec& rec, void* storage) const { 88 SkShader::Context* SkShader::createContext(const ContextRec& rec, void* storage) const {
89 // We currently require 16byte alignment for some of our subclasses, so asse rt that here.
90 SkASSERT(SkIsAlign16((intptr_t)storage));
91
92 if (!this->computeTotalInverse(rec, nullptr)) { 89 if (!this->computeTotalInverse(rec, nullptr)) {
93 return nullptr; 90 return nullptr;
94 } 91 }
95 return this->onCreateContext(rec, storage); 92 return this->onCreateContext(rec, storage);
96 } 93 }
97 94
98 SkShader::Context* SkShader::onCreateContext(const ContextRec& rec, void*) const { 95 SkShader::Context* SkShader::onCreateContext(const ContextRec& rec, void*) const {
99 return nullptr; 96 return nullptr;
100 } 97 }
101 98
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 #include "SkEmptyShader.h" 365 #include "SkEmptyShader.h"
369 366
370 void SkEmptyShader::toString(SkString* str) const { 367 void SkEmptyShader::toString(SkString* str) const {
371 str->append("SkEmptyShader: ("); 368 str->append("SkEmptyShader: (");
372 369
373 this->INHERITED::toString(str); 370 this->INHERITED::toString(str);
374 371
375 str->append(")"); 372 str->append(")");
376 } 373 }
377 #endif 374 #endif
OLDNEW
« no previous file with comments | « src/core/SkComposeShader.cpp ('k') | src/image/SkImageShader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698