diff options
author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-06 21:21:29 +0000 |
---|---|---|
committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-06 21:21:29 +0000 |
commit | bc7d32ae2f283be26dd9b5b81d9fa53b39ec5aad (patch) | |
tree | fb964f9ca3fa0b6f3ef34361d12b071ef0ffcebd /webkit | |
parent | 71ed35fc7ef44f4279a2a65db0e638cc2cc440b9 (diff) | |
download | chromium_src-bc7d32ae2f283be26dd9b5b81d9fa53b39ec5aad.zip chromium_src-bc7d32ae2f283be26dd9b5b81d9fa53b39ec5aad.tar.gz chromium_src-bc7d32ae2f283be26dd9b5b81d9fa53b39ec5aad.tar.bz2 |
Chrome-side of WebKit merge 43242:43321
The v8_proxy.h change was authored by asargent and already reviewed here:
http://codereview.chromium.org/79059
R=dglazkov
Review URL: http://codereview.chromium.org/113056
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15460 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r-- | webkit/port/bindings/v8/v8_proxy.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/webkit/port/bindings/v8/v8_proxy.h b/webkit/port/bindings/v8/v8_proxy.h index d254e0f..01b3116 100644 --- a/webkit/port/bindings/v8/v8_proxy.h +++ b/webkit/port/bindings/v8/v8_proxy.h @@ -172,8 +172,7 @@ class V8Proxy { }; explicit V8Proxy(Frame* frame) - : m_frame(frame), m_event_listeners("m_event_listeners"), - m_xhr_listeners("m_xhr_listeners"), m_inlineCode(false), + : m_frame(frame), m_inlineCode(false), m_timerCallback(false), m_recursion(0) { } ~V8Proxy(); |