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

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

Issue 1669663003: Revert of Work around exasperating Google3 Android build error. (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: Created 4 years, 10 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 | « include/core/SkXfermode.h ('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 /* 2 /*
3 * Copyright 2006 The Android Open Source Project 3 * Copyright 2006 The Android Open Source Project
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 #include "SkXfermode.h" 9 #include "SkXfermode.h"
10 #include "SkXfermode_proccoeff.h" 10 #include "SkXfermode_proccoeff.h"
(...skipping 1053 matching lines...) Expand 10 before | Expand all | Expand 10 after
1064 if (!xfer) { 1064 if (!xfer) {
1065 return SkXfermode::kOpaque_SrcColorOpacity == opacityType; 1065 return SkXfermode::kOpaque_SrcColorOpacity == opacityType;
1066 } 1066 }
1067 1067
1068 return xfer->isOpaque(opacityType); 1068 return xfer->isOpaque(opacityType);
1069 } 1069 }
1070 1070
1071 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkXfermode) 1071 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkXfermode)
1072 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkProcCoeffXfermode) 1072 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkProcCoeffXfermode)
1073 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END 1073 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END
1074
1075 void SkXfermode::doNothing() const {}
OLDNEW
« no previous file with comments | « include/core/SkXfermode.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698