diff options
| -rw-r--r-- | DEPS | 4 | ||||
| -rw-r--r-- | WEBKIT_MERGE_REVISION | 2 | ||||
| -rw-r--r-- | webkit/port/bindings/v8/v8_proxy.h | 3 |
3 files changed, 4 insertions, 5 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "43242", + "webkit_revision": "43321", } @@ -19,7 +19,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@243", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@15383", + "/trunk/deps/third_party/WebKit@15459", "src/third_party/icu38": "/trunk/deps/third_party/icu38@13472", diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION index 3df3e8e..4c18c91 100644 --- a/WEBKIT_MERGE_REVISION +++ b/WEBKIT_MERGE_REVISION @@ -1 +1 @@ -http://svn.webkit.org/repository/webkit/trunk@43242
\ No newline at end of file +http://svn.webkit.org/repository/webkit/trunk@43321
\ No newline at end of file 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(); |