skia: Add runtime option to disable picture IO security precautions

src/effects/SkPictureImageFilter.cpp

 /*
  * Copyright 2013 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 "SkPictureImageFilter.h"
 #include "SkDevice.h"
 #include "SkCanvas.h"
@@ skipping 21 matching lines @@
 }
 
 SkPictureImageFilter::~SkPictureImageFilter() {
     SkSafeUnref(fPicture);
 }
 
 SkFlattenable* SkPictureImageFilter::CreateProc(SkReadBuffer& buffer) {
     SkAutoTUnref<SkPicture> picture;
     SkRect cropRect;
 
-#ifdef SK_DISALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS
-    if (buffer.isCrossProcess()) {
+    if (buffer.isCrossProcess() && SkPicture::PictureIOSecurityPrecautionsEnabled()) {
         buffer.validate(!buffer.readBool());
-    } else 
-#endif
-    {
+    } else {
         if (buffer.readBool()) {
             picture.reset(SkPicture::CreateFromBuffer(buffer));
         }
     }
     buffer.readRect(&cropRect);
     PictureResolution pictureResolution;
     if (buffer.isVersionLT(SkReadBuffer::kPictureImageFilterResolution_Version)) {
         pictureResolution = kDeviceSpace_PictureResolution;
     } else {
         pictureResolution = (PictureResolution)buffer.readInt();
     }  
 
     if (kLocalSpace_PictureResolution == pictureResolution) {
         //filterLevel is only serialized if pictureResolution is LocalSpace
         SkFilterQuality filterQuality;
         if (buffer.isVersionLT(SkReadBuffer::kPictureImageFilterLevel_Version)) {
             filterQuality = kLow_SkFilterQuality;
         } else {
             filterQuality = (SkFilterQuality)buffer.readInt();
         }
         return CreateForLocalSpace(picture, cropRect, filterQuality);
     }
     return Create(picture, cropRect);
 }
 
 void SkPictureImageFilter::flatten(SkWriteBuffer& buffer) const {
-#ifdef SK_DISALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS
-    if (buffer.isCrossProcess()) {
+    if (buffer.isCrossProcess() && SkPicture::PictureIOSecurityPrecautionsEnabled()) {
         buffer.writeBool(false);
-    } else 
-#endif
-    {
+    } else {
         bool hasPicture = (fPicture != NULL);
         buffer.writeBool(hasPicture);
         if (hasPicture) {
             fPicture->flatten(buffer);
         }
     }
     buffer.writeRect(fCropRect);
     buffer.writeInt(fPictureResolution);
     if (kLocalSpace_PictureResolution == fPictureResolution) {
         buffer.writeInt(fFilterQuality);
@@ skipping 90 matching lines @@
     str->appendf("crop: (%f,%f,%f,%f) ", 
                  fCropRect.fLeft, fCropRect.fTop, fCropRect.fRight, fCropRect.fBottom);
     if (fPicture) {
         str->appendf("picture: (%f,%f,%f,%f)",
                      fPicture->cullRect().fLeft, fPicture->cullRect().fTop,
                      fPicture->cullRect().fRight, fPicture->cullRect().fBottom);
     }
     str->append(")");
 }
 #endif