Optionally enable SkValidatingReadBuffer in SkPictureImageFilter

src/core/SkPicture.cpp

 /*
  * Copyright 2007 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 "SkAtomics.h"
 #include "SkImageGenerator.h"
 #include "SkMessageBus.h"
@@ skipping 111 matching lines @@
     buffer->readRect(&info.fCullRect);
     info.fFlags = buffer->readUInt();
 
     if (IsValidPictInfo(info)) {
         if (pInfo) { *pInfo = info; }
         return true;
     }
     return false;
 }
 
-sk_sp<SkPicture> SkPicture::Forwardport(const SkPictInfo& info, const SkPictureData* data) {
+sk_sp<SkPicture> SkPicture::Forwardport(const SkPictInfo& info,
+                                        const SkPictureData* data,
+                                        const SkReadBuffer* buffer) {
     if (!data) {
         return nullptr;
     }
     SkPicturePlayback playback(data);
     SkPictureRecorder r;
-    playback.draw(r.beginRecording(info.fCullRect), nullptr/*no callback*/);
+    playback.draw(r.beginRecording(info.fCullRect), nullptr/*no callback*/, buffer);
     return r.finishRecordingAsPicture();
 }
 
 static bool default_install(const void* src, size_t length, SkBitmap* dst) {
     sk_sp<SkData> encoded(SkData::MakeWithCopy(src, length));
     return encoded && SkDEPRECATED_InstallDiscardablePixelRef(
             SkImageGenerator::NewFromEncoded(encoded.get()), dst);
 }
 
 sk_sp<SkPicture> SkPicture::MakeFromStream(SkStream* stream) {
     return MakeFromStream(stream, &default_install, nullptr);
 }
 
 sk_sp<SkPicture> SkPicture::MakeFromStream(SkStream* stream, InstallPixelRefProc proc) {
     return MakeFromStream(stream, proc, nullptr);
 }
 
 sk_sp<SkPicture> SkPicture::MakeFromStream(SkStream* stream, InstallPixelRefProc proc,
                                            SkTypefacePlayback* typefaces) {
     SkPictInfo info;
     if (!InternalOnly_StreamIsSKP(stream, &info) || !stream->readBool()) {
         return nullptr;
     }
     SkAutoTDelete<SkPictureData> data(
             SkPictureData::CreateFromStream(stream, info, proc, typefaces));
-    return Forwardport(info, data);
+    return Forwardport(info, data, nullptr);
 }
 
 sk_sp<SkPicture> SkPicture::MakeFromBuffer(SkReadBuffer& buffer) {
     SkPictInfo info;
     if (!InternalOnly_BufferIsSKP(&buffer, &info) || !buffer.readBool()) {
         return nullptr;
     }
     SkAutoTDelete<SkPictureData> data(SkPictureData::CreateFromBuffer(buffer, info));
-    return Forwardport(info, data);
+    return Forwardport(info, data, &buffer);
 }
 
 SkPictureData* SkPicture::backport() const {
     SkPictInfo info = this->createHeader();
     SkPictureRecord rec(SkISize::Make(info.fCullRect.width(), info.fCullRect.height()), 0/*flags*/);
     rec.beginRecording();
         this->playback(&rec);
     rec.endRecording();
     return new SkPictureData(rec, info, false /*deep copy ops?*/);
 }
@@ skipping 42 matching lines @@
 }
 
 // Global setting to disable security precautions for serialization.
 void SkPicture::SetPictureIOSecurityPrecautionsEnabled_Dangerous(bool set) {
     g_AllPictureIOSecurityPrecautionsEnabled = set;
 }
 
 bool SkPicture::PictureIOSecurityPrecautionsEnabled() {
     return g_AllPictureIOSecurityPrecautionsEnabled;
 }