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

third_party/WebKit/Source/core/style/ComputedStyle.cpp

 /*
  * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2011 Adobe Systems Incorporated. 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
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 800 matching lines @@
                 || rareInheritedData->visitedLinkTextEmphasisColor() != other.rareInheritedData->visitedLinkTextEmphasisColor()
                 || rareInheritedData->textEmphasisFill != other.rareInheritedData->textEmphasisFill
                 || rareInheritedData->appliedTextDecorations != other.rareInheritedData->appliedTextDecorations)) {
                 diff.setTextDecorationOrColorChanged();
         }
     }
 }
 
 void ComputedStyle::addCursor(RawPtr<StyleImage> image, bool hotSpotSpecified, const IntPoint& hotSpot)
 {
-    if (!rareInheritedData.access()->cursorData)
+    if (!rareInheritedData.access()->cursorData) {
+#if ENABLE(OILPAN)
         rareInheritedData.access()->cursorData = new CursorList;
+#else
+        rareInheritedData.access()->cursorData = CursorList::create();
+#endif
+    }
     rareInheritedData.access()->cursorData->append(CursorData(image, hotSpotSpecified, hotSpot));
 }
 
 void ComputedStyle::setCursorList(RawPtr<CursorList> other)
 {
     rareInheritedData.access()->cursorData = other;
 }
 
 void ComputedStyle::setQuotes(PassRefPtr<QuotesData> q)
 {
@@ skipping 899 matching lines @@
         return TextEmphasisMarkDot;
 
     return TextEmphasisMarkSesame;
 }
 
 Color ComputedStyle::initialTapHighlightColor()
 {
     return LayoutTheme::tapHighlightColor();
 }
 
+#if ENABLE(OILPAN)
 const FilterOperations& ComputedStyle::initialFilter()
 {
-    DEFINE_STATIC_LOCAL(FilterOperationsWrapper, ops, (FilterOperationsWrapper::create()));
-    return ops.operations();
+    DEFINE_STATIC_LOCAL(Persistent<FilterOperationsWrapper>, ops, (FilterOperationsWrapper::create()));
+    return ops->operations();
 }
 
 const FilterOperations& ComputedStyle::initialBackdropFilter()
 {
-    DEFINE_STATIC_LOCAL(FilterOperationsWrapper, ops, (FilterOperationsWrapper::create()));
-    return ops.operations();
+    DEFINE_STATIC_LOCAL(Persistent<FilterOperationsWrapper>, ops, (FilterOperationsWrapper::create()));
+    return ops->operations();
 }
+#endif
 
 LayoutRectOutsets ComputedStyle::imageOutsets(const NinePieceImage& image) const
 {
     return LayoutRectOutsets(
         NinePieceImage::computeOutset(image.outset().top(), borderTopWidth()),
         NinePieceImage::computeOutset(image.outset().right(), borderRightWidth()),
         NinePieceImage::computeOutset(image.outset().bottom(), borderBottomWidth()),
         NinePieceImage::computeOutset(image.outset().left(), borderLeftWidth()));
 }
 
@@ skipping 90 matching lines @@
     if (!shadowList)
         return false;
     for (size_t i = shadowList->shadows().size(); i--; ) {
         if (shadowList->shadows()[i].color().isCurrentColor())
             return true;
     }
     return false;
 }
 
 } // namespace blink