Remove SK_SUPPORT_LEGACY_DEEPFLATTENING.
This was needed for pictures before v33, and we're now requiring v35+.
Will follow up with the same for skia/ext/pixel_ref_utils_unittest.cc
BUG=skia:
Review URL: https://codereview.chromium.org/769953002
diff --git a/src/effects/Sk1DPathEffect.cpp b/src/effects/Sk1DPathEffect.cpp
index 47824fd..83f684e 100644
--- a/src/effects/Sk1DPathEffect.cpp
+++ b/src/effects/Sk1DPathEffect.cpp
@@ -147,22 +147,6 @@
}
}
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-SkPath1DPathEffect::SkPath1DPathEffect(SkReadBuffer& buffer) {
- fAdvance = buffer.readScalar();
- if (fAdvance > 0) {
- buffer.readPath(&fPath);
- fInitialOffset = buffer.readScalar();
- fStyle = (Style) buffer.readUInt();
- } else {
- SkDEBUGF(("SkPath1DPathEffect can't use advance <= 0\n"));
- // Make Coverity happy.
- fInitialOffset = 0;
- fStyle = kStyleCount;
- }
-}
-#endif
-
SkScalar SkPath1DPathEffect::begin(SkScalar contourLength) const {
return fInitialOffset;
}
diff --git a/src/effects/Sk2DPathEffect.cpp b/src/effects/Sk2DPathEffect.cpp
index cef2266..2ad202a 100644
--- a/src/effects/Sk2DPathEffect.cpp
+++ b/src/effects/Sk2DPathEffect.cpp
@@ -73,13 +73,6 @@
buffer.writeMatrix(fMatrix);
}
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-Sk2DPathEffect::Sk2DPathEffect(SkReadBuffer& buffer) {
- buffer.readMatrix(&fMatrix);
- fMatrixIsInvertible = fMatrix.invert(&fInverse);
-}
-#endif
-
///////////////////////////////////////////////////////////////////////////////
bool SkLine2DPathEffect::filterPath(SkPath* dst, const SkPath& src,
@@ -104,12 +97,6 @@
}
}
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-SkLine2DPathEffect::SkLine2DPathEffect(SkReadBuffer& buffer) : INHERITED(buffer) {
- fWidth = buffer.readScalar();
-}
-#endif
-
SkFlattenable* SkLine2DPathEffect::CreateProc(SkReadBuffer& buffer) {
SkMatrix matrix;
buffer.readMatrix(&matrix);
@@ -128,12 +115,6 @@
: INHERITED(m), fPath(p) {
}
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-SkPath2DPathEffect::SkPath2DPathEffect(SkReadBuffer& buffer) : INHERITED(buffer) {
- buffer.readPath(&fPath);
-}
-#endif
-
SkFlattenable* SkPath2DPathEffect::CreateProc(SkReadBuffer& buffer) {
SkMatrix matrix;
buffer.readMatrix(&matrix);
diff --git a/src/effects/SkAlphaThresholdFilter.cpp b/src/effects/SkAlphaThresholdFilter.cpp
index e181675..ffdba32 100644
--- a/src/effects/SkAlphaThresholdFilter.cpp
+++ b/src/effects/SkAlphaThresholdFilter.cpp
@@ -19,9 +19,6 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkAlphaThresholdFilterImpl)
protected:
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
- explicit SkAlphaThresholdFilterImpl(SkReadBuffer& buffer);
-#endif
virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
@@ -238,15 +235,6 @@
#endif
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-SkAlphaThresholdFilterImpl::SkAlphaThresholdFilterImpl(SkReadBuffer& buffer)
- : INHERITED(1, buffer) {
- fInnerThreshold = buffer.readScalar();
- fOuterThreshold = buffer.readScalar();
- buffer.readRegion(&fRegion);
-}
-#endif
-
SkFlattenable* SkAlphaThresholdFilterImpl::CreateProc(SkReadBuffer& buffer) {
SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1);
SkScalar inner = buffer.readScalar();
diff --git a/src/effects/SkArithmeticMode.cpp b/src/effects/SkArithmeticMode.cpp
index 6fb5241..d1e7472 100644
--- a/src/effects/SkArithmeticMode.cpp
+++ b/src/effects/SkArithmeticMode.cpp
@@ -49,16 +49,6 @@
fEnforcePMColor = enforcePMColor;
}
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
- SkArithmeticMode_scalar(SkReadBuffer& buffer) : INHERITED(buffer) {
- fK[0] = buffer.readScalar();
- fK[1] = buffer.readScalar();
- fK[2] = buffer.readScalar();
- fK[3] = buffer.readScalar();
- fEnforcePMColor = buffer.readBool();
- }
-#endif
-
virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE {
buffer.writeScalar(fK[0]);
buffer.writeScalar(fK[1]);
diff --git a/src/effects/SkAvoidXfermode.cpp b/src/effects/SkAvoidXfermode.cpp
index b596bfd..41c4e96 100644
--- a/src/effects/SkAvoidXfermode.cpp
+++ b/src/effects/SkAvoidXfermode.cpp
@@ -21,14 +21,6 @@
fMode = mode;
}
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-SkAvoidXfermode::SkAvoidXfermode(SkReadBuffer& buffer) : INHERITED(buffer) {
- fOpColor = buffer.readColor();
- fDistMul = buffer.readUInt();
- fMode = (Mode)buffer.readUInt();
-}
-#endif
-
SkFlattenable* SkAvoidXfermode::CreateProc(SkReadBuffer& buffer) {
const SkColor color = buffer.readColor();
const unsigned tolerance = buffer.readUInt();
diff --git a/src/effects/SkBitmapSource.cpp b/src/effects/SkBitmapSource.cpp
index 4da77a9..ff76ab4 100644
--- a/src/effects/SkBitmapSource.cpp
+++ b/src/effects/SkBitmapSource.cpp
@@ -26,15 +26,6 @@
, fSrcRect(srcRect)
, fDstRect(dstRect) {}
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-SkBitmapSource::SkBitmapSource(SkReadBuffer& buffer) : INHERITED(0, buffer) {
- buffer.readBitmap(&fBitmap);
- buffer.readRect(&fSrcRect);
- buffer.readRect(&fDstRect);
- buffer.validate(buffer.isValid() && SkIsValidRect(fSrcRect) && SkIsValidRect(fDstRect));
-}
-#endif
-
SkFlattenable* SkBitmapSource::CreateProc(SkReadBuffer& buffer) {
SkRect src, dst;
buffer.readRect(&src);
diff --git a/src/effects/SkBlurDrawLooper.cpp b/src/effects/SkBlurDrawLooper.cpp
index fc9e47b..b3094d6 100644
--- a/src/effects/SkBlurDrawLooper.cpp
+++ b/src/effects/SkBlurDrawLooper.cpp
@@ -62,19 +62,6 @@
this->initEffects();
}
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-SkBlurDrawLooper::SkBlurDrawLooper(SkReadBuffer& buffer) : INHERITED(buffer) {
-
- fSigma = buffer.readScalar();
- fDx = buffer.readScalar();
- fDy = buffer.readScalar();
- fBlurColor = buffer.readColor();
- fBlurFlags = buffer.readUInt() & kAll_BlurFlag;
-
- this->initEffects();
-}
-#endif
-
SkFlattenable* SkBlurDrawLooper::CreateProc(SkReadBuffer& buffer) {
const SkColor color = buffer.readColor();
const SkScalar sigma = buffer.readScalar();
diff --git a/src/effects/SkBlurImageFilter.cpp b/src/effects/SkBlurImageFilter.cpp
index 4166d20..e5bb8c1 100644
--- a/src/effects/SkBlurImageFilter.cpp
+++ b/src/effects/SkBlurImageFilter.cpp
@@ -31,18 +31,6 @@
return sigma;
}
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-SkBlurImageFilter::SkBlurImageFilter(SkReadBuffer& buffer)
- : INHERITED(1, buffer) {
- fSigma.fWidth = buffer.readScalar();
- fSigma.fHeight = buffer.readScalar();
- buffer.validate(SkScalarIsFinite(fSigma.fWidth) &&
- SkScalarIsFinite(fSigma.fHeight) &&
- (fSigma.fWidth >= 0) &&
- (fSigma.fHeight >= 0));
-}
-#endif
-
SkBlurImageFilter::SkBlurImageFilter(SkScalar sigmaX,
SkScalar sigmaY,
SkImageFilter* input,
diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp
index 5b0e60a..b5bcc3c 100644
--- a/src/effects/SkBlurMaskFilter.cpp
+++ b/src/effects/SkBlurMaskFilter.cpp
@@ -585,16 +585,6 @@
src.fRight + pad, src.fBottom + pad);
}
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-SkBlurMaskFilterImpl::SkBlurMaskFilterImpl(SkReadBuffer& buffer) : SkMaskFilter(buffer) {
- fSigma = buffer.readScalar();
- fBlurStyle = (SkBlurStyle)buffer.readInt();
- fBlurFlags = buffer.readUInt() & SkBlurMaskFilter::kAll_BlurFlag;
- SkASSERT(fSigma > 0);
- SkASSERT((unsigned)fBlurStyle <= kLastEnum_SkBlurStyle);
-}
-#endif
-
SkFlattenable* SkBlurMaskFilterImpl::CreateProc(SkReadBuffer& buffer) {
const SkScalar sigma = buffer.readScalar();
const unsigned style = buffer.readUInt();
diff --git a/src/effects/SkColorCubeFilter.cpp b/src/effects/SkColorCubeFilter.cpp
index 18c5b56..30641c3 100644
--- a/src/effects/SkColorCubeFilter.cpp
+++ b/src/effects/SkColorCubeFilter.cpp
@@ -161,15 +161,6 @@
}
}
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-SkColorCubeFilter::SkColorCubeFilter(SkReadBuffer& buffer)
- : fCache(buffer.readInt()) {
- fCubeData.reset(buffer.readByteArrayAsData());
- buffer.validate(is_valid_3D_lut(fCubeData, fCache.cubeDimension()));
- fUniqueID = SkNextColorCubeUniqueID();
-}
-#endif
-
SkFlattenable* SkColorCubeFilter::CreateProc(SkReadBuffer& buffer) {
int cubeDimension = buffer.readInt();
SkAutoDataUnref cubeData(buffer.readByteArrayAsData());
diff --git a/src/effects/SkColorFilterImageFilter.cpp b/src/effects/SkColorFilterImageFilter.cpp
index 012f132..10976d7 100755
--- a/src/effects/SkColorFilterImageFilter.cpp
+++ b/src/effects/SkColorFilterImageFilter.cpp
@@ -84,21 +84,6 @@
: INHERITED(1, &input, cropRect, uniqueID), fColorFilter(SkRef(cf)) {
}
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-SkColorFilterImageFilter::SkColorFilterImageFilter(SkReadBuffer& buffer) : INHERITED(1, buffer) {
- fColorFilter = buffer.readColorFilter();
- // we aren't prepared for this to be NULL, and it can't ever be when we're NOT supporting
- // SK_SUPPORT_LEGACY_DEEPFLATTENING, as we always go through a factory which can detect
- // NULL. However, since here we're in the legacy code, we assign a dummy filter so we
- // don't crash with a null-ptr.
- if (NULL == fColorFilter) {
- // colormatrix identity is effectively a no-op
- fColorFilter = SkColorMatrixFilter::Create(SkColorMatrix());
- SkASSERT(fColorFilter);
- }
-}
-#endif
-
SkFlattenable* SkColorFilterImageFilter::CreateProc(SkReadBuffer& buffer) {
SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1);
SkAutoTUnref<SkColorFilter> cf(buffer.readColorFilter());
diff --git a/src/effects/SkColorFilters.cpp b/src/effects/SkColorFilters.cpp
index e085281..92e6f43 100644
--- a/src/effects/SkColorFilters.cpp
+++ b/src/effects/SkColorFilters.cpp
@@ -84,17 +84,6 @@
buffer.writeUInt(fMode);
}
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
- SkModeColorFilter(SkReadBuffer& buffer) {
- fColor = buffer.readColor();
- fMode = (SkXfermode::Mode)buffer.readUInt();
- if (buffer.isValid()) {
- this->updateCache();
- buffer.validate(SkIsValidMode(fMode));
- }
- }
-#endif
-
private:
SkColor fColor;
SkXfermode::Mode fMode;
diff --git a/src/effects/SkColorMatrixFilter.cpp b/src/effects/SkColorMatrixFilter.cpp
index 2070292..27231b1 100644
--- a/src/effects/SkColorMatrixFilter.cpp
+++ b/src/effects/SkColorMatrixFilter.cpp
@@ -307,15 +307,6 @@
buffer.writeScalarArray(fMatrix.fMat, 20);
}
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-SkColorMatrixFilter::SkColorMatrixFilter(SkReadBuffer& buffer) : INHERITED(buffer) {
- SkASSERT(buffer.getArrayCount() == 20);
- if (buffer.readScalarArray(fMatrix.fMat, 20)) {
- this->initState(fMatrix.fMat);
- }
-}
-#endif
-
SkFlattenable* SkColorMatrixFilter::CreateProc(SkReadBuffer& buffer) {
SkColorMatrix matrix;
if (buffer.readScalarArray(matrix.fMat, 20)) {
diff --git a/src/effects/SkComposeImageFilter.cpp b/src/effects/SkComposeImageFilter.cpp
index c055674..9bec500 100644
--- a/src/effects/SkComposeImageFilter.cpp
+++ b/src/effects/SkComposeImageFilter.cpp
@@ -40,9 +40,3 @@
SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 2);
return SkComposeImageFilter::Create(common.getInput(0), common.getInput(1));
}
-
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-SkComposeImageFilter::SkComposeImageFilter(SkReadBuffer& buffer)
- : INHERITED(2, buffer) {
-}
-#endif
diff --git a/src/effects/SkCornerPathEffect.cpp b/src/effects/SkCornerPathEffect.cpp
index 0655882..8dc506a 100644
--- a/src/effects/SkCornerPathEffect.cpp
+++ b/src/effects/SkCornerPathEffect.cpp
@@ -135,9 +135,3 @@
void SkCornerPathEffect::flatten(SkWriteBuffer& buffer) const {
buffer.writeScalar(fRadius);
}
-
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-SkCornerPathEffect::SkCornerPathEffect(SkReadBuffer& buffer) {
- fRadius = buffer.readScalar();
-}
-#endif
diff --git a/src/effects/SkDashPathEffect.cpp b/src/effects/SkDashPathEffect.cpp
index f31d883..f866ea0 100644
--- a/src/effects/SkDashPathEffect.cpp
+++ b/src/effects/SkDashPathEffect.cpp
@@ -369,28 +369,3 @@
}
return NULL;
}
-
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-SkDashPathEffect::SkDashPathEffect(SkReadBuffer& buffer)
- : INHERITED(buffer)
- , fPhase(0)
- , fInitialDashLength(0)
- , fInitialDashIndex(0)
- , fIntervalLength(0) {
- fPhase = buffer.readScalar();
- fCount = buffer.getArrayCount();
- size_t allocSize = sizeof(SkScalar) * fCount;
- if (buffer.validateAvailable(allocSize)) {
- fIntervals = (SkScalar*)sk_malloc_throw(allocSize);
- buffer.readScalarArray(fIntervals, fCount);
- } else {
- fIntervals = NULL;
- }
-
- // set the internal data members, fPhase should have been between 0 and intervalLength
- // when written to buffer so no need to adjust it
- SkDashPath::CalcDashParameters(fPhase, fIntervals, fCount,
- &fInitialDashLength, &fInitialDashIndex, &fIntervalLength);
-}
-#endif
-
diff --git a/src/effects/SkDiscretePathEffect.cpp b/src/effects/SkDiscretePathEffect.cpp
index e8cc6a2..8aa0e22 100644
--- a/src/effects/SkDiscretePathEffect.cpp
+++ b/src/effects/SkDiscretePathEffect.cpp
@@ -87,12 +87,3 @@
buffer.writeScalar(fPerterb);
buffer.writeUInt(fSeedAssist);
}
-
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-SkDiscretePathEffect::SkDiscretePathEffect(SkReadBuffer& buffer) {
- fSegLength = buffer.readScalar();
- fPerterb = buffer.readScalar();
- fSeedAssist = buffer.readUInt();
-}
-#endif
-
diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp
index edae044..d39240e 100644
--- a/src/effects/SkDisplacementMapEffect.cpp
+++ b/src/effects/SkDisplacementMapEffect.cpp
@@ -192,19 +192,6 @@
SkDisplacementMapEffect::~SkDisplacementMapEffect() {
}
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-SkDisplacementMapEffect::SkDisplacementMapEffect(SkReadBuffer& buffer)
- : INHERITED(2, buffer)
-{
- fXChannelSelector = (SkDisplacementMapEffect::ChannelSelectorType) buffer.readInt();
- fYChannelSelector = (SkDisplacementMapEffect::ChannelSelectorType) buffer.readInt();
- fScale = buffer.readScalar();
- buffer.validate(channel_selector_type_is_valid(fXChannelSelector) &&
- channel_selector_type_is_valid(fYChannelSelector) &&
- SkScalarIsFinite(fScale));
-}
-#endif
-
SkFlattenable* SkDisplacementMapEffect::CreateProc(SkReadBuffer& buffer) {
SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 2);
ChannelSelectorType xsel = (ChannelSelectorType)buffer.readInt();
diff --git a/src/effects/SkDropShadowImageFilter.cpp b/src/effects/SkDropShadowImageFilter.cpp
index 0ba8b23..5bbb958 100644
--- a/src/effects/SkDropShadowImageFilter.cpp
+++ b/src/effects/SkDropShadowImageFilter.cpp
@@ -29,24 +29,6 @@
{
}
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-SkDropShadowImageFilter::SkDropShadowImageFilter(SkReadBuffer& buffer)
- : INHERITED(1, buffer) {
- fDx = buffer.readScalar();
- fDy = buffer.readScalar();
- fSigmaX = buffer.readScalar();
- fSigmaY = buffer.readScalar();
- fColor = buffer.readColor();
- fShadowMode = buffer.isVersionLT(SkReadBuffer::kDropShadowMode_Version) ?
- kDrawShadowAndForeground_ShadowMode :
- static_cast<ShadowMode>(buffer.readInt());
- buffer.validate(SkScalarIsFinite(fDx) &&
- SkScalarIsFinite(fDy) &&
- SkScalarIsFinite(fSigmaX) &&
- SkScalarIsFinite(fSigmaY));
-}
-#endif
-
SkFlattenable* SkDropShadowImageFilter::CreateProc(SkReadBuffer& buffer) {
SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1);
SkScalar dx = buffer.readScalar();
diff --git a/src/effects/SkEmbossMaskFilter.cpp b/src/effects/SkEmbossMaskFilter.cpp
index 4841b92..8fcd272 100644
--- a/src/effects/SkEmbossMaskFilter.cpp
+++ b/src/effects/SkEmbossMaskFilter.cpp
@@ -124,15 +124,6 @@
return true;
}
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-SkEmbossMaskFilter::SkEmbossMaskFilter(SkReadBuffer& buffer) : SkMaskFilter(buffer) {
- SkASSERT(buffer.getArrayCount() == sizeof(Light));
- buffer.readByteArray(&fLight, sizeof(Light));
- SkASSERT(fLight.fPad == 0); // for the font-cache lookup to be clean
- fBlurSigma = buffer.readScalar();
-}
-#endif
-
SkFlattenable* SkEmbossMaskFilter::CreateProc(SkReadBuffer& buffer) {
Light light;
if (buffer.readByteArray(&light, sizeof(Light))) {
diff --git a/src/effects/SkLayerRasterizer.cpp b/src/effects/SkLayerRasterizer.cpp
index b331a03..d3e112c 100644
--- a/src/effects/SkLayerRasterizer.cpp
+++ b/src/effects/SkLayerRasterizer.cpp
@@ -148,18 +148,13 @@
return true;
}
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-SkLayerRasterizer::SkLayerRasterizer(SkReadBuffer& buffer)
- : SkRasterizer(buffer), fLayers(ReadLayers(buffer)) {}
-#endif
-
SkFlattenable* SkLayerRasterizer::CreateProc(SkReadBuffer& buffer) {
return SkNEW_ARGS(SkLayerRasterizer, (ReadLayers(buffer)));
}
SkDeque* SkLayerRasterizer::ReadLayers(SkReadBuffer& buffer) {
int count = buffer.readInt();
-
+
SkDeque* layers = SkNEW_ARGS(SkDeque, (sizeof(SkLayerRasterizer_Rec)));
for (int i = 0; i < count; i++) {
SkLayerRasterizer_Rec* rec = (SkLayerRasterizer_Rec*)layers->push_back();
diff --git a/src/effects/SkLerpXfermode.cpp b/src/effects/SkLerpXfermode.cpp
index 0376a57..76c97ef 100644
--- a/src/effects/SkLerpXfermode.cpp
+++ b/src/effects/SkLerpXfermode.cpp
@@ -23,12 +23,6 @@
SkLerpXfermode::SkLerpXfermode(unsigned scale256) : fScale256(scale256) {}
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-SkLerpXfermode::SkLerpXfermode(SkReadBuffer& buffer) : INHERITED(buffer) {
- fScale256 = buffer.readUInt();
-}
-#endif
-
void SkLerpXfermode::flatten(SkWriteBuffer& buffer) const {
buffer.writeUInt(fScale256);
}
diff --git a/src/effects/SkLightingImageFilter.cpp b/src/effects/SkLightingImageFilter.cpp
index bf9877e..740ad02 100644
--- a/src/effects/SkLightingImageFilter.cpp
+++ b/src/effects/SkLightingImageFilter.cpp
@@ -290,9 +290,6 @@
SkDiffuseLightingImageFilter(SkLight* light, SkScalar surfaceScale,
SkScalar kd, SkImageFilter* input, const CropRect* cropRect,
uint32_t uniqueID);
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
- explicit SkDiffuseLightingImageFilter(SkReadBuffer& buffer);
-#endif
virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE;
virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE;
@@ -322,9 +319,6 @@
SkSpecularLightingImageFilter(SkLight* light, SkScalar surfaceScale, SkScalar ks,
SkScalar shininess, SkImageFilter* input, const CropRect*,
uint32_t uniqueID);
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
- explicit SkSpecularLightingImageFilter(SkReadBuffer& buffer);
-#endif
virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE;
virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE;
@@ -942,15 +936,6 @@
SkLightingImageFilter::~SkLightingImageFilter() {}
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-SkLightingImageFilter::SkLightingImageFilter(SkReadBuffer& buffer)
- : INHERITED(1, buffer) {
- fLight.reset(SkLight::UnflattenLight(buffer));
- fSurfaceScale = buffer.readScalar();
- buffer.validate(SkScalarIsFinite(fSurfaceScale));
-}
-#endif
-
void SkLightingImageFilter::flatten(SkWriteBuffer& buffer) const {
this->INHERITED::flatten(buffer);
fLight->flattenLight(buffer);
@@ -981,15 +966,6 @@
{
}
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-SkDiffuseLightingImageFilter::SkDiffuseLightingImageFilter(SkReadBuffer& buffer)
- : INHERITED(buffer)
-{
- fKD = buffer.readScalar();
- buffer.validate(SkScalarIsFinite(fKD) && (fKD >= 0));
-}
-#endif
-
SkFlattenable* SkDiffuseLightingImageFilter::CreateProc(SkReadBuffer& buffer) {
SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1);
SkAutoTUnref<SkLight> light(SkLight::UnflattenLight(buffer));
@@ -1096,17 +1072,6 @@
{
}
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-SkSpecularLightingImageFilter::SkSpecularLightingImageFilter(SkReadBuffer& buffer)
- : INHERITED(buffer)
-{
- fKS = buffer.readScalar();
- fShininess = buffer.readScalar();
- buffer.validate(SkScalarIsFinite(fKS) && (fKS >= 0) &&
- SkScalarIsFinite(fShininess));
-}
-#endif
-
SkFlattenable* SkSpecularLightingImageFilter::CreateProc(SkReadBuffer& buffer) {
SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1);
SkAutoTUnref<SkLight> light(SkLight::UnflattenLight(buffer));
diff --git a/src/effects/SkLumaColorFilter.cpp b/src/effects/SkLumaColorFilter.cpp
index 2b57cb1..9ad5797 100644
--- a/src/effects/SkLumaColorFilter.cpp
+++ b/src/effects/SkLumaColorFilter.cpp
@@ -44,10 +44,6 @@
SkLumaColorFilter::SkLumaColorFilter() : INHERITED() {}
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-SkLumaColorFilter::SkLumaColorFilter(SkReadBuffer& buffer) : INHERITED(buffer) {}
-#endif
-
SkFlattenable* SkLumaColorFilter::CreateProc(SkReadBuffer&) {
return SkNEW(SkLumaColorFilter);
}
diff --git a/src/effects/SkMagnifierImageFilter.cpp b/src/effects/SkMagnifierImageFilter.cpp
index e0826ef..973ac66 100644
--- a/src/effects/SkMagnifierImageFilter.cpp
+++ b/src/effects/SkMagnifierImageFilter.cpp
@@ -235,7 +235,7 @@
SkImageFilter* SkMagnifierImageFilter::Create(const SkRect& srcRect, SkScalar inset,
SkImageFilter* input) {
-
+
if (!SkScalarIsFinite(inset) || !SkIsValidRect(srcRect)) {
return NULL;
}
@@ -247,22 +247,6 @@
}
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-SkMagnifierImageFilter::SkMagnifierImageFilter(SkReadBuffer& buffer)
- : INHERITED(1, buffer) {
- float x = buffer.readScalar();
- float y = buffer.readScalar();
- float width = buffer.readScalar();
- float height = buffer.readScalar();
- fSrcRect = SkRect::MakeXYWH(x, y, width, height);
- fInset = buffer.readScalar();
-
- buffer.validate(SkScalarIsFinite(fInset) && SkIsValidRect(fSrcRect) &&
- // Negative numbers in src rect are not supported
- (fSrcRect.fLeft >= 0) && (fSrcRect.fTop >= 0));
-}
-#endif
-
SkMagnifierImageFilter::SkMagnifierImageFilter(const SkRect& srcRect, SkScalar inset,
SkImageFilter* input)
: INHERITED(1, &input), fSrcRect(srcRect), fInset(inset) {
diff --git a/src/effects/SkMatrixConvolutionImageFilter.cpp b/src/effects/SkMatrixConvolutionImageFilter.cpp
index cdcf66f..045f6a9 100644
--- a/src/effects/SkMatrixConvolutionImageFilter.cpp
+++ b/src/effects/SkMatrixConvolutionImageFilter.cpp
@@ -76,50 +76,6 @@
input, cropRect, uniqueID));
}
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-static bool tile_mode_is_valid(SkMatrixConvolutionImageFilter::TileMode tileMode) {
- switch (tileMode) {
- case SkMatrixConvolutionImageFilter::kClamp_TileMode:
- case SkMatrixConvolutionImageFilter::kRepeat_TileMode:
- case SkMatrixConvolutionImageFilter::kClampToBlack_TileMode:
- return true;
- default:
- break;
- }
- return false;
-}
-
-SkMatrixConvolutionImageFilter::SkMatrixConvolutionImageFilter(SkReadBuffer& buffer)
- : INHERITED(1, buffer) {
- fKernelSize.fWidth = buffer.readInt();
- fKernelSize.fHeight = buffer.readInt();
- if ((fKernelSize.fWidth >= 1) && (fKernelSize.fHeight >= 1) &&
- // Make sure size won't be larger than a signed int,
- // which would still be extremely large for a kernel,
- // but we don't impose a hard limit for kernel size
- (gMaxKernelSize / fKernelSize.fWidth >= fKernelSize.fHeight)) {
- size_t size = fKernelSize.fWidth * fKernelSize.fHeight;
- fKernel = SkNEW_ARRAY(SkScalar, size);
- SkDEBUGCODE(bool success =) buffer.readScalarArray(fKernel, size);
- SkASSERT(success);
- } else {
- fKernel = 0;
- }
- fGain = buffer.readScalar();
- fBias = buffer.readScalar();
- fKernelOffset.fX = buffer.readInt();
- fKernelOffset.fY = buffer.readInt();
- fTileMode = (TileMode) buffer.readInt();
- fConvolveAlpha = buffer.readBool();
- buffer.validate((fKernel != 0) &&
- SkScalarIsFinite(fGain) &&
- SkScalarIsFinite(fBias) &&
- tile_mode_is_valid(fTileMode) &&
- (fKernelOffset.fX >= 0) && (fKernelOffset.fX < fKernelSize.fWidth) &&
- (fKernelOffset.fY >= 0) && (fKernelOffset.fY < fKernelSize.fHeight));
-}
-#endif
-
SkFlattenable* SkMatrixConvolutionImageFilter::CreateProc(SkReadBuffer& buffer) {
SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1);
SkISize kernelSize;
diff --git a/src/effects/SkMatrixImageFilter.cpp b/src/effects/SkMatrixImageFilter.cpp
index 8b07dd4..919dff3 100644
--- a/src/effects/SkMatrixImageFilter.cpp
+++ b/src/effects/SkMatrixImageFilter.cpp
@@ -31,14 +31,6 @@
return SkNEW_ARGS(SkMatrixImageFilter, (transform, filterLevel, input, uniqueID));
}
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-SkMatrixImageFilter::SkMatrixImageFilter(SkReadBuffer& buffer)
- : INHERITED(1, buffer) {
- buffer.readMatrix(&fTransform);
- fFilterLevel = static_cast<SkPaint::FilterLevel>(buffer.readInt());
-}
-#endif
-
SkFlattenable* SkMatrixImageFilter::CreateProc(SkReadBuffer& buffer) {
SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1);
SkMatrix matrix;
diff --git a/src/effects/SkMergeImageFilter.cpp b/src/effects/SkMergeImageFilter.cpp
index 9e7f4e5..d932d3c 100755
--- a/src/effects/SkMergeImageFilter.cpp
+++ b/src/effects/SkMergeImageFilter.cpp
@@ -140,24 +140,3 @@
buffer.writeByteArray(fModes, countInputs() * sizeof(fModes[0]));
}
}
-
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-SkMergeImageFilter::SkMergeImageFilter(SkReadBuffer& buffer)
- : INHERITED(-1, buffer) {
- bool hasModes = buffer.readBool();
- if (hasModes) {
- this->initAllocModes();
- int nbInputs = countInputs();
- size_t size = nbInputs * sizeof(fModes[0]);
- SkASSERT(buffer.getArrayCount() == size);
- if (buffer.validate(buffer.getArrayCount() == size) &&
- buffer.readByteArray(fModes, size)) {
- for (int i = 0; i < nbInputs; ++i) {
- buffer.validate(SkIsValidMode((SkXfermode::Mode)fModes[i]));
- }
- }
- } else {
- fModes = 0;
- }
-}
-#endif
diff --git a/src/effects/SkMorphologyImageFilter.cpp b/src/effects/SkMorphologyImageFilter.cpp
index 9c97c35..3d27d10 100644
--- a/src/effects/SkMorphologyImageFilter.cpp
+++ b/src/effects/SkMorphologyImageFilter.cpp
@@ -22,16 +22,6 @@
#include "effects/Gr1DKernelEffect.h"
#endif
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-SkMorphologyImageFilter::SkMorphologyImageFilter(SkReadBuffer& buffer)
- : INHERITED(1, buffer) {
- fRadius.fWidth = buffer.readInt();
- fRadius.fHeight = buffer.readInt();
- buffer.validate((fRadius.fWidth >= 0) &&
- (fRadius.fHeight >= 0));
-}
-#endif
-
SkMorphologyImageFilter::SkMorphologyImageFilter(int radiusX,
int radiusY,
SkImageFilter* input,
diff --git a/src/effects/SkOffsetImageFilter.cpp b/src/effects/SkOffsetImageFilter.cpp
index 90528c6..b7ded08 100644
--- a/src/effects/SkOffsetImageFilter.cpp
+++ b/src/effects/SkOffsetImageFilter.cpp
@@ -108,12 +108,3 @@
: INHERITED(1, &input, cropRect, uniqueID) {
fOffset.set(dx, dy);
}
-
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-SkOffsetImageFilter::SkOffsetImageFilter(SkReadBuffer& buffer)
- : INHERITED(1, buffer) {
- buffer.readPoint(&fOffset);
- buffer.validate(SkScalarIsFinite(fOffset.fX) &&
- SkScalarIsFinite(fOffset.fY));
-}
-#endif
diff --git a/src/effects/SkPerlinNoiseShader.cpp b/src/effects/SkPerlinNoiseShader.cpp
index 0192589..8c608fa 100644
--- a/src/effects/SkPerlinNoiseShader.cpp
+++ b/src/effects/SkPerlinNoiseShader.cpp
@@ -51,11 +51,6 @@
return SkScalarMul(SkScalarSquare(t), SK_Scalar3 - 2 * t);
}
-bool perlin_noise_type_is_valid(SkPerlinNoiseShader::Type type) {
- return (SkPerlinNoiseShader::kFractalNoise_Type == type) ||
- (SkPerlinNoiseShader::kTurbulence_Type == type);
-}
-
} // end namespace
struct SkPerlinNoiseShader::StitchData {
@@ -288,22 +283,6 @@
SkASSERT(numOctaves >= 0 && numOctaves < 256);
}
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-SkPerlinNoiseShader::SkPerlinNoiseShader(SkReadBuffer& buffer) : INHERITED(buffer) {
- fType = (SkPerlinNoiseShader::Type) buffer.readInt();
- fBaseFrequencyX = buffer.readScalar();
- fBaseFrequencyY = buffer.readScalar();
- fNumOctaves = buffer.readInt();
- fSeed = buffer.readScalar();
- fStitchTiles = buffer.readBool();
- fTileSize.fWidth = buffer.readInt();
- fTileSize.fHeight = buffer.readInt();
- buffer.validate(perlin_noise_type_is_valid(fType) &&
- (fNumOctaves >= 0) && (fNumOctaves <= 255) &&
- (fStitchTiles != fTileSize.isEmpty()));
-}
-#endif
-
SkPerlinNoiseShader::~SkPerlinNoiseShader() {
}
@@ -964,7 +943,7 @@
const SkMatrix* externalLocalMatrix,
GrColor* paintColor, GrFragmentProcessor** fp) const {
SkASSERT(context);
-
+
*paintColor = SkColor2GrColorJustAlpha(paint.getColor());
SkMatrix localMatrix = this->getLocalMatrix();
diff --git a/src/effects/SkPictureImageFilter.cpp b/src/effects/SkPictureImageFilter.cpp
index da5597d..5399ea7 100644
--- a/src/effects/SkPictureImageFilter.cpp
+++ b/src/effects/SkPictureImageFilter.cpp
@@ -30,21 +30,6 @@
SkSafeUnref(fPicture);
}
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-SkPictureImageFilter::SkPictureImageFilter(SkReadBuffer& buffer)
- : INHERITED(0, buffer),
- fPicture(NULL) {
- if (!buffer.isCrossProcess()) {
- if (buffer.readBool()) {
- fPicture = SkPicture::CreateFromBuffer(buffer);
- }
- } else {
- buffer.validate(!buffer.readBool());
- }
- buffer.readRect(&fCropRect);
-}
-#endif
-
SkFlattenable* SkPictureImageFilter::CreateProc(SkReadBuffer& buffer) {
SkAutoTUnref<SkPicture> picture;
SkRect cropRect;
diff --git a/src/effects/SkPixelXorXfermode.cpp b/src/effects/SkPixelXorXfermode.cpp
index 68b5306..2a6ac47 100644
--- a/src/effects/SkPixelXorXfermode.cpp
+++ b/src/effects/SkPixelXorXfermode.cpp
@@ -25,12 +25,6 @@
wb.writeColor(fOpColor);
}
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-SkPixelXorXfermode::SkPixelXorXfermode(SkReadBuffer& rb) : INHERITED(rb) {
- fOpColor = rb.readColor();
-}
-#endif
-
SkFlattenable* SkPixelXorXfermode::CreateProc(SkReadBuffer& buffer) {
return Create(buffer.readColor());
}
diff --git a/src/effects/SkRectShaderImageFilter.cpp b/src/effects/SkRectShaderImageFilter.cpp
index 09417c8..91a127e 100644
--- a/src/effects/SkRectShaderImageFilter.cpp
+++ b/src/effects/SkRectShaderImageFilter.cpp
@@ -34,13 +34,6 @@
, fShader(SkRef(s)) {
}
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-SkRectShaderImageFilter::SkRectShaderImageFilter(SkReadBuffer& buffer)
- : INHERITED(0, buffer) {
- fShader = buffer.readShader();
-}
-#endif
-
SkFlattenable* SkRectShaderImageFilter::CreateProc(SkReadBuffer& buffer) {
SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 0);
SkAutoTUnref<SkShader> shader(buffer.readShader());
diff --git a/src/effects/SkTableColorFilter.cpp b/src/effects/SkTableColorFilter.cpp
index c3c2ba0..7cd628f 100644
--- a/src/effects/SkTableColorFilter.cpp
+++ b/src/effects/SkTableColorFilter.cpp
@@ -61,9 +61,6 @@
};
protected:
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
- SkTable_ColorFilter(SkReadBuffer& buffer);
-#endif
virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
private:
@@ -227,27 +224,6 @@
return SkTableColorFilter::CreateARGB(a, r, g, b);
}
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-SkTable_ColorFilter::SkTable_ColorFilter(SkReadBuffer& buffer) : INHERITED(buffer) {
- fBitmap = NULL;
-
- uint8_t storage[5*256];
-
- fFlags = buffer.readInt();
-
- size_t size = buffer.getArrayCount();
- SkASSERT(size <= sizeof(storage));
- buffer.validate(size <= sizeof(storage));
- buffer.readByteArray(storage, size);
-
- SkDEBUGCODE(size_t raw = ) SkPackBits::Unpack8(storage, size, fStorage);
-
- SkASSERT(raw <= sizeof(fStorage));
- SkDEBUGCODE(size_t count = gCountNibBits[fFlags & 0xF]);
- SkASSERT(raw == count * 256);
-}
-#endif
-
bool SkTable_ColorFilter::asComponentTable(SkBitmap* table) const {
if (table) {
if (NULL == fBitmap) {
@@ -312,7 +288,7 @@
GrTextureAccess fTextureAccess;
// currently not used in shader code, just to assist onComputeInvariantOutput().
- unsigned fFlags;
+ unsigned fFlags;
GrTextureStripAtlas* fAtlas;
int fRow;
@@ -358,7 +334,7 @@
rgbaYValues[3] = 0.125;
rgbaYValues[0] = 0.375;
rgbaYValues[1] = 0.625;
- rgbaYValues[2] = 0.875;
+ rgbaYValues[2] = 0.875;
}
pdm.set4fv(fRGBAYValuesUni, 1, rgbaYValues);
}
diff --git a/src/effects/SkTableMaskFilter.cpp b/src/effects/SkTableMaskFilter.cpp
index 42b4ab6..dc9b335 100644
--- a/src/effects/SkTableMaskFilter.cpp
+++ b/src/effects/SkTableMaskFilter.cpp
@@ -82,13 +82,6 @@
return Create(table);
}
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-SkTableMaskFilter::SkTableMaskFilter(SkReadBuffer& rb) : INHERITED(rb) {
- SkASSERT(256 == rb.getArrayCount());
- rb.readByteArray(fTable, 256);
-}
-#endif
-
///////////////////////////////////////////////////////////////////////////////
void SkTableMaskFilter::MakeGammaTable(uint8_t table[256], SkScalar gamma) {
diff --git a/src/effects/SkTestImageFilters.cpp b/src/effects/SkTestImageFilters.cpp
index a414c92..be991f6 100755
--- a/src/effects/SkTestImageFilters.cpp
+++ b/src/effects/SkTestImageFilters.cpp
@@ -80,11 +80,3 @@
this->INHERITED::flatten(buffer);
buffer.writeScalar(fScale);
}
-
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-SkDownSampleImageFilter::SkDownSampleImageFilter(SkReadBuffer& buffer)
- : INHERITED(1, buffer) {
- fScale = buffer.readScalar();
- buffer.validate(SkScalarIsFinite(fScale));
-}
-#endif
diff --git a/src/effects/SkTileImageFilter.cpp b/src/effects/SkTileImageFilter.cpp
index 04c62d0..d640ac7 100644
--- a/src/effects/SkTileImageFilter.cpp
+++ b/src/effects/SkTileImageFilter.cpp
@@ -93,15 +93,6 @@
return true;
}
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-SkTileImageFilter::SkTileImageFilter(SkReadBuffer& buffer)
- : INHERITED(1, buffer) {
- buffer.readRect(&fSrcRect);
- buffer.readRect(&fDstRect);
- buffer.validate(buffer.isValid() && SkIsValidRect(fSrcRect) && SkIsValidRect(fDstRect));
-}
-#endif
-
SkFlattenable* SkTileImageFilter::CreateProc(SkReadBuffer& buffer) {
SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1);
SkRect src, dst;
diff --git a/src/effects/SkXfermodeImageFilter.cpp b/src/effects/SkXfermodeImageFilter.cpp
index 379d6d8..1618b64 100644
--- a/src/effects/SkXfermodeImageFilter.cpp
+++ b/src/effects/SkXfermodeImageFilter.cpp
@@ -32,13 +32,6 @@
SkSafeUnref(fMode);
}
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-SkXfermodeImageFilter::SkXfermodeImageFilter(SkReadBuffer& buffer)
- : INHERITED(2, buffer) {
- fMode = buffer.readXfermode();
-}
-#endif
-
SkFlattenable* SkXfermodeImageFilter::CreateProc(SkReadBuffer& buffer) {
SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 2);
SkAutoTUnref<SkXfermode> mode(buffer.readXfermode());
diff --git a/src/effects/gradients/SkGradientShader.cpp b/src/effects/gradients/SkGradientShader.cpp
index d7b5144..e70be04 100644
--- a/src/effects/gradients/SkGradientShader.cpp
+++ b/src/effects/gradients/SkGradientShader.cpp
@@ -199,56 +199,6 @@
this->initCommon();
}
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-static SkShader::TileMode unpack_mode(uint32_t packed) {
- return (SkShader::TileMode)(packed & 0xF);
-}
-
-static uint32_t unpack_flags(uint32_t packed) {
- return packed >> 4;
-}
-
-SkGradientShaderBase::SkGradientShaderBase(SkReadBuffer& buffer) : INHERITED(buffer) {
- int colorCount = fColorCount = buffer.getArrayCount();
- if (colorCount > kColorStorageCount) {
- size_t allocSize = (sizeof(SkColor) + sizeof(SkScalar) + sizeof(Rec)) * colorCount;
- if (buffer.validateAvailable(allocSize)) {
- fOrigColors = reinterpret_cast<SkColor*>(sk_malloc_throw(allocSize));
- } else {
- fOrigColors = NULL;
- colorCount = fColorCount = 0;
- }
- } else {
- fOrigColors = fStorage;
- }
- buffer.readColorArray(fOrigColors, colorCount);
-
- fOrigPos = (SkScalar*)(fOrigColors + colorCount);
-
- {
- uint32_t packed = buffer.readUInt();
- fGradFlags = SkToU8(unpack_flags(packed));
- fTileMode = unpack_mode(packed);
- }
- fTileProc = gTileProcs[fTileMode];
- fRecs = (Rec*)(fOrigPos + colorCount);
- if (colorCount > 2) {
- Rec* recs = fRecs;
- recs[0].fPos = 0;
- fOrigPos[0] = 0;
- for (int i = 1; i < colorCount; i++) {
- recs[i].fPos = buffer.readInt();
- recs[i].fScale = buffer.readUInt();
- fOrigPos[i] = SkFixedToScalar(recs[i].fPos);
- }
- } else {
- fOrigPos = NULL;
- }
- buffer.readMatrix(&fPtsToUnit);
- this->initCommon();
-}
-#endif
-
SkGradientShaderBase::~SkGradientShaderBase() {
if (fOrigColors != fStorage) {
sk_free(fOrigColors);
diff --git a/src/effects/gradients/SkLinearGradient.cpp b/src/effects/gradients/SkLinearGradient.cpp
index 3ab7219..1faca5e 100644
--- a/src/effects/gradients/SkLinearGradient.cpp
+++ b/src/effects/gradients/SkLinearGradient.cpp
@@ -60,14 +60,6 @@
pts_to_unit_matrix(pts, &fPtsToUnit);
}
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-SkLinearGradient::SkLinearGradient(SkReadBuffer& buffer)
- : INHERITED(buffer)
- , fStart(buffer.readPoint())
- , fEnd(buffer.readPoint()) {
-}
-#endif
-
SkFlattenable* SkLinearGradient::CreateProc(SkReadBuffer& buffer) {
DescriptorScope desc;
if (!desc.unflatten(buffer)) {
@@ -568,7 +560,7 @@
const SkMatrix* localMatrix, GrColor* paintColor,
GrFragmentProcessor** fp) const {
SkASSERT(context);
-
+
SkMatrix matrix;
if (!this->getLocalMatrix().invert(&matrix)) {
return false;
@@ -581,10 +573,10 @@
matrix.postConcat(inv);
}
matrix.postConcat(fPtsToUnit);
-
+
*paintColor = SkColor2GrColorJustAlpha(paint.getColor());
*fp = GrLinearGradient::Create(context, *this, matrix, fTileMode);
-
+
return true;
}
diff --git a/src/effects/gradients/SkRadialGradient.cpp b/src/effects/gradients/SkRadialGradient.cpp
index 99531d9..7c0e8f6 100644
--- a/src/effects/gradients/SkRadialGradient.cpp
+++ b/src/effects/gradients/SkRadialGradient.cpp
@@ -252,14 +252,6 @@
return kRadial_GradientType;
}
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-SkRadialGradient::SkRadialGradient(SkReadBuffer& buffer)
- : INHERITED(buffer),
- fCenter(buffer.readPoint()),
- fRadius(buffer.readScalar()) {
-}
-#endif
-
SkFlattenable* SkRadialGradient::CreateProc(SkReadBuffer& buffer) {
DescriptorScope desc;
if (!desc.unflatten(buffer)) {
@@ -578,7 +570,7 @@
const SkMatrix* localMatrix, GrColor* paintColor,
GrFragmentProcessor** fp) const {
SkASSERT(context);
-
+
SkMatrix matrix;
if (!this->getLocalMatrix().invert(&matrix)) {
return false;
@@ -591,10 +583,10 @@
matrix.postConcat(inv);
}
matrix.postConcat(fPtsToUnit);
-
+
*paintColor = SkColor2GrColorJustAlpha(paint.getColor());
*fp = GrRadialGradient::Create(context, *this, matrix, fTileMode);
-
+
return true;
}
diff --git a/src/effects/gradients/SkSweepGradient.cpp b/src/effects/gradients/SkSweepGradient.cpp
index d080ec5..1637006 100644
--- a/src/effects/gradients/SkSweepGradient.cpp
+++ b/src/effects/gradients/SkSweepGradient.cpp
@@ -41,13 +41,6 @@
return kSweep_GradientType;
}
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-SkSweepGradient::SkSweepGradient(SkReadBuffer& buffer)
- : INHERITED(buffer),
- fCenter(buffer.readPoint()) {
-}
-#endif
-
SkFlattenable* SkSweepGradient::CreateProc(SkReadBuffer& buffer) {
DescriptorScope desc;
if (!desc.unflatten(buffer)) {
@@ -294,7 +287,7 @@
bool SkSweepGradient::asFragmentProcessor(GrContext* context, const SkPaint& paint,
const SkMatrix* localMatrix, GrColor* paintColor,
GrFragmentProcessor** effect) const {
-
+
SkMatrix matrix;
if (!this->getLocalMatrix().invert(&matrix)) {
return false;
@@ -307,10 +300,10 @@
matrix.postConcat(inv);
}
matrix.postConcat(fPtsToUnit);
-
+
*effect = GrSweepGradient::Create(context, *this, matrix);
*paintColor = SkColor2GrColorJustAlpha(paint.getColor());
-
+
return true;
}
diff --git a/src/effects/gradients/SkSweepGradient.h b/src/effects/gradients/SkSweepGradient.h
index d816295..2ca4a62 100644
--- a/src/effects/gradients/SkSweepGradient.h
+++ b/src/effects/gradients/SkSweepGradient.h
@@ -41,9 +41,6 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkSweepGradient)
protected:
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
- SkSweepGradient(SkReadBuffer& buffer);
-#endif
virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE;
virtual Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE;
diff --git a/src/effects/gradients/SkTwoPointConicalGradient.cpp b/src/effects/gradients/SkTwoPointConicalGradient.cpp
index 5410f6a..2fc848e 100644
--- a/src/effects/gradients/SkTwoPointConicalGradient.cpp
+++ b/src/effects/gradients/SkTwoPointConicalGradient.cpp
@@ -343,19 +343,6 @@
return kConical_GradientType;
}
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-SkTwoPointConicalGradient::SkTwoPointConicalGradient(
- SkReadBuffer& buffer)
- : INHERITED(buffer)
- , fCenter1(buffer.readPoint())
- , fCenter2(buffer.readPoint())
- , fRadius1(buffer.readScalar())
- , fRadius2(buffer.readScalar())
- , fFlippedGrad(buffer.readBool()) {
- this->init();
-}
-#endif
-
SkFlattenable* SkTwoPointConicalGradient::CreateProc(SkReadBuffer& buffer) {
DescriptorScope desc;
if (!desc.unflatten(buffer)) {
diff --git a/src/effects/gradients/SkTwoPointRadialGradient.cpp b/src/effects/gradients/SkTwoPointRadialGradient.cpp
index 3e40044..8ce3f43 100644
--- a/src/effects/gradients/SkTwoPointRadialGradient.cpp
+++ b/src/effects/gradients/SkTwoPointRadialGradient.cpp
@@ -343,17 +343,6 @@
}
#endif
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-SkTwoPointRadialGradient::SkTwoPointRadialGradient(SkReadBuffer& buffer)
- : INHERITED(buffer),
- fCenter1(buffer.readPoint()),
- fCenter2(buffer.readPoint()),
- fRadius1(buffer.readScalar()),
- fRadius2(buffer.readScalar()) {
- init();
-};
-#endif
-
SkFlattenable* SkTwoPointRadialGradient::CreateProc(SkReadBuffer& buffer) {
DescriptorScope desc;
if (!desc.unflatten(buffer)) {
@@ -686,7 +675,7 @@
const SkMatrix* localMatrix, GrColor* paintColor,
GrFragmentProcessor** fp) const {
SkASSERT(context);
-
+
// invert the localM, translate to center1 (fPtsToUni), rotate so center2 is on x axis.
SkMatrix matrix;
if (!this->getLocalMatrix().invert(&matrix)) {
@@ -712,7 +701,7 @@
*paintColor = SkColor2GrColorJustAlpha(paint.getColor());
*fp = GrRadial2Gradient::Create(context, *this, matrix, fTileMode);
-
+
return true;
}