Revert 11247, 11250, 11251 and 11279 to unblock DEPS roll (https://codereview.chromium.org/24159002/)

11279 Sanitizing source files in Housekeeper-Nightly - https://code.google.com/p/skia/source/detail?r=11279
11251 More warnings as errors fixes - https://code.google.com/p/skia/source/detail?r=11251
11250 Warnings as errors fix - https://code.google.com/p/skia/source/detail?r=11250
11247 Initial error handling code - https://chromiumcodereview.appspot.com/23021015



git-svn-id: http://skia.googlecode.com/svn/trunk@11285 2bbb7eff-a529-9590-31e7-b0007b416f81

32 files changed, 30 insertions, 651 deletions

diff --git a/bench/AAClipBench.cpp b/bench/AAClipBench.cpp
index dfdae8e809..856411ddc9 100644
--- a/bench/AAClipBench.cpp
+++ b/bench/AAClipBench.cpp
@@ -255,3 +255,4 @@ DEF_BENCH( return SkNEW_ARGS(AAClipBench, (true, false)); )
 DEF_BENCH( return SkNEW_ARGS(AAClipBench, (true, true)); )
 DEF_BENCH( return SkNEW_ARGS(NestedAAClipBench, (false)); )
 DEF_BENCH( return SkNEW_ARGS(NestedAAClipBench, (true)); )
+
diff --git a/gyp/core.gypi b/gyp/core.gypi
index a25173dd24..6c00a56763 100644
--- a/gyp/core.gypi
+++ b/gyp/core.gypi
@@ -164,7 +164,6 @@
         '<(skia_src_path)/core/SkScan_Antihair.cpp',
         '<(skia_src_path)/core/SkScan_Hairline.cpp',
         '<(skia_src_path)/core/SkScan_Path.cpp',
-        '<(skia_src_path)/core/SkValidatingReadBuffer.cpp',
         '<(skia_src_path)/core/SkShader.cpp',
         '<(skia_src_path)/core/SkSpriteBlitter_ARGB32.cpp',
         '<(skia_src_path)/core/SkSpriteBlitter_RGB16.cpp',
diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h
index 79b6fa6703..887169ccb5 100644
--- a/include/core/SkBitmap.h
+++ b/include/core/SkBitmap.h
@@ -52,7 +52,6 @@ public:
         kRGB_565_Config,    //!< 16-bits per pixel, (see SkColorPriv.h for packing)
         kARGB_4444_Config,  //!< 16-bits per pixel, (see SkColorPriv.h for packing)
         kARGB_8888_Config,  //!< 32-bits per pixel, (see SkColorPriv.h for packing)
-        kLastConfig = kARGB_8888_Config,
     };
 
     // do not add this to the Config enum, otherwise the compiler will let us
diff --git a/include/core/SkFlattenableBuffers.h b/include/core/SkFlattenableBuffers.h
index b3f3684daa..03c03f3877 100644
--- a/include/core/SkFlattenableBuffers.h
+++ b/include/core/SkFlattenableBuffers.h
@@ -41,20 +41,14 @@ public:
         kCrossProcess_Flag      = 1 << 0,
         kScalarIsFloat_Flag     = 1 << 1,
         kPtrIs64Bit_Flag        = 1 << 2,
-        /** The kValidation_Flag is used to force stream validations (by making
-         * sure that no operation reads past the end of the stream, for example)
-         * and error handling if any reading operation yields an invalid value.
-         */
-        kValidation_Flag        = 1 << 3,
     };
 
     void setFlags(uint32_t flags) { fFlags = flags; }
     uint32_t getFlags() const { return fFlags; }
 
-    bool isCrossProcess() const { return SkToBool(fFlags & (kCrossProcess_Flag | kValidation_Flag)); }
+    bool isCrossProcess() const { return SkToBool(fFlags & kCrossProcess_Flag); }
     bool isScalarFloat() const { return SkToBool(fFlags & kScalarIsFloat_Flag); }
     bool isPtr64Bit() const { return SkToBool(fFlags & kPtrIs64Bit_Flag); }
-    bool isValidating() const { return SkToBool(fFlags & kValidation_Flag); }
 
     // primitives
     virtual bool readBool() = 0;
@@ -108,13 +102,6 @@ public:
         return static_cast<T*>(this->readFlattenable());
     }
 
-    void validate(bool isValid) {
-        fError |= !isValid;
-    }
-
-protected:
-    bool fError;
-
 private:
     uint32_t fFlags;
 };
@@ -167,22 +154,13 @@ public:
 
     enum Flags {
         kCrossProcess_Flag               = 0x01,
-        /** The kValidation_Flag is used here to make sure the write operation
-         *  is symmetric with the read operation using the equivalent flag
-         *  SkFlattenableReadBuffer::kValidation_Flag.
-         */
-        kValidation_Flag                 = 0x02,
     };
 
     uint32_t getFlags() const { return fFlags; }
     void setFlags(uint32_t flags) { fFlags = flags; }
 
     bool isCrossProcess() const {
-        return SkToBool(fFlags & (kCrossProcess_Flag | kValidation_Flag));
-    }
-
-    bool isValidating() const {
-        return SkToBool(fFlags & kValidation_Flag);
+        return SkToBool(fFlags & kCrossProcess_Flag);
     }
 
     bool persistTypeface() const { return (fFlags & kCrossProcess_Flag) != 0; }
diff --git a/include/core/SkFlattenableSerialization.h b/include/core/SkFlattenableSerialization.h
index 26463bbca9..720bae0917 100644
--- a/include/core/SkFlattenableSerialization.h
+++ b/include/core/SkFlattenableSerialization.h
@@ -13,14 +13,8 @@
 class SkData;
 class SkFlattenable;
 
-/**
- *  These utility functions are used by the chromium codebase to safely
- *  serialize and deserialize SkFlattenable objects. These aren't made for
- *  optimal speed, but rather designed with security in mind in order to
- *  prevent Skia from being an entry point for potential attacks.
- */
-SK_API SkData* SkValidatingSerializeFlattenable(SkFlattenable*);
-SK_API SkFlattenable* SkValidatingDeserializeFlattenable(const void* data, size_t size);
+SK_API SkData* SkSerializeFlattenable(SkFlattenable*);
+SK_API SkFlattenable* SkDeserializeFlattenable(const void* data, size_t size);
 
 // Temporary fix for canary build
 #define SkSerializeFlattenable SkValidatingSerializeFlattenable
diff --git a/include/core/SkRect.h b/include/core/SkRect.h
index bd5d026d50..d8919ae5d6 100644
--- a/include/core/SkRect.h
+++ b/include/core/SkRect.h
@@ -100,8 +100,6 @@ struct SK_API SkIRect {
      */
     bool isEmpty() const { return fLeft >= fRight || fTop >= fBottom; }
 
-    bool isInverted() const { return fLeft > fRight || fTop > fBottom; }
-
     bool isLargest() const { return SK_MinS32 == fLeft &&
                                     SK_MinS32 == fTop &&
                                     SK_MaxS32 == fRight &&
@@ -421,8 +419,6 @@ struct SK_API SkRect {
      */
     bool isEmpty() const { return fLeft >= fRight || fTop >= fBottom; }
 
-    bool isInverted() const { return fLeft > fRight || fTop > fBottom; }
-
     /**
      *  Returns true iff all values in the rect are finite. If any are
      *  infinite or NaN (or SK_FixedNaN when SkScalar is fixed) then this
diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp
index 762abc0bf1..d3bbecd706 100644
--- a/src/core/SkBitmap.cpp
+++ b/src/core/SkBitmap.cpp
@@ -19,7 +19,6 @@
 #include "SkThread.h"
 #include "SkUnPreMultiply.h"
 #include "SkUtils.h"
-#include "SkValidationUtils.h"
 #include "SkPackBits.h"
 #include <new>
 
@@ -1608,11 +1607,9 @@ void SkBitmap::unflatten(SkFlattenableReadBuffer& buffer) {
     int width = buffer.readInt();
     int height = buffer.readInt();
     int rowBytes = buffer.readInt();
-    Config config = (Config)buffer.readInt();
-    buffer.validate((width >= 0) && (height >= 0) && (rowBytes >= 0) &&
-                    SkIsValidConfig(config));
+    int config = buffer.readInt();
 
-    this->setConfig(config, width, height, rowBytes);
+    this->setConfig((Config)config, width, height, rowBytes);
     this->setIsOpaque(buffer.readBool());
 
     int reftype = buffer.readInt();
@@ -1626,7 +1623,6 @@ void SkBitmap::unflatten(SkFlattenableReadBuffer& buffer) {
         case SERIALIZE_PIXELTYPE_NONE:
             break;
         default:
-            buffer.validate(false);
             SkDEBUGFAIL("unrecognized pixeltype in serialized data");
             sk_throw();
     }
diff --git a/src/core/SkBitmapProcState.cpp b/src/core/SkBitmapProcState.cpp
index 2b0e557610..9ecfc2280b 100644
--- a/src/core/SkBitmapProcState.cpp
+++ b/src/core/SkBitmapProcState.cpp
@@ -332,7 +332,7 @@ bool SkBitmapProcState::chooseProcs(const SkMatrix& inv, const SkPaint& paint) {
             return false;
         }
     }
-
+    
     SkASSERT(fBitmap);
 
     bool trivialMatrix = (fInvMatrix.getType() & ~SkMatrix::kTranslate_Mask) == 0;
diff --git a/src/core/SkFlattenableBuffers.cpp b/src/core/SkFlattenableBuffers.cpp
index 72cd492cd8..50a47d5c47 100644
--- a/src/core/SkFlattenableBuffers.cpp
+++ b/src/core/SkFlattenableBuffers.cpp
@@ -9,8 +9,7 @@
 #include "SkPaint.h"
 #include "SkTypeface.h"
 
-SkFlattenableReadBuffer::SkFlattenableReadBuffer() :
-    fError(false) {
+SkFlattenableReadBuffer::SkFlattenableReadBuffer() {
     // Set default values. These should be explicitly set by our client
     // via setFlags() if the buffer came from serialization.
     fFlags = 0;
diff --git a/src/core/SkFlattenableSerialization.cpp b/src/core/SkFlattenableSerialization.cpp
index 63180532d9..b74c82f051 100644
--- a/src/core/SkFlattenableSerialization.cpp
+++ b/src/core/SkFlattenableSerialization.cpp
@@ -9,12 +9,12 @@
 
 #include "SkData.h"
 #include "SkFlattenable.h"
-#include "SkValidatingReadBuffer.h"
+#include "SkOrderedReadBuffer.h"
 #include "SkOrderedWriteBuffer.h"
 
-SkData* SkValidatingSerializeFlattenable(SkFlattenable* flattenable) {
+SkData* SkSerializeFlattenable(SkFlattenable* flattenable) {
     SkOrderedWriteBuffer writer(1024);
-    writer.setFlags(SkOrderedWriteBuffer::kValidation_Flag);
+    writer.setFlags(SkOrderedWriteBuffer::kCrossProcess_Flag);
     writer.writeFlattenable(flattenable);
     uint32_t size = writer.bytesWritten();
     void* data = sk_malloc_throw(size);
@@ -22,7 +22,7 @@ SkData* SkValidatingSerializeFlattenable(SkFlattenable* flattenable) {
     return SkData::NewFromMalloc(data, size);
 }
 
-SkFlattenable* SkValidatingDeserializeFlattenable(const void* data, size_t size) {
-    SkValidatingReadBuffer reader(data, size);
-    return reader.readFlattenable();
+SkFlattenable* SkDeserializeFlattenable(const void* data, size_t size) {
+    SkOrderedReadBuffer buffer(data, size);
+    return buffer.readFlattenable();
 }
diff --git a/src/core/SkImageFilter.cpp b/src/core/SkImageFilter.cpp
index 89b2cc50d8..502613bb68 100644
--- a/src/core/SkImageFilter.cpp
+++ b/src/core/SkImageFilter.cpp
@@ -10,7 +10,6 @@
 #include "SkBitmap.h"
 #include "SkFlattenableBuffers.h"
 #include "SkRect.h"
-#include "SkValidationUtils.h"
 #if SK_SUPPORT_GPU
 #include "GrContext.h"
 #include "GrTexture.h"
@@ -63,7 +62,6 @@ SkImageFilter::SkImageFilter(SkFlattenableReadBuffer& buffer)
         }
     }
     buffer.readIRect(&fCropRect);
-    buffer.validate(SkIsValidRect(fCropRect));
 }
 
 void SkImageFilter::flatten(SkFlattenableWriteBuffer& buffer) const {
diff --git a/src/core/SkOrderedWriteBuffer.cpp b/src/core/SkOrderedWriteBuffer.cpp
index 708a7067bd..64f52193ac 100644
--- a/src/core/SkOrderedWriteBuffer.cpp
+++ b/src/core/SkOrderedWriteBuffer.cpp
@@ -270,9 +270,7 @@ void SkOrderedWriteBuffer::writeFlattenable(SkFlattenable* flattenable) {
         factory = flattenable->getFactory();
     }
     if (NULL == factory) {
-        if (this->isValidating()) {
-            this->writeString(NULL);
-        } else if (fFactorySet != NULL || fNamedFactorySet != NULL) {
+        if (fFactorySet != NULL || fNamedFactorySet != NULL) {
             this->write32(0);
         } else {
             this->writeFunctionPtr(NULL);
@@ -292,14 +290,7 @@ void SkOrderedWriteBuffer::writeFlattenable(SkFlattenable* flattenable) {
      *      name. SkGPipe uses this technique so it can write the name to its
      *      stream before writing the flattenable.
      */
-    if (this->isValidating()) {
-        const char* name = SkFlattenable::FactoryToName(factory);
-        this->writeString(name);
-        if (NULL == name) {
-            SkASSERT(0); // Missing factory name
-            return;
-        }
-    } else if (fFactorySet) {
+    if (fFactorySet) {
         this->write32(fFactorySet->add(factory));
     } else if (fNamedFactorySet) {
         int32_t index = fNamedFactorySet->find(factory);
diff --git a/src/core/SkValidatingReadBuffer.cpp b/src/core/SkValidatingReadBuffer.cpp
deleted file mode 100644
index b8247ab566..0000000000
--- a/src/core/SkValidatingReadBuffer.cpp
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkBitmap.h"
-#include "SkErrorInternals.h"
-#include "SkValidatingReadBuffer.h"
-#include "SkStream.h"
-#include "SkTypeface.h"
-
-SkValidatingReadBuffer::SkValidatingReadBuffer() : INHERITED() {
-    fMemoryPtr = NULL;
-
-    fBitmapStorage = NULL;
-    fTFArray = NULL;
-    fTFCount = 0;
-
-    fFactoryTDArray = NULL;
-    fFactoryArray = NULL;
-    fFactoryCount = 0;
-    fBitmapDecoder = NULL;
-#ifdef DEBUG_NON_DETERMINISTIC_ASSERT
-    fDecodedBitmapIndex = -1;
-#endif // DEBUG_NON_DETERMINISTIC_ASSERT
-
-    setFlags(SkFlattenableReadBuffer::kValidation_Flag);
-}
-
-SkValidatingReadBuffer::SkValidatingReadBuffer(const void* data, size_t size) : INHERITED()  {
-    this->setMemory(data, size);
-    fMemoryPtr = NULL;
-
-    fBitmapStorage = NULL;
-    fTFArray = NULL;
-    fTFCount = 0;
-
-    fFactoryTDArray = NULL;
-    fFactoryArray = NULL;
-    fFactoryCount = 0;
-    fBitmapDecoder = NULL;
-#ifdef DEBUG_NON_DETERMINISTIC_ASSERT
-    fDecodedBitmapIndex = -1;
-#endif // DEBUG_NON_DETERMINISTIC_ASSERT
-
-    setFlags(SkFlattenableReadBuffer::kValidation_Flag);
-}
-
-SkValidatingReadBuffer::SkValidatingReadBuffer(SkStream* stream) {
-    const size_t length = stream->getLength();
-    fMemoryPtr = sk_malloc_throw(length);
-    stream->read(fMemoryPtr, length);
-    this->setMemory(fMemoryPtr, length);
-
-    fBitmapStorage = NULL;
-    fTFArray = NULL;
-    fTFCount = 0;
-
-    fFactoryTDArray = NULL;
-    fFactoryArray = NULL;
-    fFactoryCount = 0;
-    fBitmapDecoder = NULL;
-#ifdef DEBUG_NON_DETERMINISTIC_ASSERT
-    fDecodedBitmapIndex = -1;
-#endif // DEBUG_NON_DETERMINISTIC_ASSERT
-
-    setFlags(SkFlattenableReadBuffer::kValidation_Flag);
-}
-
-SkValidatingReadBuffer::~SkValidatingReadBuffer() {
-    sk_free(fMemoryPtr);
-    SkSafeUnref(fBitmapStorage);
-}
-
-void SkValidatingReadBuffer::setMemory(const void* data, size_t size) {
-    fError |= (!ptr_align_4(data) || (SkAlign4(size) != size));
-    if (!fError) {
-        fReader.setMemory(data, size);
-    }
-}
-
-const void* SkValidatingReadBuffer::skip(size_t size) {
-    size_t inc = SkAlign4(size);
-    const void* addr = fReader.peek();
-    fError |= !ptr_align_4(addr) || !fReader.isAvailable(inc);
-    if (!fError) {
-        fReader.skip(size);
-    }
-    return addr;
-}
-
-bool SkValidatingReadBuffer::readBool() {
-    return this->readInt() != 0;
-}
-
-SkColor SkValidatingReadBuffer::readColor() {
-    return this->readInt();
-}
-
-SkFixed SkValidatingReadBuffer::readFixed() {
-    return this->readInt();
-}
-
-int32_t SkValidatingReadBuffer::readInt() {
-    size_t inc = sizeof(int32_t);
-    fError |= !ptr_align_4(fReader.peek()) || !fReader.isAvailable(inc);
-    return fError ? 0 : fReader.readInt();
-}
-
-SkScalar SkValidatingReadBuffer::readScalar() {
-    size_t inc = sizeof(SkScalar);
-    fError |= !ptr_align_4(fReader.peek()) || !fReader.isAvailable(inc);
-    return fError ? 0 : fReader.readScalar();
-}
-
-uint32_t SkValidatingReadBuffer::readUInt() {
-    return this->readInt();
-}
-
-int32_t SkValidatingReadBuffer::read32() {
-    return this->readInt();
-}
-
-void SkValidatingReadBuffer::readString(SkString* string) {
-    size_t len = this->readInt();
-    const void* ptr = fReader.peek();
-
-    // skip over the string + '\0' and then pad to a multiple of 4
-    size_t alignedSize = SkAlign4(len + 1);
-    this->skip(alignedSize);
-    if (!fError) {
-        string->set((const char*)ptr, len);
-    }
-}
-
-void* SkValidatingReadBuffer::readEncodedString(size_t* length, SkPaint::TextEncoding encoding) {
-    int32_t encodingType = fReader.readInt();
-    if (encodingType == encoding) {
-        fError = true;
-    }
-    *length = this->readInt();
-    const void* ptr = this->skip(SkAlign4(*length));
-    void* data = NULL;
-    if (!fError) {
-        data = sk_malloc_throw(*length);
-        memcpy(data, ptr, *length);
-    }
-    return data;
-}
-
-void SkValidatingReadBuffer::readPoint(SkPoint* point) {
-    point->fX = fReader.readScalar();
-    point->fY = fReader.readScalar();
-}
-
-void SkValidatingReadBuffer::readMatrix(SkMatrix* matrix) {
-    size_t size = matrix->readFromMemory(fReader.peek());
-    fError |= (SkAlign4(size) != size);
-    if (!fError) {
-        (void)this->skip(size);
-    }
-}
-
-void SkValidatingReadBuffer::readIRect(SkIRect* rect) {
-    memcpy(rect, this->skip(sizeof(SkIRect)), sizeof(SkIRect));
-}
-
-void SkValidatingReadBuffer::readRect(SkRect* rect) {
-    memcpy(rect, this->skip(sizeof(SkRect)), sizeof(SkRect));
-}
-
-void SkValidatingReadBuffer::readRegion(SkRegion* region) {
-    size_t size = region->readFromMemory(fReader.peek());
-    fError |= (SkAlign4(size) != size);
-    if (!fError) {
-        (void)this->skip(size);
-    }
-}
-
-void SkValidatingReadBuffer::readPath(SkPath* path) {
-    size_t size = path->readFromMemory(fReader.peek());
-    fError |= (SkAlign4(size) != size);
-    if (!fError) {
-        (void)this->skip(size);
-    }
-}
-
-uint32_t SkValidatingReadBuffer::readByteArray(void* value) {
-    const uint32_t length = this->readUInt();
-    memcpy(value, this->skip(SkAlign4(length)), length);
-    return fError ? 0 : length;
-}
-
-uint32_t SkValidatingReadBuffer::readColorArray(SkColor* colors) {
-    const uint32_t count = this->readUInt();
-    const uint32_t byteLength = count * sizeof(SkColor);
-    memcpy(colors, this->skip(SkAlign4(byteLength)), byteLength);
-    return fError ? 0 : count;
-}
-
-uint32_t SkValidatingReadBuffer::readIntArray(int32_t* values) {
-    const uint32_t count = this->readUInt();
-    const uint32_t byteLength = count * sizeof(int32_t);
-    memcpy(values, this->skip(SkAlign4(byteLength)), byteLength);
-    return fError ? 0 : count;
-}
-
-uint32_t SkValidatingReadBuffer::readPointArray(SkPoint* points) {
-    const uint32_t count = this->readUInt();
-    const uint32_t byteLength = count * sizeof(SkPoint);
-    memcpy(points, this->skip(SkAlign4(byteLength)), byteLength);
-    return fError ? 0 : count;
-}
-
-uint32_t SkValidatingReadBuffer::readScalarArray(SkScalar* values) {
-    const uint32_t count = this->readUInt();
-    const uint32_t byteLength = count * sizeof(SkScalar);
-    memcpy(values, this->skip(SkAlign4(byteLength)), byteLength);
-    return fError ? 0 : count;
-}
-
-uint32_t SkValidatingReadBuffer::getArrayCount() {
-    return *(uint32_t*)fReader.peek();
-}
-
-void SkValidatingReadBuffer::readBitmap(SkBitmap* bitmap) {
-    const int width = this->readInt();
-    const int height = this->readInt();
-    const size_t length = this->readUInt();
-    // A size of zero means the SkBitmap was simply flattened.
-    if (length != 0) {
-        fError = true;
-    }
-    if (fError) {
-        return;
-    }
-    bitmap->unflatten(*this);
-    if ((bitmap->width() != width) || (bitmap->height() != height)) {
-        fError = true;
-    }
-}
-
-SkTypeface* SkValidatingReadBuffer::readTypeface() {
-
-    uint32_t index = this->readUInt();
-    if (0 == index || index > (unsigned)fTFCount || fError) {
-        if (index) {
-            SkDebugf("====== typeface index %d\n", index);
-        }
-        return NULL;
-    } else {
-        SkASSERT(fTFArray);
-        return fTFArray[index - 1];
-    }
-}
-
-SkFlattenable* SkValidatingReadBuffer::readFlattenable() {
-    SkString string;
-    this->readString(&string);
-    if (fError) {
-        return NULL;
-    }
-    SkFlattenable::Factory factory = SkFlattenable::NameToFactory(string.c_str());
-    if (NULL == factory) {
-        return NULL; // writer failed to give us the flattenable
-    }
-
-    // if we get here, factory may still be null, but if that is the case, the
-    // failure was ours, not the writer.
-    SkFlattenable* obj = NULL;
-    uint32_t sizeRecorded = this->readUInt();
-    if (factory) {
-        uint32_t offset = fReader.offset();
-        obj = (*factory)(*this);
-        // check that we read the amount we expected
-        uint32_t sizeRead = fReader.offset() - offset;
-        if (sizeRecorded != sizeRead) {
-            // we could try to fix up the offset...
-            fError = true;
-            delete obj;
-            obj = NULL;
-        }
-    } else {
-        // we must skip the remaining data
-        this->skip(sizeRecorded);
-    }
-    return obj;
-}
diff --git a/src/core/SkValidatingReadBuffer.h b/src/core/SkValidatingReadBuffer.h
deleted file mode 100644
index accf5d75f9..0000000000
--- a/src/core/SkValidatingReadBuffer.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkValidatingReadBuffer_DEFINED
-#define SkValidatingReadBuffer_DEFINED
-
-#include "SkRefCnt.h"
-#include "SkBitmapHeap.h"
-#include "SkFlattenableBuffers.h"
-#include "SkPath.h"
-#include "SkPicture.h"
-#include "SkReader32.h"
-
-class SkBitmap;
-
-#if defined(SK_DEBUG) && defined(SK_BUILD_FOR_MAC)
-    #define DEBUG_NON_DETERMINISTIC_ASSERT
-#endif
-
-class SkValidatingReadBuffer : public SkFlattenableReadBuffer {
-public:
-    SkValidatingReadBuffer();
-    SkValidatingReadBuffer(const void* data, size_t size);
-    SkValidatingReadBuffer(SkStream* stream);
-    virtual ~SkValidatingReadBuffer();
-
-    SkReader32* getReader32() { return &fReader; }
-
-    uint32_t size() { return fReader.size(); }
-    uint32_t offset() { return fReader.offset(); }
-    bool eof() { return fReader.eof(); }
-    const void* skip(size_t size);
-
-    // primitives
-    virtual bool readBool() SK_OVERRIDE;
-    virtual SkColor readColor() SK_OVERRIDE;
-    virtual SkFixed readFixed() SK_OVERRIDE;
-    virtual int32_t readInt() SK_OVERRIDE;
-    virtual SkScalar readScalar() SK_OVERRIDE;
-    virtual uint32_t readUInt() SK_OVERRIDE;
-    virtual int32_t read32() SK_OVERRIDE;
-
-    // strings -- the caller is responsible for freeing the string contents
-    virtual void readString(SkString* string) SK_OVERRIDE;
-    virtual void* readEncodedString(size_t* length, SkPaint::TextEncoding encoding) SK_OVERRIDE;
-
-    // common data structures
-    virtual SkFlattenable* readFlattenable() SK_OVERRIDE;
-    virtual void readPoint(SkPoint* point) SK_OVERRIDE;
-    virtual void readMatrix(SkMatrix* matrix) SK_OVERRIDE;
-    virtual void readIRect(SkIRect* rect) SK_OVERRIDE;
-    virtual void readRect(SkRect* rect) SK_OVERRIDE;
-    virtual void readRegion(SkRegion* region) SK_OVERRIDE;
-    virtual void readPath(SkPath* path) SK_OVERRIDE;
-
-    // binary data and arrays
-    virtual uint32_t readByteArray(void* value) SK_OVERRIDE;
-    virtual uint32_t readColorArray(SkColor* colors) SK_OVERRIDE;
-    virtual uint32_t readIntArray(int32_t* values) SK_OVERRIDE;
-    virtual uint32_t readPointArray(SkPoint* points) SK_OVERRIDE;
-    virtual uint32_t readScalarArray(SkScalar* values) SK_OVERRIDE;
-
-    // helpers to get info about arrays and binary data
-    virtual uint32_t getArrayCount() SK_OVERRIDE;
-
-    virtual void readBitmap(SkBitmap* bitmap) SK_OVERRIDE;
-    virtual SkTypeface* readTypeface() SK_OVERRIDE;
-
-    void setBitmapStorage(SkBitmapHeapReader* bitmapStorage) {
-        SkRefCnt_SafeAssign(fBitmapStorage, bitmapStorage);
-    }
-
-    void setTypefaceArray(SkTypeface* array[], int count) {
-        fTFArray = array;
-        fTFCount = count;
-    }
-
-    /**
-     *  Call this with a pre-loaded array of Factories, in the same order as
-     *  were created/written by the writer. SkPicture uses this.
-     */
-    void setFactoryPlayback(SkFlattenable::Factory array[], int count) {
-        fFactoryTDArray = NULL;
-        fFactoryArray = array;
-        fFactoryCount = count;
-    }
-
-    /**
-     *  Call this with an initially empty array, so the reader can cache each
-     *  factory it sees by name. Used by the pipe code in conjunction with
-     *  SkOrderedWriteBuffer::setNamedFactoryRecorder.
-     */
-    void setFactoryArray(SkTDArray<SkFlattenable::Factory>* array) {
-        fFactoryTDArray = array;
-        fFactoryArray = NULL;
-        fFactoryCount = 0;
-    }
-
-    /**
-     *  Provide a function to decode an SkBitmap from encoded data. Only used if the writer
-     *  encoded the SkBitmap. If the proper decoder cannot be used, a red bitmap with the
-     *  appropriate size will be used.
-     */
-    void setBitmapDecoder(SkPicture::InstallPixelRefProc bitmapDecoder) {
-        fBitmapDecoder = bitmapDecoder;
-    }
-
-private:
-    void setMemory(const void* data, size_t size);
-
-    static bool ptr_align_4(const void* ptr) {
-        return (((const char*)ptr - (const char*)NULL) & 3) == 0;
-    }
-
-    SkReader32 fReader;
-    void* fMemoryPtr;
-
-    SkBitmapHeapReader* fBitmapStorage;
-    SkTypeface** fTFArray;
-    int        fTFCount;
-
-    SkTDArray<SkFlattenable::Factory>* fFactoryTDArray;
-    SkFlattenable::Factory* fFactoryArray;
-    int                     fFactoryCount;
-
-    SkPicture::InstallPixelRefProc fBitmapDecoder;
-
-#ifdef DEBUG_NON_DETERMINISTIC_ASSERT
-    // Debugging counter to keep track of how many bitmaps we
-    // have decoded.
-    int fDecodedBitmapIndex;
-#endif // DEBUG_NON_DETERMINISTIC_ASSERT
-
-    typedef SkFlattenableReadBuffer INHERITED;
-};
-
-#endif // SkValidatingReadBuffer_DEFINED
diff --git a/src/core/SkValidationUtils.h b/src/core/SkValidationUtils.h
deleted file mode 100644
index f31d86ce22..0000000000
--- a/src/core/SkValidationUtils.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkValidationUtils_DEFINED
-#define SkValidationUtils_DEFINED
-
-#include "SkBitmap.h"
-#include "SkXfermode.h"
-
-/** Returns true if coeff's value is in the SkXfermode::Coeff enum.
-  */
-static inline bool SkIsValidCoeff(SkXfermode::Coeff coeff) {
-    return coeff >= 0 && coeff < SkXfermode::kCoeffCount;
-}
-
-/** Returns true if mode's value is in the SkXfermode::Mode enum.
-  */
-static inline bool SkIsValidMode(SkXfermode::Mode mode) {
-    return (mode >= 0) && (mode <= SkXfermode::kLastMode);
-}
-
-/** Returns true if config's value is in the SkBitmap::Config enum.
-  */
-static inline bool SkIsValidConfig(SkBitmap::Config config) {
-    return (config >= 0) && (config <= SkBitmap::kLastConfig);
-}
-
-/** Returns true if the rect's dimensions are between 0 and SK_MaxS32
-  */
-static inline bool SkIsValidRect(const SkIRect& rect) {
-    return rect.width() >= 0 && rect.height() >= 0;
-}
-
-/** Returns true if the rect's dimensions are between 0 and SK_ScalarMax
-  */
-static inline bool SkIsValidRect(const SkRect& rect) {
-    return !rect.isInverted() &&
-           SkScalarIsFinite(rect.width()) &&
-           SkScalarIsFinite(rect.height());
-}
-
-#endif
diff --git a/src/core/SkXfermode.cpp b/src/core/SkXfermode.cpp
index 9c5ccccd92..ac5cee4e35 100644
--- a/src/core/SkXfermode.cpp
+++ b/src/core/SkXfermode.cpp
@@ -12,7 +12,6 @@
 #include "SkFlattenableBuffers.h"
 #include "SkMathPriv.h"
 #include "SkString.h"
-#include "SkValidationUtils.h"
 
 SK_DEFINE_INST_COUNT(SkXfermode)
 
@@ -1439,10 +1438,6 @@ protected:
         fDstCoeff = rec.fDC;
         // now update our function-ptr in the super class
         this->INHERITED::setProc(rec.fProc);
-
-        buffer.validate(SkIsValidMode(fMode) &&
-                        SkIsValidCoeff(fSrcCoeff) &&
-                        SkIsValidCoeff(fDstCoeff));
     }
 
     virtual void flatten(SkFlattenableWriteBuffer& buffer) const SK_OVERRIDE {
diff --git a/src/effects/SkBicubicImageFilter.cpp b/src/effects/SkBicubicImageFilter.cpp
index 778df3fd4f..02e706f355 100644
--- a/src/effects/SkBicubicImageFilter.cpp
+++ b/src/effects/SkBicubicImageFilter.cpp
@@ -45,10 +45,6 @@ SkBicubicImageFilter::SkBicubicImageFilter(SkFlattenableReadBuffer& buffer) : IN
     SkASSERT(readSize == 16);
     fScale.fWidth = buffer.readScalar();
     fScale.fHeight = buffer.readScalar();
-    buffer.validate(SkScalarIsFinite(fScale.fWidth) &&
-                    SkScalarIsFinite(fScale.fHeight) &&
-                    (fScale.fWidth >= 0) &&
-                    (fScale.fHeight >= 0));
 }
 
 void SkBicubicImageFilter::flatten(SkFlattenableWriteBuffer& buffer) const {
diff --git a/src/effects/SkBlurImageFilter.cpp b/src/effects/SkBlurImageFilter.cpp
index 10f389095f..3f97ddd59a 100644
--- a/src/effects/SkBlurImageFilter.cpp
+++ b/src/effects/SkBlurImageFilter.cpp
@@ -19,10 +19,6 @@ SkBlurImageFilter::SkBlurImageFilter(SkFlattenableReadBuffer& buffer)
   : INHERITED(buffer) {
     fSigma.fWidth = buffer.readScalar();
     fSigma.fHeight = buffer.readScalar();
-    buffer.validate(SkScalarIsFinite(fSigma.fWidth) &&
-                    SkScalarIsFinite(fSigma.fHeight) &&
-                    (fSigma.fWidth >= 0) &&
-                    (fSigma.fHeight >= 0));
 }
 
 SkBlurImageFilter::SkBlurImageFilter(SkScalar sigmaX,
diff --git a/src/effects/SkColorFilters.cpp b/src/effects/SkColorFilters.cpp
index 7373f004d5..41a201ef39 100644
--- a/src/effects/SkColorFilters.cpp
+++ b/src/effects/SkColorFilters.cpp
@@ -13,7 +13,6 @@
 #include "SkFlattenableBuffers.h"
 #include "SkUtils.h"
 #include "SkString.h"
-#include "SkValidationUtils.h"
 
 #define ILLEGAL_XFERMODE_MODE   ((SkXfermode::Mode)-1)
 
@@ -99,7 +98,6 @@ protected:
         fColor = buffer.readColor();
         fMode = (SkXfermode::Mode)buffer.readUInt();
         this->updateCache();
-        buffer.validate(SkIsValidMode(fMode));
     }
 
 private:
diff --git a/src/effects/SkColorMatrixFilter.cpp b/src/effects/SkColorMatrixFilter.cpp
index 842d372296..1f841d0489 100644
--- a/src/effects/SkColorMatrixFilter.cpp
+++ b/src/effects/SkColorMatrixFilter.cpp
@@ -310,9 +310,6 @@ SkColorMatrixFilter::SkColorMatrixFilter(SkFlattenableReadBuffer& buffer)
     SkASSERT(buffer.getArrayCount() == 20);
     buffer.readScalarArray(fMatrix.fMat);
     this->initState(fMatrix.fMat);
-    for (int i = 0; i < 20; ++i) {
-        buffer.validate(SkScalarIsFinite(fMatrix.fMat[0]));
-    }
 }
 
 bool SkColorMatrixFilter::asColorMatrix(SkScalar matrix[20]) const {
diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp
index 11bd567c7c..a751365b75 100644
--- a/src/effects/SkDisplacementMapEffect.cpp
+++ b/src/effects/SkDisplacementMapEffect.cpp
@@ -128,20 +128,6 @@ void computeDisplacement(SkDisplacementMapEffect::ChannelSelectorType xChannelSe
     }
 }
 
-bool ChannelSelectorTypeIsValid(SkDisplacementMapEffect::ChannelSelectorType channelSelector) {
-    switch (channelSelector) {
-    case SkDisplacementMapEffect::kUnknown_ChannelSelectorType:
-    case SkDisplacementMapEffect::kR_ChannelSelectorType:
-    case SkDisplacementMapEffect::kG_ChannelSelectorType:
-    case SkDisplacementMapEffect::kB_ChannelSelectorType:
-    case SkDisplacementMapEffect::kA_ChannelSelectorType:
-        return true;
-    default:
-        break;
-    }
-    return false;
-}
-
 } // end namespace
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -167,9 +153,6 @@ SkDisplacementMapEffect::SkDisplacementMapEffect(SkFlattenableReadBuffer& buffer
     fXChannelSelector = (SkDisplacementMapEffect::ChannelSelectorType) buffer.readInt();
     fYChannelSelector = (SkDisplacementMapEffect::ChannelSelectorType) buffer.readInt();
     fScale            = buffer.readScalar();
-    buffer.validate(ChannelSelectorTypeIsValid(fXChannelSelector) &&
-                    ChannelSelectorTypeIsValid(fYChannelSelector) &&
-                    SkScalarIsFinite(fScale));
 }
 
 void SkDisplacementMapEffect::flatten(SkFlattenableWriteBuffer& buffer) const {
diff --git a/src/effects/SkDropShadowImageFilter.cpp b/src/effects/SkDropShadowImageFilter.cpp
index 4fc29bae83..75a86689c0 100644
--- a/src/effects/SkDropShadowImageFilter.cpp
+++ b/src/effects/SkDropShadowImageFilter.cpp
@@ -29,9 +29,6 @@ SkDropShadowImageFilter::SkDropShadowImageFilter(SkFlattenableReadBuffer& buffer
     fDy = buffer.readScalar();
     fSigma = buffer.readScalar();
     fColor = buffer.readColor();
-    buffer.validate(SkScalarIsFinite(fDx) &&
-                    SkScalarIsFinite(fDy) &&
-                    SkScalarIsFinite(fSigma));
 }
 
 void SkDropShadowImageFilter::flatten(SkFlattenableWriteBuffer& buffer) const
diff --git a/src/effects/SkLightingImageFilter.cpp b/src/effects/SkLightingImageFilter.cpp
index 3141e1d900..ca52b981e5 100644
--- a/src/effects/SkLightingImageFilter.cpp
+++ b/src/effects/SkLightingImageFilter.cpp
@@ -249,9 +249,6 @@ SkPoint3 readPoint3(SkFlattenableReadBuffer& buffer) {
     point.fX = buffer.readScalar();
     point.fY = buffer.readScalar();
     point.fZ = buffer.readScalar();
-    buffer.validate(SkScalarIsFinite(point.fX) &&
-                    SkScalarIsFinite(point.fY) &&
-                    SkScalarIsFinite(point.fZ));
     return point;
 };
 
@@ -744,10 +741,6 @@ protected:
         fCosInnerConeAngle = buffer.readScalar();
         fConeScale = buffer.readScalar();
         fS = readPoint3(buffer);
-        buffer.validate(SkScalarIsFinite(fSpecularExponent) &&
-                        SkScalarIsFinite(fCosOuterConeAngle) &&
-                        SkScalarIsFinite(fCosInnerConeAngle) &&
-                        SkScalarIsFinite(fConeScale));
     }
     SkSpotLight(const SkPoint3& location, const SkPoint3& target, SkScalar specularExponent, SkScalar cosOuterConeAngle, SkScalar cosInnerConeAngle, SkScalar coneScale, const SkPoint3& s, const SkPoint3& color)
      : INHERITED(color),
@@ -877,7 +870,6 @@ SkLightingImageFilter::SkLightingImageFilter(SkFlattenableReadBuffer& buffer)
 {
     fLight = buffer.readFlattenableT<SkLight>();
     fSurfaceScale = buffer.readScalar();
-    buffer.validate(SkScalarIsFinite(fSurfaceScale));
 }
 
 void SkLightingImageFilter::flatten(SkFlattenableWriteBuffer& buffer) const {
@@ -898,7 +890,6 @@ SkDiffuseLightingImageFilter::SkDiffuseLightingImageFilter(SkFlattenableReadBuff
   : INHERITED(buffer)
 {
     fKD = buffer.readScalar();
-    buffer.validate(SkScalarIsFinite(fKD));
 }
 
 void SkDiffuseLightingImageFilter::flatten(SkFlattenableWriteBuffer& buffer) const {
@@ -976,8 +967,6 @@ SkSpecularLightingImageFilter::SkSpecularLightingImageFilter(SkFlattenableReadBu
 {
     fKS = buffer.readScalar();
     fShininess = buffer.readScalar();
-    buffer.validate(SkScalarIsFinite(fKS) &&
-                    SkScalarIsFinite(fShininess));
 }
 
 void SkSpecularLightingImageFilter::flatten(SkFlattenableWriteBuffer& buffer) const {
diff --git a/src/effects/SkMagnifierImageFilter.cpp b/src/effects/SkMagnifierImageFilter.cpp
index 3edd490b3a..c74b067267 100644
--- a/src/effects/SkMagnifierImageFilter.cpp
+++ b/src/effects/SkMagnifierImageFilter.cpp
@@ -9,7 +9,6 @@
 #include "SkMagnifierImageFilter.h"
 #include "SkColorPriv.h"
 #include "SkFlattenableBuffers.h"
-#include "SkValidationUtils.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 #if SK_SUPPORT_GPU
@@ -253,8 +252,6 @@ SkMagnifierImageFilter::SkMagnifierImageFilter(SkFlattenableReadBuffer& buffer)
     float height = buffer.readScalar();
     fSrcRect = SkRect::MakeXYWH(x, y, width, height);
     fInset = buffer.readScalar();
-
-    buffer.validate(SkIsValidRect(fSrcRect) && SkScalarIsFinite(fInset));
 }
 
 // FIXME:  implement single-input semantics
diff --git a/src/effects/SkMatrixConvolutionImageFilter.cpp b/src/effects/SkMatrixConvolutionImageFilter.cpp
index dab890f01a..9446b8ee19 100644
--- a/src/effects/SkMatrixConvolutionImageFilter.cpp
+++ b/src/effects/SkMatrixConvolutionImageFilter.cpp
@@ -22,22 +22,6 @@
 
 #endif
 
-namespace {
-
-bool TileModeIsValid(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(const SkISize& kernelSize, const SkScalar* kernel, SkScalar gain, SkScalar bias, const SkIPoint& target, TileMode tileMode, bool convolveAlpha, SkImageFilter* input)
   : INHERITED(input),
     fKernelSize(kernelSize),
@@ -67,9 +51,6 @@ SkMatrixConvolutionImageFilter::SkMatrixConvolutionImageFilter(SkFlattenableRead
     fTarget.fY = buffer.readInt();
     fTileMode = (TileMode) buffer.readInt();
     fConvolveAlpha = buffer.readBool();
-    buffer.validate(SkScalarIsFinite(fGain) &&
-                    SkScalarIsFinite(fBias) &&
-                    TileModeIsValid(fTileMode));
 }
 
 void SkMatrixConvolutionImageFilter::flatten(SkFlattenableWriteBuffer& buffer) const {
diff --git a/src/effects/SkMergeImageFilter.cpp b/src/effects/SkMergeImageFilter.cpp
index 06040fdd40..0c47c91aff 100755
--- a/src/effects/SkMergeImageFilter.cpp
+++ b/src/effects/SkMergeImageFilter.cpp
@@ -9,7 +9,6 @@
 #include "SkCanvas.h"
 #include "SkDevice.h"
 #include "SkFlattenableBuffers.h"
-#include "SkValidationUtils.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -158,12 +157,8 @@ SkMergeImageFilter::SkMergeImageFilter(SkFlattenableReadBuffer& buffer) : INHERI
     bool hasModes = buffer.readBool();
     if (hasModes) {
         this->initAllocModes();
-        int nbInputs = countInputs();
-        SkASSERT(buffer.getArrayCount() == nbInputs * sizeof(fModes[0]));
+        SkASSERT(buffer.getArrayCount() == countInputs() * sizeof(fModes[0]));
         buffer.readByteArray(fModes);
-        for (int i = 0; i < nbInputs; ++i) {
-            buffer.validate(SkIsValidMode((SkXfermode::Mode)fModes[i]));
-        }
     } else {
         fModes = 0;
     }
diff --git a/src/effects/SkMorphologyImageFilter.cpp b/src/effects/SkMorphologyImageFilter.cpp
index 5d5f29058b..83157bef6e 100644
--- a/src/effects/SkMorphologyImageFilter.cpp
+++ b/src/effects/SkMorphologyImageFilter.cpp
@@ -24,10 +24,6 @@ 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) &&
-                    (fRadius.fHeight >= 0));
 }
 
 SkMorphologyImageFilter::SkMorphologyImageFilter(int radiusX, int radiusY, SkImageFilter* input)
diff --git a/src/effects/SkOffsetImageFilter.cpp b/src/effects/SkOffsetImageFilter.cpp
index 2246537ac4..ad5e49d776 100644
--- a/src/effects/SkOffsetImageFilter.cpp
+++ b/src/effects/SkOffsetImageFilter.cpp
@@ -50,6 +50,4 @@ SkOffsetImageFilter::SkOffsetImageFilter(SkScalar dx, SkScalar dy,
 
 SkOffsetImageFilter::SkOffsetImageFilter(SkFlattenableReadBuffer& buffer) : INHERITED(buffer) {
     buffer.readPoint(&fOffset);
-    buffer.validate(SkScalarIsFinite(fOffset.fX) &&
-                    SkScalarIsFinite(fOffset.fY));
 }
diff --git a/src/effects/SkRectShaderImageFilter.cpp b/src/effects/SkRectShaderImageFilter.cpp
index 3099ad442a..2ee1d4a2ed 100644
--- a/src/effects/SkRectShaderImageFilter.cpp
+++ b/src/effects/SkRectShaderImageFilter.cpp
@@ -11,7 +11,6 @@
 #include "SkDevice.h"
 #include "SkFlattenableBuffers.h"
 #include "SkShader.h"
-#include "SkValidationUtils.h"
 
 SkRectShaderImageFilter* SkRectShaderImageFilter::Create(SkShader* s, const SkRect& rect) {
     SkASSERT(s);
@@ -30,7 +29,6 @@ SkRectShaderImageFilter::SkRectShaderImageFilter(SkFlattenableReadBuffer& buffer
   : INHERITED(buffer) {
     fShader = buffer.readFlattenableT<SkShader>();
     buffer.readRect(&fRect);
-    buffer.validate(SkIsValidRect(fRect));
 }
 
 void SkRectShaderImageFilter::flatten(SkFlattenableWriteBuffer& buffer) const {
diff --git a/src/effects/SkTestImageFilters.cpp b/src/effects/SkTestImageFilters.cpp
index d0e21a3920..788c33a411 100755
--- a/src/effects/SkTestImageFilters.cpp
+++ b/src/effects/SkTestImageFilters.cpp
@@ -78,5 +78,4 @@ void SkDownSampleImageFilter::flatten(SkFlattenableWriteBuffer& buffer) const {
 
 SkDownSampleImageFilter::SkDownSampleImageFilter(SkFlattenableReadBuffer& buffer) : INHERITED(buffer) {
     fScale = buffer.readScalar();
-    buffer.validate(SkScalarIsFinite(fScale));
 }
diff --git a/src/lazy/SkLazyPixelRef.cpp b/src/lazy/SkLazyPixelRef.cpp
index 9e023c4a7c..870056091f 100644
--- a/src/lazy/SkLazyPixelRef.cpp
+++ b/src/lazy/SkLazyPixelRef.cpp
@@ -178,15 +178,15 @@ bool SkLazyPixelRef::onDecodeInto(int pow2, SkBitmap* bitmap) {
     if (fErrorInDecoding) {
         return false;
     }
-
+    
     SkBitmapFactory::Target target;
     (void)ComputeMinRowBytesAndSize(info, &target.fRowBytes);
-
+    
     SkBitmap tmp;
     if (!init_from_info(&tmp, info, target.fRowBytes)) {
         return false;
     }
-
+    
     target.fAddr = tmp.getPixels();
     fErrorInDecoding = !fDecodeProc(fData->data(), fData->size(), &info, &target);
     if (fErrorInDecoding) {
@@ -196,3 +196,5 @@ bool SkLazyPixelRef::onDecodeInto(int pow2, SkBitmap* bitmap) {
     *bitmap = tmp;
     return true;
 }
+
+
diff --git a/tests/ImageFilterTest.cpp b/tests/ImageFilterTest.cpp
index 99b5a72866..0032c7f648 100644
--- a/tests/ImageFilterTest.cpp
+++ b/tests/ImageFilterTest.cpp
@@ -37,21 +37,10 @@ public:
             for (int x = 0; x < kBitmapSize; x += i) {
                 canvas.save();
                 canvas.translate(SkIntToScalar(x), SkIntToScalar(y));
-                canvas.drawRect(SkRect::MakeXYWH(0, 0,
-                                                 SkIntToScalar(i),
-                                                 SkIntToScalar(i)), darkPaint);
-                canvas.drawRect(SkRect::MakeXYWH(SkIntToScalar(i),
-                                                 0,
-                                                 SkIntToScalar(i),
-                                                 SkIntToScalar(i)), lightPaint);
-                canvas.drawRect(SkRect::MakeXYWH(0,
-                                                 SkIntToScalar(i),
-                                                 SkIntToScalar(i),
-                                                 SkIntToScalar(i)), lightPaint);
-                canvas.drawRect(SkRect::MakeXYWH(SkIntToScalar(i),
-                                                 SkIntToScalar(i),
-                                                 SkIntToScalar(i),
-                                                 SkIntToScalar(i)), darkPaint);
+                canvas.drawRect(SkRect::MakeXYWH(0, 0, i, i), darkPaint);
+                canvas.drawRect(SkRect::MakeXYWH(i, 0, i, i), lightPaint);
+                canvas.drawRect(SkRect::MakeXYWH(0, i, i, i), lightPaint);
+                canvas.drawRect(SkRect::MakeXYWH(i, i, i, i), darkPaint);
                 canvas.restore();
             }
         }
@@ -129,21 +118,20 @@ public:
                 SkPoint3 target(location.fX, location.fY, location.fZ);
                 // 3 ) large negative specular exponent value
                 SkScalar specularExponent = SkFloatToScalar(-1000);
-
+        
                 SkPaint paint;
                 paint.setImageFilter(SkLightingImageFilter::CreateSpotLitSpecular(
                         location, target, specularExponent, SkFloatToScalar(180),
                         0xFFFFFFFF, SK_Scalar1, SK_Scalar1, SK_Scalar1,
                         new SkBitmapSource(bitmap)))->unref();
                 SkCanvas canvas(result);
-                SkRect r = SkRect::MakeWH(SkIntToScalar(kBitmapSize),
-                                          SkIntToScalar(kBitmapSize));
+                SkRect r = SkRect::MakeWH(kBitmapSize, kBitmapSize);
                 canvas.drawRect(r, paint);
             }
 
             {
                 // This tests for scale bringing width to 0
-                SkSize scale = SkSize::Make(SkFloatToScalar(-0.001f), SK_Scalar1);
+                SkSize scale = SkSize::Make(SkFloatToScalar(-0.001), SK_Scalar1);
                 SkAutoTUnref<SkBicubicImageFilter> bicubic(
                     SkBicubicImageFilter::CreateMitchell(
                         scale, new SkBitmapSource(bitmap)));