Move Frame to the Oilpan heap.

Source/core/frame/DOMWindowProperty.cpp

 /*
  * Copyright (C) 2011 Google, Inc. All Rights Reserved.
  * Copyright (C) 2012 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
@@ skipping 16 matching lines @@
 #include "config.h"
 #include "core/frame/DOMWindowProperty.h"
 
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/LocalFrame.h"
 
 namespace blink {
 
 DOMWindowProperty::DOMWindowProperty(LocalFrame* frame)
     : m_frame(frame)
+#if !ENABLE(OILPAN)
     , m_associatedDOMWindow(nullptr)
+#endif
 {
     // FIXME: For now it *is* acceptable for a DOMWindowProperty to be created with a null frame.
     // See fast/dom/navigator-detached-no-crash.html for the recipe.
     // We should fix that.  <rdar://problem/11567132>
     if (m_frame) {
+#if ENABLE(OILPAN)
+        m_frame->domWindow()->registerProperty(this);
+#else
         m_associatedDOMWindow = m_frame->domWindow();
         m_associatedDOMWindow->registerProperty(this);
+#endif
     }
 }
 
 #if !ENABLE(OILPAN)
 DOMWindowProperty::~DOMWindowProperty()
 {
     if (m_associatedDOMWindow)
         m_associatedDOMWindow->unregisterProperty(this);
 }
 #endif
 
 void DOMWindowProperty::willDestroyGlobalObjectInFrame()
 {
-    // If the property is getting this callback it must have been created with a LocalFrame/LocalDOMWindow and it should still have them.
+    // If the property is getting this callback it must have been
+    // created with a LocalFrame and it should still have it.
     ASSERT(m_frame);
-    ASSERT(m_associatedDOMWindow);
+    m_frame = nullptr;
 
+#if !ENABLE(OILPAN)
     // LocalDOMWindow will along with notifying DOMWindowProperty objects of
     // impending destruction, unilaterally clear out its registered set.
     // Consequently, no explicit unregisteration required by DOMWindowProperty;
-    // here or when finalized.
+    // here or when destructed.
+    ASSERT(m_associatedDOMWindow);
     m_associatedDOMWindow = nullptr;
-    m_frame = nullptr;
+#endif
 }
 
 void DOMWindowProperty::willDetachGlobalObjectFromFrame()
 {
-    // If the property is getting this callback it must have been created with a LocalFrame/LocalDOMWindow and it should still have them.
+    // If the property is getting this callback it must have been
+    // created with a LocalFrame and it should still have it.
     ASSERT(m_frame);
+#if !ENABLE(OILPAN)
+    // Ditto for its associated LocalDOMWindow.
     ASSERT(m_associatedDOMWindow);
+#endif
 }
 
 void DOMWindowProperty::trace(Visitor* visitor)
 {
-    visitor->trace(m_associatedDOMWindow);
+    visitor->trace(m_frame);
 }
 
-}
+} // namespace blink