Oilpan: Remove ~HTMLMediaElement document access when the document is destructed.

Source/core/html/HTMLMediaElement.cpp

 /*
  * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 108 matching lines @@
 // URL protocol used to signal that the media source API is being used.
 static const char mediaSourceBlobProtocol[] = "blob";
 
 using namespace HTMLNames;
 using namespace std;
 
 typedef WillBeHeapHashSet<RawPtrWillBeWeakMember<HTMLMediaElement> > WeakMediaElementSet;
 typedef WillBeHeapHashMap<RawPtrWillBeWeakMember<Document>, WeakMediaElementSet> DocumentElementSetMap;
 static DocumentElementSetMap& documentToElementSetMap()
 {
-#if ENABLE(OILPAN)
-    DEFINE_STATIC_LOCAL(Persistent<DocumentElementSetMap>, map, (new DocumentElementSetMap()));
+    DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<DocumentElementSetMap>, map, (adoptPtrWillBeNoop(new DocumentElementSetMap())));
     return *map;
-#else
-    DEFINE_STATIC_LOCAL(DocumentElementSetMap, map, ());
-    return map;
-#endif
 }
 
 static void addElementToDocumentMap(HTMLMediaElement* element, Document* document)
 {
     DocumentElementSetMap& map = documentToElementSetMap();
     WeakMediaElementSet set = map.take(document);
     set.add(element);
     map.add(document, set);
 }
 
@@ skipping 165 matching lines @@
     m_asyncEventQueue->close();
 
 #if ENABLE(OILPAN)
     // If the HTMLMediaElement dies with the document we are not
     // allowed to touch the document to adjust delay load event counts
     // because the document could have been already
     // destructed. However, if the HTMLMediaElement dies with the
     // document there is no need to change the delayed load counts
     // because no load event will fire anyway. If the document is
     // still alive we do have to decrement the load delay counts. We
-    // determine if the document is alive by inspecting the weak
-    // documentToElementSetMap. If the document is dead it has been
-    // removed from the map during weak processing.
-    if (documentToElementSetMap().contains(&document()))
+    // determine if the document is alive via the ActiveDOMObject
+    // which is a context lifecycle observer. If the Document has been
+    // destructed ActiveDOMObject::executionContext() returns 0.
+    if (ActiveDOMObject::executionContext())
         setShouldDelayLoadEvent(false);
 #else
     setShouldDelayLoadEvent(false);
 #endif
 
 #if !ENABLE(OILPAN)
     if (m_textTracks)
         m_textTracks->clearOwner();
 #endif
 
@@ skipping 3322 matching lines @@
     visitor->trace(m_error);
     visitor->trace(m_currentSourceNode);
     visitor->trace(m_nextChildNodeToConsider);
     visitor->trace(m_textTracks);
     visitor->trace(m_textTracksWhenResourceSelectionBegan);
     WillBeHeapSupplementable<HTMLMediaElement>::trace(visitor);
     HTMLElement::trace(visitor);
 }
 
 }