summaryrefslogtreecommitdiffstats
path: root/webkit/port
diff options
context:
space:
mode:
authorasargent@chromium.org <asargent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-14 00:44:42 +0000
committerasargent@chromium.org <asargent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-14 00:44:42 +0000
commit4760e5c7b54e1cd873a485ee1563144b36693a1b (patch)
treea23391c9d1393094c55eb6ed55518e8a82f32cf2 /webkit/port
parent657fe6a6a9ee8e2b3885762619368693b2f290ac (diff)
downloadchromium_src-4760e5c7b54e1cd873a485ee1563144b36693a1b.zip
chromium_src-4760e5c7b54e1cd873a485ee1563144b36693a1b.tar.gz
chromium_src-4760e5c7b54e1cd873a485ee1563144b36693a1b.tar.bz2
Revert changes causing memory_test problems.
This undoes changes from: http://codereview.chromium.org/66045 Review URL: http://codereview.chromium.org/67114 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13639 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/port')
-rw-r--r--webkit/port/bindings/v8/v8_proxy.cpp13
1 files changed, 2 insertions, 11 deletions
diff --git a/webkit/port/bindings/v8/v8_proxy.cpp b/webkit/port/bindings/v8/v8_proxy.cpp
index 945b1c3..723d32b 100644
--- a/webkit/port/bindings/v8/v8_proxy.cpp
+++ b/webkit/port/bindings/v8/v8_proxy.cpp
@@ -924,16 +924,12 @@ static void RemoveEventListenerFromList(V8EventListenerList& list,
void V8Proxy::RemoveV8EventListener(V8EventListener* listener)
{
- ASSERT(!m_context.IsEmpty());
- v8::Context::Scope contextScope(m_context);
RemoveEventListenerFromList(m_event_listeners, listener);
}
void V8Proxy::RemoveObjectEventListener(V8ObjectEventListener* listener)
{
- ASSERT(!m_context.IsEmpty());
- v8::Context::Scope contextScope(m_context);
RemoveEventListenerFromList(m_xhr_listeners, listener);
}
@@ -951,13 +947,8 @@ static void DisconnectEventListenersInList(V8EventListenerList& list)
void V8Proxy::DisconnectEventListeners()
{
- if (m_event_listeners.begin() != m_event_listeners.end() ||
- m_xhr_listeners.begin() != m_xhr_listeners.end()) {
- ASSERT(!m_context.IsEmpty());
- v8::Context::Scope contextScope(m_context);
- DisconnectEventListenersInList(m_event_listeners);
- DisconnectEventListenersInList(m_xhr_listeners);
- }
+ DisconnectEventListenersInList(m_event_listeners);
+ DisconnectEventListenersInList(m_xhr_listeners);
}