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

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

Issue 19305004: Move implementation of SkFilterShader into its source file. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « src/core/SkColorFilter.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 2013 Google Inc.
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 "SkFilterShader.h"
9
8 #include "SkColorFilter.h" 10 #include "SkColorFilter.h"
9 #include "SkFilterShader.h"
10 #include "SkFlattenableBuffers.h" 11 #include "SkFlattenableBuffers.h"
11 #include "SkShader.h" 12 #include "SkShader.h"
12 #include "SkUnPreMultiply.h"
13 #include "SkString.h" 13 #include "SkString.h"
14 14
15 SK_DEFINE_INST_COUNT(SkColorFilter) 15 SkFilterShader::SkFilterShader(SkShader* shader, SkColorFilter* filter) {
16 fShader = shader;
17 shader->ref();
16 18
17 bool SkColorFilter::asColorMode(SkColor* color, SkXfermode::Mode* mode) const { 19 fFilter = filter;
18 return false; 20 filter->ref();
19 } 21 }
20 22
21 bool SkColorFilter::asColorMatrix(SkScalar matrix[20]) const { 23 SkFilterShader::SkFilterShader(SkFlattenableReadBuffer& buffer)
22 return false; 24 : INHERITED(buffer) {
23 }
24
25 bool SkColorFilter::asComponentTable(SkBitmap*) const {
26 return false;
27 }
28
29 void SkColorFilter::filterSpan16(const uint16_t s[], int count, uint16_t d[]) co nst {
30 SkASSERT(this->getFlags() & SkColorFilter::kHasFilter16_Flag);
31 SkDEBUGFAIL("missing implementation of SkColorFilter::filterSpan16");
32
33 if (d != s) {
34 memcpy(d, s, count * sizeof(uint16_t));
35 }
36 }
37
38 SkColor SkColorFilter::filterColor(SkColor c) const {
39 SkPMColor dst, src = SkPreMultiplyColor(c);
40 this->filterSpan(&src, 1, &dst);
41 return SkUnPreMultiply::PMColorToColor(dst);
42 }
43
44 GrEffectRef* SkColorFilter::asNewEffect(GrContext*) const {
45 return NULL;
46 }
47
48 ///////////////////////////////////////////////////////////////////////////////
49
50 SkFilterShader::SkFilterShader(SkShader* shader, SkColorFilter* filter) {
51 fShader = shader; shader->ref();
52 fFilter = filter; filter->ref();
53 }
54
55 SkFilterShader::SkFilterShader(SkFlattenableReadBuffer& buffer) :
56 INHERITED(buffer) {
57 fShader = buffer.readFlattenableT<SkShader>(); 25 fShader = buffer.readFlattenableT<SkShader>();
58 fFilter = buffer.readFlattenableT<SkColorFilter>(); 26 fFilter = buffer.readFlattenableT<SkColorFilter>();
59 } 27 }
60 28
61 SkFilterShader::~SkFilterShader() { 29 SkFilterShader::~SkFilterShader() {
62 fFilter->unref(); 30 fFilter->unref();
63 fShader->unref(); 31 fShader->unref();
64 } 32 }
65 33
66 void SkFilterShader::flatten(SkFlattenableWriteBuffer& buffer) const { 34 void SkFilterShader::flatten(SkFlattenableWriteBuffer& buffer) const {
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 str->append("Shader: "); 93 str->append("Shader: ");
126 fShader->toString(str); 94 fShader->toString(str);
127 str->append(" Filter: "); 95 str->append(" Filter: ");
128 // TODO: add "fFilter->toString(str);" once SkColorFilter::toString is added 96 // TODO: add "fFilter->toString(str);" once SkColorFilter::toString is added
129 97
130 this->INHERITED::toString(str); 98 this->INHERITED::toString(str);
131 99
132 str->append(")"); 100 str->append(")");
133 } 101 }
134 #endif 102 #endif
OLDNEW
« no previous file with comments | « src/core/SkColorFilter.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698