Revert 196930 "Window.postMessage() to self can cause document l..."

trunk/Source/core/frame/LocalDOMWindow.cpp

Index: trunk/Source/core/frame/LocalDOMWindow.cpp
===================================================================
--- trunk/Source/core/frame/LocalDOMWindow.cpp	(revision 197008)
+++ trunk/Source/core/frame/LocalDOMWindow.cpp	(working copy)
@@ -126,12 +126,6 @@
     SecurityOrigin* targetOrigin() const { return m_targetOrigin.get(); }
     ScriptCallStack* stackTrace() const { return m_stackTrace.get(); }
     UserGestureToken* userGestureToken() const { return m_userGestureToken.get(); }
-    virtual void stop() override
-    {
-        SuspendableTimer::stop();
-        // Will destroy this object
-        m_window->removePostMessageTimer(this);
-    }
 
     DEFINE_INLINE_VIRTUAL_TRACE()
     {
@@ -146,8 +140,7 @@
     {
         InspectorInstrumentationCookie cookie = InspectorInstrumentation::traceAsyncOperationCompletedCallbackStarting(executionContext(), m_asyncOperationId);
         m_window->postMessageTimerFired(this);
-        // Will destroy this object
-        m_window->removePostMessageTimer(this);
+        // This object is deleted now.
         InspectorInstrumentation::traceAsyncCallbackCompleted(cookie);
     }
 
@@ -667,6 +660,7 @@
 void LocalDOMWindow::postMessageTimerFired(PostMessageTimer* timer)
 {
     if (!isCurrentlyDisplayedInFrame()) {
+        m_postMessageTimers.remove(timer);
         return;
     }
 
@@ -676,10 +670,6 @@
 
     event->entangleMessagePorts(document());
     dispatchMessageEventWithOriginCheck(timer->targetOrigin(), event, timer->stackTrace());
-}
-
-void LocalDOMWindow::removePostMessageTimer(PostMessageTimer* timer)
-{
     m_postMessageTimers.remove(timer);
 }