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

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

Issue 768183002: Revert of Remove SK_SUPPORT_LEGACY_DEEPFLATTENING. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years 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/SkFilterShader.h ('k') | src/core/SkFlattenable.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 "SkReadBuffer.h" 11 #include "SkReadBuffer.h"
12 #include "SkWriteBuffer.h" 12 #include "SkWriteBuffer.h"
13 #include "SkShader.h" 13 #include "SkShader.h"
14 #include "SkString.h" 14 #include "SkString.h"
15 15
16 SkFilterShader::SkFilterShader(SkShader* shader, SkColorFilter* filter) { 16 SkFilterShader::SkFilterShader(SkShader* shader, SkColorFilter* filter) {
17 fShader = shader; 17 fShader = shader;
18 shader->ref(); 18 shader->ref();
19 19
20 fFilter = filter; 20 fFilter = filter;
21 filter->ref(); 21 filter->ref();
22 } 22 }
23 23
24 #ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
25 SkFilterShader::SkFilterShader(SkReadBuffer& buffer) : INHERITED(buffer) {
26 fShader = buffer.readShader();
27 fFilter = buffer.readColorFilter();
28 }
29 #endif
30
24 SkFilterShader::~SkFilterShader() { 31 SkFilterShader::~SkFilterShader() {
25 fFilter->unref(); 32 fFilter->unref();
26 fShader->unref(); 33 fShader->unref();
27 } 34 }
28 35
29 SkFlattenable* SkFilterShader::CreateProc(SkReadBuffer& buffer) { 36 SkFlattenable* SkFilterShader::CreateProc(SkReadBuffer& buffer) {
30 SkAutoTUnref<SkShader> shader(buffer.readShader()); 37 SkAutoTUnref<SkShader> shader(buffer.readShader());
31 SkAutoTUnref<SkColorFilter> filter(buffer.readColorFilter()); 38 SkAutoTUnref<SkColorFilter> filter(buffer.readColorFilter());
32 if (!shader.get() || !filter.get()) { 39 if (!shader.get() || !filter.get()) {
33 return NULL; 40 return NULL;
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 str->append("Shader: "); 111 str->append("Shader: ");
105 fShader->toString(str); 112 fShader->toString(str);
106 str->append(" Filter: "); 113 str->append(" Filter: ");
107 // TODO: add "fFilter->toString(str);" once SkColorFilter::toString is added 114 // TODO: add "fFilter->toString(str);" once SkColorFilter::toString is added
108 115
109 this->INHERITED::toString(str); 116 this->INHERITED::toString(str);
110 117
111 str->append(")"); 118 str->append(")");
112 } 119 }
113 #endif 120 #endif
OLDNEW
« no previous file with comments | « src/core/SkFilterShader.h ('k') | src/core/SkFlattenable.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698