Index: include/gpu/GrClip.h |
diff --git a/include/gpu/GrClip.h b/include/gpu/GrClip.h |
index f07a9749ca7aa22f822a2ec83520b0a0dc5c2049..a71a9efcec56b1edccb58d0814d1fc9d9995d0b0 100644 |
--- a/include/gpu/GrClip.h |
+++ b/include/gpu/GrClip.h |
@@ -148,8 +148,10 @@ public: |
bool* isIntersectionOfRects = NULL) const; |
static const GrClip& WideOpen() { |
- static GrClip clip; |
- return clip; |
+ 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; |
} |
enum ClipType { |