diff options
| author |  schenney <schenney@chromium.org> | 2015-10-06 12:59:55 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-10-06 12:59:55 -0700 |
| commit | 95376a0dde3cdf414eb97a20cef3af19ed7e0151 (patch) | |
| tree | b304b560eec5feed75d621c1aa3ec9a7df2573d9 /include/effects/SkPixelXorXfermode.h | |
| parent | ccb88bcab03c2d7450b25f614b9203b8b9d7640d (diff) | |
Revert of factories should return baseclass, allowing the impl to specialize (patchset #4 id:60001 of https://codereview.chromium.org/1390523005/ )
Reason for revert:
Breaks Chrome with this link error: ../../third_party/skia/include/effects/SkMorphologyImageFilter.h:75: error: undefined reference to 'SkMorphologyImageFilter::SkMorphologyImageFilter(int, int, SkImageFilter*, SkImageFilter::CropRect const*)'
../../third_party/skia/include/effects/SkMorphologyImageFilter.h:104: error: undefined reference to 'SkMorphologyImageFilter::SkMorphologyImageFilter(int, int, SkImageFilter*, SkImageFilter::CropRect const*)'
Presumably due to code in third_party/WebKit/Source/platform/graphics/filters/FEMorphology.cpp that contains:
#include "SkMorphologyImageFilter.h"
...
if (m_type == FEMORPHOLOGY_OPERATOR_DILATE)
return adoptRef(SkDilateImageFilter::Create(radiusX, radiusY, input.get(), &rect));
return adoptRef(SkErodeImageFilter::Create(radiusX, radiusY, input.get(), &rect));
Original issue's description:
> factories should return baseclass, allowing the impl to specialize
>
> waiting on https://codereview.chromium.org/1386163002/# to land
>
> BUG=skia:4424
>
> Committed: https://skia.googlesource.com/skia/+/80a6dcaa1b757826ed7414f64b035d512d9ccbf8
TBR=senorblanco@google.com,robertphillips@google.com,reed@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:4424
Review URL: https://codereview.chromium.org/1389063002
Diffstat (limited to 'include/effects/SkPixelXorXfermode.h')
| -rw-r--r-- | include/effects/SkPixelXorXfermode.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/effects/SkPixelXorXfermode.h b/include/effects/SkPixelXorXfermode.h index f2fe47156c..8b7f3388ff 100644 --- a/include/effects/SkPixelXorXfermode.h +++ b/include/effects/SkPixelXorXfermode.h @@ -17,18 +17,19 @@ */ class SK_API SkPixelXorXfermode : public SkXfermode { public: - static SkXfermode* Create(SkColor opColor) { return new SkPixelXorXfermode(opColor); } + static SkPixelXorXfermode* Create(SkColor opColor) { return new SkPixelXorXfermode(opColor); } SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPixelXorXfermode) protected: + explicit SkPixelXorXfermode(SkColor opColor) : fOpColor(opColor) {} void flatten(SkWriteBuffer&) const override; + + // override from SkXfermode SkPMColor xferColor(SkPMColor src, SkPMColor dst) const override; private: - explicit SkPixelXorXfermode(SkColor opColor) : fOpColor(opColor) {} - SkColor fOpColor; typedef SkXfermode INHERITED; |