Changeset 95576 in webkit

Timestamp:

Sep 20, 2011 3:39:38 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

Use DEFINE_STATIC_LOCAL to intentionally leak the static RefCountedHFONT object returned from
FontPlatformData::hashTableDeletedFontValue() to avoid global destructor ordering problems.
​https://bugs.webkit.org/show_bug.cgi?id=67906

Patch by Marshall Greenblatt <​marshall@chromium.org> on 2011-09-20
Reviewed by Adam Barth.

• platform/graphics/chromium/FontPlatformDataChromiumWin.cpp:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/chromium/FontPlatformDataChromiumWin.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-20  Marshall Greenblatt  <marshall@chromium.org>
+
+        Use DEFINE_STATIC_LOCAL to intentionally leak the static RefCountedHFONT object returned from
+        FontPlatformData::hashTableDeletedFontValue() to avoid global destructor ordering problems.
+        https://bugs.webkit.org/show_bug.cgi?id=67906
+
+        Reviewed by Adam Barth.
+
+        * platform/graphics/chromium/FontPlatformDataChromiumWin.cpp:
+
 2011-09-20  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/platform/graphics/chromium/FontPlatformDataChromiumWin.cpp

@@ -39 +39 @@
 #include "PlatformSupport.h"
 #include "SkiaFontWin.h"
+#include "StdLibExtras.h"
 
 namespace WebCore {
@@ -117 +118 @@
 FontPlatformData::RefCountedHFONT* FontPlatformData::hashTableDeletedFontValue()
 {
-    static RefPtr<RefCountedHFONT> deletedValue =
-        RefCountedHFONT::create(reinterpret_cast<HFONT>(-1));
+    DEFINE_STATIC_LOCAL(RefPtr<RefCountedHFONT>, deletedValue,
+                        (RefCountedHFONT::create(reinterpret_cast<HFONT>(-1))));
     return deletedValue.get();
 }