commit de5c50268c3ff0af507c0a9b47ab58809b89867c
author Mike Reed <reed@google.com> Fri Jan 26 14:59:12 2018 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jan 26 20:26:20 2018 +0000
tree 9753695ccab4221b4c171006754e1c7c22b3ae3d
parent 9d7a73527a6df7d3523e93a6a1f964df08b94510

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>

src/effects/SkDisplacementMapEffect.cpp

diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp
index 3fabb4d..1b055b6 100644
--- a/src/effects/SkDisplacementMapEffect.cpp
+++ b/src/effects/SkDisplacementMapEffect.cpp
@@ -11,7 +11,6 @@
 #include "SkColorSpaceXformer.h"
 #include "SkImageFilterPriv.h"
 #include "SkReadBuffer.h"
-#include "SkSafeRange.h"
 #include "SkSpecialImage.h"
 #include "SkWriteBuffer.h"
 #include "SkUnPreMultiply.h"
@@ -147,24 +146,13 @@
 }
 
 sk_sp<SkFlattenable> SkDisplacementMapEffect::CreateProc(SkReadBuffer& buffer) {
-    SkSafeRange safe;
-
     SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 2);
 
-    ChannelSelectorType xsel = safe.checkLE<ChannelSelectorType>(buffer.readInt(),
-                                                                 kLast_ChannelSelectorType);
-    ChannelSelectorType ysel = safe.checkLE<ChannelSelectorType>(buffer.readInt(),
-                                                                 kLast_ChannelSelectorType);
-
+    ChannelSelectorType xsel = buffer.read32LE(kLast_ChannelSelectorType);
+    ChannelSelectorType ysel = buffer.read32LE(kLast_ChannelSelectorType);
     SkScalar scale = buffer.readScalar();
 
-    if (!buffer.validate(safe)) {
-        return nullptr;
-    }
-
-    return Make(xsel, ysel, scale,
-                common.getInput(0), common.getInput(1),
-                &common.cropRect());
+    return Make(xsel, ysel, scale, common.getInput(0), common.getInput(1), &common.cropRect());
 }
 
 void SkDisplacementMapEffect::flatten(SkWriteBuffer& buffer) const {