Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(31)

Unified Diff: include/gpu/GrClip.h

Issue 951103002: fix for linux builder warn on exit destructor (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698