aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--include/core/SkPicture.h2
-rw-r--r--src/core/SkPicture.cpp7
2 files changed, 1 insertions, 8 deletions
diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h
index 8edd183ede..17539045f2 100644
--- a/include/core/SkPicture.h
+++ b/include/core/SkPicture.h
@@ -150,8 +150,6 @@ public:
// Returns NULL if this is not an SkBigPicture.
virtual const SkBigPicture* asSkBigPicture() const { return nullptr; }
- // Global setting to enable or disable security precautions for serialization.
- static void SetPictureIOSecurityPrecautionsEnabled_Dangerous(bool set);
static bool PictureIOSecurityPrecautionsEnabled();
private:
diff --git a/src/core/SkPicture.cpp b/src/core/SkPicture.cpp
index e12c059228..4642f48c55 100644
--- a/src/core/SkPicture.cpp
+++ b/src/core/SkPicture.cpp
@@ -16,8 +16,7 @@
#include "SkPictureRecorder.h"
#include "SkSerialProcs.h"
-#if defined(SK_DISALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS) || \
- defined(SK_ENABLE_PICTURE_IO_SECURITY_PRECAUTIONS)
+#if defined(SK_DISALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS)
static bool g_AllPictureIOSecurityPrecautionsEnabled = true;
#else
static bool g_AllPictureIOSecurityPrecautionsEnabled = false;
@@ -344,10 +343,6 @@ bool SkPicture::suitableForGpuRasterization(GrContext*, const char** whyNot) con
#endif
// Global setting to disable security precautions for serialization.
-void SkPicture::SetPictureIOSecurityPrecautionsEnabled_Dangerous(bool set) {
- g_AllPictureIOSecurityPrecautionsEnabled = set;
-}
-
bool SkPicture::PictureIOSecurityPrecautionsEnabled() {
return g_AllPictureIOSecurityPrecautionsEnabled;
}