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

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

Issue 26702002: force readbuffer clients to use specialized readFoo for flattenables (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 2 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/SkComposeShader.cpp ('k') | src/core/SkFlattenableBuffers.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 2013 Google Inc. 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" 8 #include "SkFilterShader.h"
9 9
10 #include "SkColorFilter.h" 10 #include "SkColorFilter.h"
11 #include "SkFlattenableBuffers.h" 11 #include "SkFlattenableBuffers.h"
12 #include "SkShader.h" 12 #include "SkShader.h"
13 #include "SkString.h" 13 #include "SkString.h"
14 14
15 SkFilterShader::SkFilterShader(SkShader* shader, SkColorFilter* filter) { 15 SkFilterShader::SkFilterShader(SkShader* shader, SkColorFilter* filter) {
16 fShader = shader; 16 fShader = shader;
17 shader->ref(); 17 shader->ref();
18 18
19 fFilter = filter; 19 fFilter = filter;
20 filter->ref(); 20 filter->ref();
21 } 21 }
22 22
23 SkFilterShader::SkFilterShader(SkFlattenableReadBuffer& buffer) 23 SkFilterShader::SkFilterShader(SkFlattenableReadBuffer& buffer)
24 : INHERITED(buffer) { 24 : INHERITED(buffer) {
25 fShader = buffer.readFlattenableT<SkShader>(); 25 fShader = buffer.readShader();
26 fFilter = buffer.readFlattenableT<SkColorFilter>(); 26 fFilter = buffer.readColorFilter();
27 } 27 }
28 28
29 SkFilterShader::~SkFilterShader() { 29 SkFilterShader::~SkFilterShader() {
30 fFilter->unref(); 30 fFilter->unref();
31 fShader->unref(); 31 fShader->unref();
32 } 32 }
33 33
34 void SkFilterShader::flatten(SkFlattenableWriteBuffer& buffer) const { 34 void SkFilterShader::flatten(SkFlattenableWriteBuffer& buffer) const {
35 this->INHERITED::flatten(buffer); 35 this->INHERITED::flatten(buffer);
36 buffer.writeFlattenable(fShader); 36 buffer.writeFlattenable(fShader);
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 str->append("Shader: "); 93 str->append("Shader: ");
94 fShader->toString(str); 94 fShader->toString(str);
95 str->append(" Filter: "); 95 str->append(" Filter: ");
96 // TODO: add "fFilter->toString(str);" once SkColorFilter::toString is added 96 // TODO: add "fFilter->toString(str);" once SkColorFilter::toString is added
97 97
98 this->INHERITED::toString(str); 98 this->INHERITED::toString(str);
99 99
100 str->append(")"); 100 str->append(")");
101 } 101 }
102 #endif 102 #endif
OLDNEW
« no previous file with comments | « src/core/SkComposeShader.cpp ('k') | src/core/SkFlattenableBuffers.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698