From bd445d75f091d856d349d5d57f9b5957d83b6246 Mon Sep 17 00:00:00 2001
From: jonathanmetzman <31354670+jonathanmetzman@users.noreply.github.com>
Date: Tue, 31 Jul 2018 12:56:47 -0700
Subject: [PATCH] Revert "[skia] Intentional bug for verifying ASAN (#1678)"
 (#1679)

This reverts commit e6673eada5c75c59f3c27506c20593dfadbc0011.
---
 projects/skia/skia.diff | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/projects/skia/skia.diff b/projects/skia/skia.diff
index e0342bb12..8f66b9faf 100644
--- a/projects/skia/skia.diff
+++ b/projects/skia/skia.diff
@@ -12,19 +12,6 @@ index e6933a856f..f802cc2250 100644
      SkScalar resScale = maxDim / 1000;
      SkPathMeasure measure(path, bits & 1, resScale);
      SkPoint position;
-diff --git a/fuzz/oss_fuzz/FuzzImageFilterDeserialize.cpp b/fuzz/oss_fuzz/FuzzImageFilterDeserialize.cpp
-index f9d9598892..f24a6c97a7 100644
---- a/fuzz/oss_fuzz/FuzzImageFilterDeserialize.cpp
-+++ b/fuzz/oss_fuzz/FuzzImageFilterDeserialize.cpp
-@@ -19,7 +19,7 @@ void FuzzImageFilterDeserialize(sk_sp<SkData> bytes) {
-     SkCanvas canvas(bitmap);
-     canvas.clear(0x00000000);
- 
--    auto flattenable = SkImageFilter::Deserialize(bytes->data(), bytes->size());
-+    auto flattenable = SkImageFilter::Deserialize(bytes->data(), bytes->size()+20);
- 
-     if (flattenable != nullptr) {
-         // Let's see if using the filters can cause any trouble...
 diff --git a/src/core/SkAAClip.cpp b/src/core/SkAAClip.cpp
 index 24a8e58e96..3339cd0e5f 100644
 --- a/src/core/SkAAClip.cpp