move checkLE functionality directly onto readbuffer

Bug: skia:
Change-Id: I549717f04e2e4cafc41ccbe13009805f47943d5d
Reviewed-on: https://skia-review.googlesource.com/99703
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Reed <reed@google.com>

1 files changed, 3 insertions, 10 deletions

diff --git a/src/shaders/SkPerlinNoiseShader.cpp b/src/shaders/SkPerlinNoiseShader.cpp
index 0a15f1ce44..48c9c30447 100644
--- a/src/shaders/SkPerlinNoiseShader.cpp
+++ b/src/shaders/SkPerlinNoiseShader.cpp
@@ -12,7 +12,6 @@
 #include "SkColorFilter.h"
 #include "SkMakeUnique.h"
 #include "SkReadBuffer.h"
-#include "SkSafeRange.h"
 #include "SkWriteBuffer.h"
 #include "SkShader.h"
 #include "SkUnPreMultiply.h"
@@ -416,24 +415,18 @@ SkPerlinNoiseShaderImpl::SkPerlinNoiseShaderImpl(SkPerlinNoiseShaderImpl::Type t
 }
 
 sk_sp<SkFlattenable> SkPerlinNoiseShaderImpl::CreateProc(SkReadBuffer& buffer) {
-    SkSafeRange safe;
-
-    Type type = safe.checkLE<Type>(buffer.readInt(), kLast_Type);
+    Type type = buffer.read32LE(kLast_Type);
 
     SkScalar freqX = buffer.readScalar();
     SkScalar freqY = buffer.readScalar();
 
-    int octaves = safe.checkLE<int>(buffer.readInt(), kMaxOctaves);
+    int octaves = buffer.read32LE<int>(kMaxOctaves);
 
     SkScalar seed = buffer.readScalar();
     SkISize tileSize;
     tileSize.fWidth = buffer.readInt();
     tileSize.fHeight = buffer.readInt();
 
-    if (!buffer.validate(safe)) {
-        return nullptr;
-    }
-
     switch (type) {
         case kFractalNoise_Type:
             return SkPerlinNoiseShader::MakeFractalNoise(freqX, freqY, octaves, seed, &tileSize);
@@ -442,7 +435,7 @@ sk_sp<SkFlattenable> SkPerlinNoiseShaderImpl::CreateProc(SkReadBuffer& buffer) {
         case kImprovedNoise_Type:
             return SkPerlinNoiseShader::MakeImprovedNoise(freqX, freqY, octaves, seed);
         default:
-            // Really shouldn't get here b.c. of earlier checkLE on type
+            // Really shouldn't get here b.c. of earlier check on type
             buffer.validate(false);
             return nullptr;
     }