From dd50e0777dc325f9179eb8732b7d1c4852467948 Mon Sep 17 00:00:00 2001 From: "dglazkov@google.com" Date: Wed, 3 Jun 2009 22:05:18 +0000 Subject: Always disconnect event listeners when clearing for navigation, even if the script context is empty. R=mbelshe BUG=13266 TEST=gmail shouldn't crash anymore. Review URL: http://codereview.chromium.org/119109 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17546 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/port/bindings/v8/v8_proxy.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'webkit') diff --git a/webkit/port/bindings/v8/v8_proxy.cpp b/webkit/port/bindings/v8/v8_proxy.cpp index dcc2092..85b963f 100644 --- a/webkit/port/bindings/v8/v8_proxy.cpp +++ b/webkit/port/bindings/v8/v8_proxy.cpp @@ -1827,6 +1827,9 @@ void V8Proxy::clearForClose() void V8Proxy::clearForNavigation() { + // disconnect all event listeners + DisconnectEventListeners(); + if (!m_context.IsEmpty()) { v8::HandleScope handle; ClearDocumentWrapper(); @@ -1839,9 +1842,6 @@ void V8Proxy::clearForNavigation() ASSERT(!wrapper.IsEmpty()); wrapper->TurnOnAccessCheck(); - // disconnect all event listeners - DisconnectEventListeners(); - // Separate the context from its global object. m_context->DetachGlobal(); -- cgit v1.1