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

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

Index: third_party/WebKit/Source/core/style/ComputedStyle.cpp
diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.cpp b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
index 27fa34f8bf466e20188e9c92f00bab16ad731c20..9e0fa545ec1bec49b313ed9f9cb18d4e5505d42c 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.cpp
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
@@ -818,8 +818,13 @@
 
 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));
 }
 
@@ -1739,17 +1744,19 @@
     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
 {