commit 5a0f3455320f5591c196844ff8a89b71a7d9aa56
author Mike Reed <reed@google.com> Fri Jan 19 08:25:11 2018 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jan 19 14:30:33 2018 +0000
tree e04602fe448f6d456e0796f116659cd1344ea92c
parent f6258605545945990b5063cf30b4663714fd64f2

remove code from old picture serial guard

Bug: skia:
Change-Id: If50a76c7f570d6e88f6583d381d0354568398039
Reviewed-on: https://skia-review.googlesource.com/97060
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Mike Reed <reed@google.com>

src/effects/SkPictureImageFilter.cpp

diff --git a/src/effects/SkPictureImageFilter.cpp b/src/effects/SkPictureImageFilter.cpp
index 2596f41..304b91c 100644
--- a/src/effects/SkPictureImageFilter.cpp
+++ b/src/effects/SkPictureImageFilter.cpp
@@ -56,12 +56,8 @@
     sk_sp<SkPicture> picture;
     SkRect cropRect;
 
-    if (SkPicture::PictureIOSecurityPrecautionsEnabled()) {
-        buffer.validate(!buffer.readBool());
-    } else {
-        if (buffer.readBool()) {
-            picture = SkPicture::MakeFromBuffer(buffer);
-        }
+    if (buffer.readBool()) {
+        picture = SkPicture::MakeFromBuffer(buffer);
     }
     buffer.readRect(&cropRect);
 
@@ -77,14 +73,10 @@
 }
 
 void SkPictureImageFilter::flatten(SkWriteBuffer& buffer) const {
-    if (SkPicture::PictureIOSecurityPrecautionsEnabled()) {
-        buffer.writeBool(false);
-    } else {
-        bool hasPicture = (fPicture != nullptr);
-        buffer.writeBool(hasPicture);
-        if (hasPicture) {
-            fPicture->flatten(buffer);
-        }
+    bool hasPicture = (fPicture != nullptr);
+    buffer.writeBool(hasPicture);
+    if (hasPicture) {
+        fPicture->flatten(buffer);
     }
     buffer.writeRect(fCropRect);
 }