Revert of fix for linux builder warn on exit destructor (patchset #1 id:1 of https...

Reason for revert:
still breaks

Original issue's description:
> fix for linux builder warn on exit destructor
>
> TBR=bsalomon@google.com
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/51fdb4f8f63b6bb13e719000381e225503a2d4a0

TBR=joshualitt@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Review URL: https://codereview.chromium.org/955493003

diff --git a/include/gpu/GrClip.h b/include/gpu/GrClip.h
index a71a9ef..f07a974 100644 (file)
--- a/include/gpu/GrClip.h
+++ b/include/gpu/GrClip.h
@@ -148,10 +148,8 @@ public:
                                bool* isIntersectionOfRects = NULL) const;
 
     static const GrClip& WideOpen() {
-        static SkAlignedSStorage<sizeof(GrClip)> g_WideOpenClip_Storage;
-        static GrClip* g_WideOpenClip SkNEW_PLACEMENT(g_WideOpenClip_Storage.get(), GrClip);
-        static SkAutoTDestroy<GrClip> g_WideOpenClip_ad(g_WideOpenClip);
-        return *g_WideOpenClip_ad;
+        static GrClip clip;
+        return clip;
     }
 
     enum ClipType {