Improve DEFINE_STATIC_LOCAL()'s handling of Blink GCed objects.

third_party/WebKit/Source/core/html/HTMLTableElement.cpp

 /*
  * Copyright (C) 1997 Martin Jones (mjones@kde.org)
  *           (C) 1997 Torben Weis (weis@kde.org)
  *           (C) 1998 Waldo Bastian (bastian@kde.org)
  *           (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2010, 2011 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 392 matching lines @@
 
 const StylePropertySet* HTMLTableElement::additionalPresentationAttributeStyle()
 {
     if (m_frameAttr)
         return nullptr;
 
     if (!m_borderAttr && !m_borderColorAttr) {
         // Setting the border to 'hidden' allows it to win over any border
         // set on the table's cells during border-conflict resolution.
         if (m_rulesAttr != UnsetRules) {
-            DEFINE_STATIC_REF_WILL_BE_PERSISTENT(StylePropertySet, solidBorderStyle, (createBorderStyle(CSSValueHidden)));
-            return solidBorderStyle;
+            DEFINE_STATIC_LOCAL(StylePropertySet, solidBorderStyle, (createBorderStyle(CSSValueHidden)));
+            return &solidBorderStyle;
         }
         return nullptr;
     }
 
     if (m_borderColorAttr) {
-        DEFINE_STATIC_REF_WILL_BE_PERSISTENT(StylePropertySet, solidBorderStyle, (createBorderStyle(CSSValueSolid)));
-        return solidBorderStyle;
+        DEFINE_STATIC_LOCAL(StylePropertySet, solidBorderStyle, (createBorderStyle(CSSValueSolid)));
+        return &solidBorderStyle;
     }
-    DEFINE_STATIC_REF_WILL_BE_PERSISTENT(StylePropertySet, outsetBorderStyle, (createBorderStyle(CSSValueOutset)));
-    return outsetBorderStyle;
+    DEFINE_STATIC_LOCAL(StylePropertySet, outsetBorderStyle, (createBorderStyle(CSSValueOutset)));
+    return &outsetBorderStyle;
 }
 
 HTMLTableElement::CellBorders HTMLTableElement::getCellBorders() const
 {
     switch (m_rulesAttr) {
     case NoneRules:
     case GroupsRules:
         return NoBorders;
     case AllRules:
         return SolidBorders;
@@ skipping 75 matching lines @@
     }
     return style.release();
 }
 
 const StylePropertySet* HTMLTableElement::additionalGroupStyle(bool rows)
 {
     if (m_rulesAttr != GroupsRules)
         return nullptr;
 
     if (rows) {
-        DEFINE_STATIC_REF_WILL_BE_PERSISTENT(StylePropertySet, rowBorderStyle, (createGroupBorderStyle(true)));
-        return rowBorderStyle;
+        DEFINE_STATIC_LOCAL(StylePropertySet, rowBorderStyle, (createGroupBorderStyle(true)));
+        return &rowBorderStyle;
     }
-    DEFINE_STATIC_REF_WILL_BE_PERSISTENT(StylePropertySet, columnBorderStyle, (createGroupBorderStyle(false)));
-    return columnBorderStyle;
+    DEFINE_STATIC_LOCAL(StylePropertySet, columnBorderStyle, (createGroupBorderStyle(false)));
+    return &columnBorderStyle;
 }
 
 bool HTMLTableElement::isURLAttribute(const Attribute& attribute) const
 {
     return attribute.name() == backgroundAttr || HTMLElement::isURLAttribute(attribute);
 }
 
 bool HTMLTableElement::hasLegalLinkAttribute(const QualifiedName& name) const
 {
     return name == backgroundAttr || HTMLElement::hasLegalLinkAttribute(name);
@@ skipping 24 matching lines @@
     return getAttribute(summaryAttr);
 }
 
 DEFINE_TRACE(HTMLTableElement)
 {
     visitor->trace(m_sharedCellStyle);
     HTMLElement::trace(visitor);
 }
 
 } // namespace blink