diff options
| author | pam@chromium.org <pam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-11 00:19:36 +0000 |
|---|---|---|
| committer | pam@chromium.org <pam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-11 00:19:36 +0000 |
| commit | c25c7b1f445bddeae58a48ce0206fa34758791fb (patch) | |
| tree | f204f91347fa0cff2859e1c8e36f0a1de7b8267f /webkit/port | |
| parent | f11ca073c19fa4a6e6fce9791e2d098106edea02 (diff) | |
| download | chromium_src-c25c7b1f445bddeae58a48ce0206fa34758791fb.zip chromium_src-c25c7b1f445bddeae58a48ce0206fa34758791fb.tar.gz chromium_src-c25c7b1f445bddeae58a48ce0206fa34758791fb.tar.bz2 | |
Chromium side of merge 42364:42403.
Includes change to v8_proxy.cpp to account for addition of
MessagePortProxy class.
Review URL: http://codereview.chromium.org/66062
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13553 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/port')
| -rw-r--r-- | webkit/port/bindings/v8/v8_proxy.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/port/bindings/v8/v8_proxy.cpp b/webkit/port/bindings/v8/v8_proxy.cpp index 13675ff..723d32b 100644 --- a/webkit/port/bindings/v8/v8_proxy.cpp +++ b/webkit/port/bindings/v8/v8_proxy.cpp @@ -358,7 +358,7 @@ ACTIVE_DOM_OBJECT_TYPES(MAKE_CASE) if (type == V8ClassIndex::MESSAGEPORT) { // Get the port and its entangled port. MessagePort* port1 = static_cast<MessagePort*>(obj); - MessagePort* port2 = port1->entangledPort(); + MessagePortProxy* port2 = port1->entangledPort(); if (port2 != NULL) { // As ports are always entangled in pairs only perform the entanglement // once for each pair (see ASSERT in MessagePort::unentangle()). |