Oilpan: move custom element objects to the heap.

Source/core/dom/custom/CustomElementObserver.cpp

Index: Source/core/dom/custom/CustomElementObserver.cpp
diff --git a/Source/core/dom/custom/CustomElementObserver.cpp b/Source/core/dom/custom/CustomElementObserver.cpp
index 94247fccecc50495716d4ac701a9ec1abe1462fc..3988dfc1e805ef4e574d7c4da652ba3336735ff5 100644
--- a/Source/core/dom/custom/CustomElementObserver.cpp
+++ b/Source/core/dom/custom/CustomElementObserver.cpp
@@ -31,12 +31,23 @@
 #include "config.h"
 #include "core/dom/custom/CustomElementObserver.h"
 
+#include "core/dom/Element.h"
+
 namespace WebCore {
 
-CustomElementObserver::ElementObserverMap& CustomElementObserver::elementObservers()
+// Maps elements to the observer watching them. At most one per
+// element at a time.
+typedef WillBeHeapHashMap<RawPtrWillBeWeakMember<Element>, RawPtrWillBeMember<CustomElementObserver> > ElementObserverMap;
+
+static ElementObserverMap& elementObservers()
 {
+#if ENABLE(OILPAN)
+    DEFINE_STATIC_LOCAL(Persistent<ElementObserverMap>, map, (new ElementObserverMap()));
+    return *map;
+#else
     DEFINE_STATIC_LOCAL(ElementObserverMap, map, ());
     return map;
+#endif

[haraken, 2014/05/27 01:08:45]

I'd prefer:

DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<ElementObserverMap>, map, (new
ElementObserverMap));
return *map;

to avoid the #if branch.

 }
 
 void CustomElementObserver::notifyElementDidFinishParsingChildren(Element* element)