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 /src | |
| parent | ccb88bcab03c2d7450b25f614b9203b8b9d7640d (diff) | |
| download | platform_external_skqp-95376a0dde3cdf414eb97a20cef3af19ed7e0151.tar.gz platform_external_skqp-95376a0dde3cdf414eb97a20cef3af19ed7e0151.tar.bz2 platform_external_skqp-95376a0dde3cdf414eb97a20cef3af19ed7e0151.zip | |
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 'src')
| -rw-r--r-- | src/effects/SkRectShaderImageFilter.cpp | 4 | ||||
| -rw-r--r-- | src/effects/SkTileImageFilter.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/effects/SkRectShaderImageFilter.cpp b/src/effects/SkRectShaderImageFilter.cpp index 14837d02b1..f9e70705c5 100644 --- a/src/effects/SkRectShaderImageFilter.cpp +++ b/src/effects/SkRectShaderImageFilter.cpp @@ -13,7 +13,7 @@ #include "SkWriteBuffer.h" #include "SkShader.h" -SkImageFilter* SkRectShaderImageFilter::Create(SkShader* s, const SkRect& rect) { +SkRectShaderImageFilter* SkRectShaderImageFilter::Create(SkShader* s, const SkRect& rect) { SkASSERT(s); uint32_t flags = CropRect::kHasAll_CropEdge; if (rect.width() == 0 || rect.height() == 0) { @@ -23,7 +23,7 @@ SkImageFilter* SkRectShaderImageFilter::Create(SkShader* s, const SkRect& rect) return s ? new SkRectShaderImageFilter(s, &cropRect) : nullptr; } -SkImageFilter* SkRectShaderImageFilter::Create(SkShader* s, const CropRect* cropRect) { +SkRectShaderImageFilter* SkRectShaderImageFilter::Create(SkShader* s, const CropRect* cropRect) { SkASSERT(s); return s ? new SkRectShaderImageFilter(s, cropRect) : nullptr; } diff --git a/src/effects/SkTileImageFilter.cpp b/src/effects/SkTileImageFilter.cpp index c3eb2f301a..5e633a3556 100644 --- a/src/effects/SkTileImageFilter.cpp +++ b/src/effects/SkTileImageFilter.cpp @@ -16,8 +16,8 @@ #include "SkShader.h" #include "SkValidationUtils.h" -SkImageFilter* SkTileImageFilter::Create(const SkRect& srcRect, const SkRect& dstRect, - SkImageFilter* input) { +SkTileImageFilter* SkTileImageFilter::Create(const SkRect& srcRect, const SkRect& dstRect, + SkImageFilter* input) { if (!SkIsValidRect(srcRect) || !SkIsValidRect(dstRect)) { return nullptr; } |