Simplify DOMWindowProperty and its unregistration.

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)
-    , m_associatedDOMWindow(nullptr)
 {
     // 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) {
-        m_associatedDOMWindow = m_frame->domWindow();
-        m_associatedDOMWindow->registerProperty(this);
-    }
+    if (m_frame)
+        m_frame->domWindow()->registerProperty(this);
 }
 
-#if !ENABLE(OILPAN)
-DOMWindowProperty::~DOMWindowProperty()
-{
-    if (m_associatedDOMWindow)
-        m_associatedDOMWindow->unregisterProperty(this);
-
-    m_associatedDOMWindow = nullptr;
-    m_frame = nullptr;
-}
-#endif
+DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(DOMWindowProperty);
 
 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.
     ASSERT(m_frame);
-    ASSERT(m_associatedDOMWindow);
 
-    // DOMWindowProperty lifetime isn't tied directly to the LocalDOMWindow itself so it is important that it unregister
-    // itself from any LocalDOMWindow it is associated with if that LocalDOMWindow is going away.
-    if (m_associatedDOMWindow)
-        m_associatedDOMWindow->unregisterProperty(this);
-    m_associatedDOMWindow = nullptr;
+    // DOMWindowProperty's registered lifetime is controlled by LocalDOMWindow. After
+    // the willDestroyGlobalObjectInFrame() notifications, LocalDOMWindow clears out
+    // all registrations. Hence no need to unregister.
     m_frame = nullptr;
 }
 
 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.
     ASSERT(m_frame);
-    ASSERT(m_associatedDOMWindow);
 }
 
-void DOMWindowProperty::trace(Visitor* visitor)
-{
-    visitor->trace(m_associatedDOMWindow);
-}
-
-}
+} // namespace blink