Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1101)

Unified Diff: Source/core/frame/LocalDOMWindow.cpp

Issue 1148133005: Window.postMessage() to self can cause document leaks (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase to master Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/frame/LocalDOMWindow.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/LocalDOMWindow.cpp
diff --git a/Source/core/frame/LocalDOMWindow.cpp b/Source/core/frame/LocalDOMWindow.cpp
index 6c7844051e3574eab89b829e16aee22e4641bbf2..fffbde3f68d59d622622d270ffda3fc649a69b17 100644
--- a/Source/core/frame/LocalDOMWindow.cpp
+++ b/Source/core/frame/LocalDOMWindow.cpp
@@ -126,6 +126,12 @@ public:
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()
{
@@ -140,7 +146,8 @@ private:
{
InspectorInstrumentationCookie cookie = InspectorInstrumentation::traceAsyncOperationCompletedCallbackStarting(executionContext(), m_asyncOperationId);
m_window->postMessageTimerFired(this);
- // This object is deleted now.
+ // Will destroy this object
+ m_window->removePostMessageTimer(this);
InspectorInstrumentation::traceAsyncCallbackCompleted(cookie);
}
@@ -660,7 +667,6 @@ void LocalDOMWindow::schedulePostMessage(PassRefPtrWillBeRawPtr<MessageEvent> ev
void LocalDOMWindow::postMessageTimerFired(PostMessageTimer* timer)
{
if (!isCurrentlyDisplayedInFrame()) {
- m_postMessageTimers.remove(timer);
return;
}
@@ -670,6 +676,10 @@ void LocalDOMWindow::postMessageTimerFired(PostMessageTimer* timer)
event->entangleMessagePorts(document());
dispatchMessageEventWithOriginCheck(timer->targetOrigin(), event, timer->stackTrace());
+}
+
+void LocalDOMWindow::removePostMessageTimer(PostMessageTimer* timer)
+{
m_postMessageTimers.remove(timer);
}
« no previous file with comments | « Source/core/frame/LocalDOMWindow.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698