Revert of fix for linux builder warn on exit destructor

include/gpu/GrClip.h

 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrClip_DEFINED
 #define GrClip_DEFINED
 
@@ skipping 130 matching lines @@
                                bool* isIntersectionOfRects = NULL) const {
         this->getConservativeBounds(surface->width(), surface->height(),
                                     devResult, isIntersectionOfRects);
     }
 
     void getConservativeBounds(int width, int height,
                                SkIRect* devResult,
                                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 {
         kClipStack_ClipType,
         kWideOpen_ClipType,
         kIRect_ClipType,
     };
 
     ClipType clipType() const { return fClipType; }
 
 private:
     union Clip {
         struct ClipStack {
             const SkClipStack* fStack;
             SkIPoint fOrigin;
         } fClipStack;
         SkIRect fIRect;
     } fClip;
 
     ClipType fClipType;
 };
 
 #endif