Follow up to serialization validation code

src/effects/SkMorphologyImageFilter.cpp

 /*
  * Copyright 2012 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkMorphologyImageFilter.h"
 #include "SkBitmap.h"
 #include "SkColorPriv.h"
 #include "SkFlattenableBuffers.h"
 #include "SkRect.h"
 #if SK_SUPPORT_GPU
 #include "GrContext.h"
 #include "GrTexture.h"
 #include "GrTBackendEffectFactory.h"
 #include "gl/GrGLEffect.h"
 #include "gl/GrGLEffectMatrix.h"
 #include "effects/Gr1DKernelEffect.h"
 #include "SkImageFilterUtils.h"
 #endif
 
 SkMorphologyImageFilter::SkMorphologyImageFilter(SkFlattenableReadBuffer& buffer)
   : INHERITED(buffer) {
     fRadius.fWidth = buffer.readInt();
     fRadius.fHeight = buffer.readInt();
-    buffer.validate(SkScalarIsFinite(SkIntToScalar(fRadius.fWidth)) &&
-                    SkScalarIsFinite(SkIntToScalar(fRadius.fHeight)) &&
-                    (fRadius.fWidth >= 0) &&
+    buffer.validate((fRadius.fWidth >= 0) &&
                     (fRadius.fHeight >= 0));
 }
 
 SkMorphologyImageFilter::SkMorphologyImageFilter(int radiusX, int radiusY, SkImageFilter* input)
     : INHERITED(input), fRadius(SkISize::Make(radiusX, radiusY)) {
 }
 
 
 void SkMorphologyImageFilter::flatten(SkFlattenableWriteBuffer& buffer) const {
     this->INHERITED::flatten(buffer);
@@ skipping 487 matching lines @@
     }
     GrTexture* input = inputBM.getTexture();
     SkIRect bounds;
     src.getBounds(&bounds);
     SkAutoTUnref<GrTexture> resultTex(apply_morphology(input, bounds,
         GrMorphologyEffect::kErode_MorphologyType, radius()));
     return SkImageFilterUtils::WrapTexture(resultTex, src.width(), src.height(), result);
 }
 
 #endif