diff options
| author |  benjaminwagner <benjaminwagner@google.com> | 2016-02-03 16:29:25 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-02-03 16:29:25 -0800 |
| commit | ff172dab92b40af96cbf284588ab5ed20982a001 (patch) | |
| tree | d8510a2fcb54132d2496b6cbff8b4f2a4c4bbe25 /src/core | |
| parent | e1daa48b9a5f1724cbfa6b00ba964f7fdfe0c3d0 (diff) | |
Revert of Work around exasperating Google3 Android build error. (patchset #1 id:1 of https://codereview.chromium.org/1649493005/ )
Reason for revert:
This workaround no longer seems to be necessary.
Original issue's description:
> Work around exasperating Google3 Android build error.
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1649493005
>
> Committed: https://skia.googlesource.com/skia/+/900901fb1ba5170549670829fc8f9d9b590ff5f0
TBR=mtklein@google.com,reed@google.com
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=skia:
Review URL: https://codereview.chromium.org/1669663003
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/SkXfermode.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/core/SkXfermode.cpp b/src/core/SkXfermode.cpp index f6d83fae29..86e3ed5dcf 100644 --- a/src/core/SkXfermode.cpp +++ b/src/core/SkXfermode.cpp @@ -1070,5 +1070,3 @@ bool SkXfermode::IsOpaque(const SkXfermode* xfer, SrcColorOpacity opacityType) { SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkXfermode) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkProcCoeffXfermode) SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END - -void SkXfermode::doNothing() const {} |