AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Work around exasperating Google3 Android build error.

Browse Source 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1649493005

Review URL: https://codereview.chromium.org/1649493005
This commit is contained in:
benjaminwagner 2016-01-28 12:55:31 -08:00 committed by Commit bot
parent 317a45e879
commit 900901fb1b
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/core/SkXfermode.h
View File

@ -246,6 +246,9 @@ private:
kModeCount = kLastMode + 1 kModeCount = kLastMode + 1
}; };
// TODO(benjaminwagner): This is crazy, but it fixes the Google3 Android build. :-(
virtual void doNothing() const;
typedef SkFlattenable INHERITED; typedef SkFlattenable INHERITED;
}; };

2
src/core/SkXfermode.cpp
View File

@ -1071,3 +1071,5 @@ bool SkXfermode::IsOpaque(const SkXfermode* xfer, SrcColorOpacity opacityType) {
SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkXfermode) SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkXfermode)
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkProcCoeffXfermode) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkProcCoeffXfermode)
SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END
void SkXfermode::doNothing() const {}