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

Side by Side Diff: src/effects/SkPorterDuff.cpp

Issue 54603004: Revert "Revert "add SK_ATTR_DEPRECATED -- will need to disable for chrome, since it triggers a warn… (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 1 month 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/effects/SkMorphologyImageFilter.cpp ('k') | src/effects/SkTestImageFilters.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 8
9 9
10 #include "SkPorterDuff.h" 10 #include "SkPorterDuff.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 } 65 }
66 66
67 SkXfermode* SkPorterDuff::CreateXfermode(SkPorterDuff::Mode mode) { 67 SkXfermode* SkPorterDuff::CreateXfermode(SkPorterDuff::Mode mode) {
68 const Pair& pair = gPairs[mode]; 68 const Pair& pair = gPairs[mode];
69 SkASSERT(pair.fPD == mode); 69 SkASSERT(pair.fPD == mode);
70 return SkXfermode::Create(pair.fXF); 70 return SkXfermode::Create(pair.fXF);
71 } 71 }
72 72
73 bool SkPorterDuff::IsMode(SkXfermode* xfer, Mode* pdmode) { 73 bool SkPorterDuff::IsMode(SkXfermode* xfer, Mode* pdmode) {
74 SkXfermode::Mode xfmode; 74 SkXfermode::Mode xfmode;
75 if (!SkXfermode::IsMode(xfer, &xfmode)) { 75 if (!SkXfermode::AsMode(xfer, &xfmode)) {
76 return false; 76 return false;
77 } 77 }
78 return find_pdmode(xfmode, pdmode); 78 return find_pdmode(xfmode, pdmode);
79 } 79 }
80 80
81 SkXfermodeProc SkPorterDuff::GetXfermodeProc(Mode mode) { 81 SkXfermodeProc SkPorterDuff::GetXfermodeProc(Mode mode) {
82 return SkXfermode::GetProc(gPairs[mode].fXF); 82 return SkXfermode::GetProc(gPairs[mode].fXF);
83 } 83 }
84 84
85 SkXfermodeProc16 SkPorterDuff::GetXfermodeProc16(Mode mode, SkColor srcColor) { 85 SkXfermodeProc16 SkPorterDuff::GetXfermodeProc16(Mode mode, SkColor srcColor) {
86 return SkXfermode::GetProc16(gPairs[mode].fXF, srcColor); 86 return SkXfermode::GetProc16(gPairs[mode].fXF, srcColor);
87 } 87 }
OLDNEW
« no previous file with comments | « src/effects/SkMorphologyImageFilter.cpp ('k') | src/effects/SkTestImageFilters.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698