Title: [99293] trunk/Source/WebCore
Revision
99293
Author
[email protected]
Date
2011-11-04 10:37:25 -0700 (Fri, 04 Nov 2011)

Log Message

[chromium] Remove most exit time destructors
https://bugs.webkit.org/show_bug.cgi?id=71524

Do this by using the DEFINE_STATIC_LOCAL macro, which allocates things on the heaps and then leaks them.

Reviewed by Dimitri Glazkov.

No behavior change, so no new tests.

* platform/chromium/CursorChromium.cpp:
(WebCore::pointerCursor):
(WebCore::crossCursor):
(WebCore::handCursor):
(WebCore::iBeamCursor):
(WebCore::waitCursor):
(WebCore::helpCursor):
(WebCore::eastResizeCursor):
(WebCore::northResizeCursor):
(WebCore::northEastResizeCursor):
(WebCore::northWestResizeCursor):
(WebCore::southResizeCursor):
(WebCore::southEastResizeCursor):
(WebCore::southWestResizeCursor):
(WebCore::westResizeCursor):
(WebCore::northSouthResizeCursor):
(WebCore::eastWestResizeCursor):
(WebCore::northEastSouthWestResizeCursor):
(WebCore::northWestSouthEastResizeCursor):
(WebCore::columnResizeCursor):
(WebCore::rowResizeCursor):
(WebCore::middlePanningCursor):
(WebCore::eastPanningCursor):
(WebCore::northPanningCursor):
(WebCore::northEastPanningCursor):
(WebCore::northWestPanningCursor):
(WebCore::southPanningCursor):
(WebCore::southEastPanningCursor):
(WebCore::southWestPanningCursor):
(WebCore::westPanningCursor):
(WebCore::moveCursor):
(WebCore::verticalTextCursor):
(WebCore::cellCursor):
(WebCore::contextMenuCursor):
(WebCore::aliasCursor):
(WebCore::progressCursor):
(WebCore::noDropCursor):
(WebCore::copyCursor):
(WebCore::noneCursor):
(WebCore::notAllowedCursor):
(WebCore::zoomInCursor):
(WebCore::zoomOutCursor):
(WebCore::grabCursor):
(WebCore::grabbingCursor):
* platform/chromium/LanguageChromium.cpp:
(WebCore::platformDefaultLanguage):
* platform/chromium/MIMETypeRegistryChromium.cpp:
(WebCore::dummyHashSet):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (99292 => 99293)


--- trunk/Source/WebCore/ChangeLog	2011-11-04 17:29:25 UTC (rev 99292)
+++ trunk/Source/WebCore/ChangeLog	2011-11-04 17:37:25 UTC (rev 99293)
@@ -1,3 +1,63 @@
+2011-11-04  Nico Weber  <[email protected]>
+
+        [chromium] Remove most exit time destructors
+        https://bugs.webkit.org/show_bug.cgi?id=71524
+
+        Do this by using the DEFINE_STATIC_LOCAL macro, which allocates things on the heaps and then leaks them.
+
+        Reviewed by Dimitri Glazkov.
+
+        No behavior change, so no new tests.
+
+        * platform/chromium/CursorChromium.cpp:
+        (WebCore::pointerCursor):
+        (WebCore::crossCursor):
+        (WebCore::handCursor):
+        (WebCore::iBeamCursor):
+        (WebCore::waitCursor):
+        (WebCore::helpCursor):
+        (WebCore::eastResizeCursor):
+        (WebCore::northResizeCursor):
+        (WebCore::northEastResizeCursor):
+        (WebCore::northWestResizeCursor):
+        (WebCore::southResizeCursor):
+        (WebCore::southEastResizeCursor):
+        (WebCore::southWestResizeCursor):
+        (WebCore::westResizeCursor):
+        (WebCore::northSouthResizeCursor):
+        (WebCore::eastWestResizeCursor):
+        (WebCore::northEastSouthWestResizeCursor):
+        (WebCore::northWestSouthEastResizeCursor):
+        (WebCore::columnResizeCursor):
+        (WebCore::rowResizeCursor):
+        (WebCore::middlePanningCursor):
+        (WebCore::eastPanningCursor):
+        (WebCore::northPanningCursor):
+        (WebCore::northEastPanningCursor):
+        (WebCore::northWestPanningCursor):
+        (WebCore::southPanningCursor):
+        (WebCore::southEastPanningCursor):
+        (WebCore::southWestPanningCursor):
+        (WebCore::westPanningCursor):
+        (WebCore::moveCursor):
+        (WebCore::verticalTextCursor):
+        (WebCore::cellCursor):
+        (WebCore::contextMenuCursor):
+        (WebCore::aliasCursor):
+        (WebCore::progressCursor):
+        (WebCore::noDropCursor):
+        (WebCore::copyCursor):
+        (WebCore::noneCursor):
+        (WebCore::notAllowedCursor):
+        (WebCore::zoomInCursor):
+        (WebCore::zoomOutCursor):
+        (WebCore::grabCursor):
+        (WebCore::grabbingCursor):
+        * platform/chromium/LanguageChromium.cpp:
+        (WebCore::platformDefaultLanguage):
+        * platform/chromium/MIMETypeRegistryChromium.cpp:
+        (WebCore::dummyHashSet):
+
 2011-11-03  Anders Carlsson  <[email protected]>
 
         Add NetscapePlugin::convertFromRootView

Modified: trunk/Source/WebCore/platform/chromium/CursorChromium.cpp (99292 => 99293)


--- trunk/Source/WebCore/platform/chromium/CursorChromium.cpp	2011-11-04 17:29:25 UTC (rev 99292)
+++ trunk/Source/WebCore/platform/chromium/CursorChromium.cpp	2011-11-04 17:37:25 UTC (rev 99293)
@@ -62,259 +62,259 @@
 
 const Cursor& pointerCursor()
 {
-    static const Cursor c(PlatformCursor::TypePointer);
+    DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypePointer));
     return c;
 }
 
 const Cursor& crossCursor()
 {
-    static const Cursor c(PlatformCursor::TypeCross);
+    DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeCross));
     return c;
 }
 
 const Cursor& handCursor()
 {
-    static const Cursor c(PlatformCursor::TypeHand);
+    DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeHand));
     return c;
 }
 
 const Cursor& iBeamCursor()
 {
-    static const Cursor c(PlatformCursor::TypeIBeam);
+    DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeIBeam));
     return c;
 }
 
 const Cursor& waitCursor()
 {
-    static const Cursor c(PlatformCursor::TypeWait);
+    DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeWait));
     return c;
 }
 
 const Cursor& helpCursor()
 {
-    static const Cursor c(PlatformCursor::TypeHelp);
+    DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeHelp));
     return c;
 }
 
 const Cursor& eastResizeCursor()
 {
-    static const Cursor c(PlatformCursor::TypeEastResize);
+    DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeEastResize));
     return c;
 }
 
 const Cursor& northResizeCursor()
 {
-    static const Cursor c(PlatformCursor::TypeNorthResize);
+    DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeNorthResize));
     return c;
 }
 
 const Cursor& northEastResizeCursor()
 {
-    static const Cursor c(PlatformCursor::TypeNorthEastResize);
+    DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeNorthEastResize));
     return c;
 }
 
 const Cursor& northWestResizeCursor()
 {
-    static const Cursor c(PlatformCursor::TypeNorthWestResize);
+    DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeNorthWestResize));
     return c;
 }
 
 const Cursor& southResizeCursor()
 {
-    static const Cursor c(PlatformCursor::TypeSouthResize);
+    DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeSouthResize));
     return c;
 }
 
 const Cursor& southEastResizeCursor()
 {
-    static const Cursor c(PlatformCursor::TypeSouthEastResize);
+    DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeSouthEastResize));
     return c;
 }
 
 const Cursor& southWestResizeCursor()
 {
-    static const Cursor c(PlatformCursor::TypeSouthWestResize);
+    DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeSouthWestResize));
     return c;
 }
 
 const Cursor& westResizeCursor()
 {
-    static const Cursor c(PlatformCursor::TypeWestResize);
+    DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeWestResize));
     return c;
 }
 
 const Cursor& northSouthResizeCursor()
 {
-    static const Cursor c(PlatformCursor::TypeNorthSouthResize);
+    DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeNorthSouthResize));
     return c;
 }
 
 const Cursor& eastWestResizeCursor()
 {
-    static const Cursor c(PlatformCursor::TypeEastWestResize);
+    DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeEastWestResize));
     return c;
 }
 
 const Cursor& northEastSouthWestResizeCursor()
 {
-    static const Cursor c(PlatformCursor::TypeNorthEastSouthWestResize);
+    DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeNorthEastSouthWestResize));
     return c;
 }
 
 const Cursor& northWestSouthEastResizeCursor()
 {
-    static const Cursor c(PlatformCursor::TypeNorthWestSouthEastResize);
+    DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeNorthWestSouthEastResize));
     return c;
 }
 
 const Cursor& columnResizeCursor()
 {
-    static const Cursor c(PlatformCursor::TypeColumnResize);
+    DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeColumnResize));
     return c;
 }
 
 const Cursor& rowResizeCursor()
 {
-    static const Cursor c(PlatformCursor::TypeRowResize);
+    DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeRowResize));
     return c;
 }
 
 const Cursor& middlePanningCursor()
 {
-    static const Cursor c(PlatformCursor::TypeMiddlePanning);
+    DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeMiddlePanning));
     return c;
 }
 
 const Cursor& eastPanningCursor()
 {
-    static const Cursor c(PlatformCursor::TypeEastPanning);
+    DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeEastPanning));
     return c;
 }
 
 const Cursor& northPanningCursor()
 {
-    static const Cursor c(PlatformCursor::TypeNorthPanning);
+    DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeNorthPanning));
     return c;
 }
 
 const Cursor& northEastPanningCursor()
 {
-    static const Cursor c(PlatformCursor::TypeNorthEastPanning);
+    DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeNorthEastPanning));
     return c;
 }
 
 const Cursor& northWestPanningCursor()
 {
-    static const Cursor c(PlatformCursor::TypeNorthWestPanning);
+    DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeNorthWestPanning));
     return c;
 }
 
 const Cursor& southPanningCursor()
 {
-    static const Cursor c(PlatformCursor::TypeSouthPanning);
+    DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeSouthPanning));
     return c;
 }
 
 const Cursor& southEastPanningCursor()
 {
-    static const Cursor c(PlatformCursor::TypeSouthEastPanning);
+    DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeSouthEastPanning));
     return c;
 }
 
 const Cursor& southWestPanningCursor()
 {
-    static const Cursor c(PlatformCursor::TypeSouthWestPanning);
+    DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeSouthWestPanning));
     return c;
 }
 
 const Cursor& westPanningCursor()
 {
-    static const Cursor c(PlatformCursor::TypeWestPanning);
+    DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeWestPanning));
     return c;
 }
 
 const Cursor& moveCursor() 
 {
-    static const Cursor c(PlatformCursor::TypeMove);
+    DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeMove));
     return c;
 }
 
 const Cursor& verticalTextCursor()
 {
-    static const Cursor c(PlatformCursor::TypeVerticalText);
+    DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeVerticalText));
     return c;
 }
 
 const Cursor& cellCursor()
 {
-    static const Cursor c(PlatformCursor::TypeCell);
+    DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeCell));
     return c;
 }
 
 const Cursor& contextMenuCursor()
 {
-    static const Cursor c(PlatformCursor::TypeContextMenu);
+    DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeContextMenu));
     return c;
 }
 
 const Cursor& aliasCursor()
 {
-    static const Cursor c(PlatformCursor::TypeAlias);
+    DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeAlias));
     return c;
 }
 
 const Cursor& progressCursor()
 {
-    static const Cursor c(PlatformCursor::TypeProgress);
+    DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeProgress));
     return c;
 }
 
 const Cursor& noDropCursor()
 {
-    static const Cursor c(PlatformCursor::TypeNoDrop);
+    DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeNoDrop));
     return c;
 }
 
 const Cursor& copyCursor()
 {
-    static const Cursor c(PlatformCursor::TypeCopy);
+    DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeCopy));
     return c;
 }
 
 const Cursor& noneCursor()
 {
-    static const Cursor c(PlatformCursor::TypeNone);
+    DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeNone));
     return c;
 }
 
 const Cursor& notAllowedCursor()
 {
-    static const Cursor c(PlatformCursor::TypeNotAllowed);
+    DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeNotAllowed));
     return c;
 }
 
 const Cursor& zoomInCursor()
 {
-    static const Cursor c(PlatformCursor::TypeZoomIn);
+    DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeZoomIn));
     return c;
 }
 
 const Cursor& zoomOutCursor()
 {
-    static const Cursor c(PlatformCursor::TypeZoomOut);
+    DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeZoomOut));
     return c;
 }
 
 const Cursor& grabCursor()
 {
-    static const Cursor c(PlatformCursor::TypeGrab);
+    DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeGrab));
     return c;
 }
 
 const Cursor& grabbingCursor()
 {
-    static const Cursor c(PlatformCursor::TypeGrabbing);
+    DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeGrabbing));
     return c;
 }
 

Modified: trunk/Source/WebCore/platform/chromium/LanguageChromium.cpp (99292 => 99293)


--- trunk/Source/WebCore/platform/chromium/LanguageChromium.cpp	2011-11-04 17:29:25 UTC (rev 99292)
+++ trunk/Source/WebCore/platform/chromium/LanguageChromium.cpp	2011-11-04 17:37:25 UTC (rev 99293)
@@ -38,9 +38,9 @@
 
 String platformDefaultLanguage()
 {
-    static String computedDefaultLanguage;
+    DEFINE_STATIC_LOCAL(String, computedDefaultLanguage, ());
     if (computedDefaultLanguage.isEmpty())
-        computedDefaultLanguage = PlatformSupport::computedDefaultLanguage();
+        computedDefaultLanguage.append(PlatformSupport::computedDefaultLanguage());
     return computedDefaultLanguage;
 }
 

Modified: trunk/Source/WebCore/platform/chromium/MIMETypeRegistryChromium.cpp (99292 => 99293)


--- trunk/Source/WebCore/platform/chromium/MIMETypeRegistryChromium.cpp	2011-11-04 17:29:25 UTC (rev 99292)
+++ trunk/Source/WebCore/platform/chromium/MIMETypeRegistryChromium.cpp	2011-11-04 17:37:25 UTC (rev 99293)
@@ -145,7 +145,7 @@
 static HashSet<String>& dummyHashSet()
 {
     ASSERT_NOT_REACHED();
-    static HashSet<String> dummy;
+    DEFINE_STATIC_LOCAL(HashSet<String>, dummy, ());
     return dummy;
 }
 
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to