Prepare V8MessagePortCustom.cpp for upstreaming to WebKit

Original review http://codereview.chromium.org/113241.

BUG=http://crbug.com/11782
TEST=Run disabled message port layout tests (*message*-disabled) under
LayoutTests/fast/events. Note that these are disabled by default


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15971 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 63 insertions, 135 deletions

diff --git a/webkit/port/bindings/v8/V8MessagePortCustom.cpp b/webkit/port/bindings/v8/V8MessagePortCustom.cpp
index 6405b678..aba1344 100644
--- a/webkit/port/bindings/v8/V8MessagePortCustom.cpp
+++ b/webkit/port/bindings/v8/V8MessagePortCustom.cpp
@@ -1,113 +1,63 @@
 /*
-* Copyright (C) 2009 Google Inc. All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are
-* met:
-*
-*     * Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above
-* copyright notice, this list of conditions and the following disclaimer
-* in the documentation and/or other materials provided with the
-* distribution.
-*     * Neither the name of Google Inc. nor the names of its
-* contributors may be used to endorse or promote products derived from
-* this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ * Copyright (C) 2009 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 
 #include "config.h"
 
-#include "v8_binding.h"
-#include "v8_custom.h"
-#include "v8_proxy.h"
-
-#include "V8Document.h"
-#include "V8HTMLDocument.h"
-#include "V8ObjectEventListener.h"
-
 #include "ExceptionCode.h"
 #include "MessagePort.h"
+#include "V8Binding.h"
+#include "V8CustomBinding.h"
+#include "V8ObjectEventListener.h"
+#include "V8Proxy.h"
+#include "V8Utilities.h"
 
 namespace WebCore {
 
-// FIXME: merge these with XHR's CreateHiddenXHRDependency
-
-// Use an array to hold dependents. It works like a ref-counted scheme.
-// A value can be added more than once to the xhr object.
-static void CreateHiddenDependency(v8::Local<v8::Object> object,
-                                   v8::Local<v8::Value> value)
-{
-    ASSERT(V8Proxy::GetDOMWrapperType(object) == V8ClassIndex::MESSAGEPORT);
-    v8::Local<v8::Value> cache = object->GetInternalField(V8Custom::kMessagePortRequestCacheIndex);
-    if (cache->IsNull() || cache->IsUndefined()) {
-        cache = v8::Array::New();
-        object->SetInternalField(V8Custom::kMessagePortRequestCacheIndex, cache);
-    }
-
-    v8::Local<v8::Array> cacheArray = v8::Local<v8::Array>::Cast(cache);
-    cacheArray->Set(v8::Integer::New(cacheArray->Length()), value);
-}
-
-static void RemoveHiddenDependency(v8::Local<v8::Object> object,
-                                   v8::Local<v8::Value> value)
-{
-    ASSERT(V8Proxy::GetDOMWrapperType(object) == V8ClassIndex::MESSAGEPORT);
-    v8::Local<v8::Value> cache = object->GetInternalField(V8Custom::kMessagePortRequestCacheIndex);
-    ASSERT(cache->IsArray());
-    v8::Local<v8::Array> cacheArray = v8::Local<v8::Array>::Cast(cache);
-    for (int i = cacheArray->Length() - 1; i >= 0; i--) {
-        v8::Local<v8::Value> cached = cacheArray->Get(v8::Integer::New(i));
-        if (cached->StrictEquals(value)) {
-            cacheArray->Delete(i);
-            return;
-        }
-    }
-
-  // We should only get here if we try to remove an event listener that was
-  // never added.
-}
-
 ACCESSOR_GETTER(MessagePortOnmessage)
 {
     INC_STATS("DOM.MessagePort.onmessage._get");
-    MessagePort* messagePort = V8Proxy::ToNativeObject<MessagePort>(
-        V8ClassIndex::MESSAGEPORT, info.Holder());
-    if (messagePort->onmessage()) {
-        V8ObjectEventListener* listener =
-            static_cast<V8ObjectEventListener*>(messagePort->onmessage());
-        v8::Local<v8::Object> v8Listener = listener->getListenerObject();
-        return v8Listener;
-    }
-    return v8::Undefined();
+    MessagePort* messagePort = V8Proxy::ToNativeObject<MessagePort>(V8ClassIndex::MESSAGEPORT, info.Holder());
+    return V8Proxy::EventListenerToV8Object(messagePort->onmessage());
 }
 
 ACCESSOR_SETTER(MessagePortOnmessage)
 {
     INC_STATS("DOM.MessagePort.onmessage._set");
-    MessagePort* messagePort = V8Proxy::ToNativeObject<MessagePort>(
-        V8ClassIndex::MESSAGEPORT, info.Holder());
+    MessagePort* messagePort = V8Proxy::ToNativeObject<MessagePort>(V8ClassIndex::MESSAGEPORT, info.Holder());
     if (value->IsNull()) {
         if (messagePort->onmessage()) {
-            V8ObjectEventListener* listener =
-                static_cast<V8ObjectEventListener*>(messagePort->onmessage());
-            v8::Local<v8::Object> v8Listener = listener->getListenerObject();
-            RemoveHiddenDependency(info.Holder(), v8Listener);
+            V8ObjectEventListener* listener = static_cast<V8ObjectEventListener*>(messagePort->onmessage());
+            removeHiddenDependency(info.Holder(), listener->getListenerObject(), V8Custom::kMessagePortRequestCacheIndex);
         }
 
-        // Clear the listener
+        // Clear the listener.
         messagePort->setOnmessage(0);
 
     } else {
@@ -115,11 +65,10 @@ ACCESSOR_SETTER(MessagePortOnmessage)
         if (!proxy)
             return;
 
-        RefPtr<EventListener> listener =
-            proxy->FindOrCreateObjectEventListener(value, false);
+        RefPtr<EventListener> listener = proxy->FindOrCreateObjectEventListener(value, false);
         if (listener) {
             messagePort->setOnmessage(listener);
-            CreateHiddenDependency(info.Holder(), value);
+            createHiddenDependency(info.Holder(), value, V8Custom::kMessagePortRequestCacheIndex);
         }
     }
 }
@@ -127,42 +76,32 @@ ACCESSOR_SETTER(MessagePortOnmessage)
 ACCESSOR_GETTER(MessagePortOnclose)
 {
     INC_STATS("DOM.MessagePort.onclose._get");
-    MessagePort* messagePort = V8Proxy::ToNativeObject<MessagePort>(
-        V8ClassIndex::MESSAGEPORT, info.Holder());
-    if (messagePort->onclose()) {
-        V8ObjectEventListener* listener =
-            static_cast<V8ObjectEventListener*>(messagePort->onclose());
-        v8::Local<v8::Object> v8Listener = listener->getListenerObject();
-        return v8Listener;
-    }
-    return v8::Undefined();
+    MessagePort* messagePort = V8Proxy::ToNativeObject<MessagePort>(V8ClassIndex::MESSAGEPORT, info.Holder());
+    return V8Proxy::EventListenerToV8Object(messagePort->onclose());
 }
 
 ACCESSOR_SETTER(MessagePortOnclose)
 {
     INC_STATS("DOM.MessagePort.onclose._set");
-    MessagePort* messagePort = V8Proxy::ToNativeObject<MessagePort>(
-        V8ClassIndex::MESSAGEPORT, info.Holder());
+    MessagePort* messagePort = V8Proxy::ToNativeObject<MessagePort>(V8ClassIndex::MESSAGEPORT, info.Holder());
     if (value->IsNull()) {
         if (messagePort->onclose()) {
-            V8ObjectEventListener* listener =
-                static_cast<V8ObjectEventListener*>(messagePort->onclose());
-            v8::Local<v8::Object> v8Listener = listener->getListenerObject();
-            RemoveHiddenDependency(info.Holder(), v8Listener);
+            V8ObjectEventListener* listener = static_cast<V8ObjectEventListener*>(messagePort->onclose());
+            removeHiddenDependency(info.Holder(), listener->getListenerObject(), V8Custom::kXMLHttpRequestCacheIndex);
         }
 
-        // Clear the listener
+
+        // Clear the listener.
         messagePort->setOnclose(0);
     } else {
         V8Proxy* proxy = V8Proxy::retrieve(messagePort->scriptExecutionContext());
         if (!proxy)
             return;
 
-        RefPtr<EventListener> listener =
-            proxy->FindOrCreateObjectEventListener(value, false);
+        RefPtr<EventListener> listener = proxy->FindOrCreateObjectEventListener(value, false);
         if (listener) {
             messagePort->setOnclose(listener);
-            CreateHiddenDependency(info.Holder(), value);
+            createHiddenDependency(info.Holder(), value, V8Custom::kMessagePortRequestCacheIndex);
         }
     }
 }
@@ -170,44 +109,35 @@ ACCESSOR_SETTER(MessagePortOnclose)
 CALLBACK_FUNC_DECL(MessagePortStartConversation)
 {
     INC_STATS("DOM.MessagePort.StartConversation()");
-    if (args.Length() < 1) {
-        V8Proxy::ThrowError(V8Proxy::SYNTAX_ERROR, "Not enough arguments");
-        return v8::Undefined();
-    }
-
-    MessagePort* messagePort = V8Proxy::ToNativeObject<MessagePort>(
-        V8ClassIndex::MESSAGEPORT, args.Holder());
+    if (args.Length() < 1)
+        return throwError("Not enough arguments", V8Proxy::SYNTAX_ERROR);
+    MessagePort* messagePort = V8Proxy::ToNativeObject<MessagePort>(V8ClassIndex::MESSAGEPORT, args.Holder());
 
     V8Proxy* proxy = V8Proxy::retrieve(messagePort->scriptExecutionContext());
     if (!proxy)
         return v8::Undefined();
 
-    RefPtr<MessagePort> port =
-        messagePort->startConversation(messagePort->scriptExecutionContext(),
-        ToWebCoreString(args[0]));
-    v8::Handle<v8::Value> wrapper =
-        V8Proxy::ToV8Object(V8ClassIndex::MESSAGEPORT, port.get());
+    RefPtr<MessagePort> port = messagePort->startConversation(messagePort->scriptExecutionContext(), toWebCoreString(args[0]));
+    v8::Handle<v8::Value> wrapper = V8Proxy::ToV8Object(V8ClassIndex::MESSAGEPORT, port.get());
     return wrapper;
 }
 
 CALLBACK_FUNC_DECL(MessagePortAddEventListener)
 {
     INC_STATS("DOM.MessagePort.AddEventListener()");
-    MessagePort* messagePort = V8Proxy::ToNativeObject<MessagePort>(
-        V8ClassIndex::MESSAGEPORT, args.Holder());
+    MessagePort* messagePort = V8Proxy::ToNativeObject<MessagePort>(V8ClassIndex::MESSAGEPORT, args.Holder());
 
     V8Proxy* proxy = V8Proxy::retrieve(messagePort->scriptExecutionContext());
     if (!proxy)
         return v8::Undefined();
 
-    RefPtr<EventListener> listener =
-        proxy->FindOrCreateObjectEventListener(args[1], false);
+    RefPtr<EventListener> listener = proxy->FindOrCreateObjectEventListener(args[1], false);
     if (listener) {
-        String type = ToWebCoreString(args[0]);
+        String type = toWebCoreString(args[0]);
         bool useCapture = args[2]->BooleanValue();
         messagePort->addEventListener(type, listener, useCapture);
 
-        CreateHiddenDependency(args.Holder(), args[1]);
+        createHiddenDependency(args.Holder(), args[1], V8Custom::kMessagePortRequestCacheIndex);
     }
     return v8::Undefined();
 }
@@ -215,22 +145,20 @@ CALLBACK_FUNC_DECL(MessagePortAddEventListener)
 CALLBACK_FUNC_DECL(MessagePortRemoveEventListener)
 {
     INC_STATS("DOM.MessagePort.RemoveEventListener()");
-    MessagePort* messagePort = V8Proxy::ToNativeObject<MessagePort>(
-        V8ClassIndex::MESSAGEPORT, args.Holder());
+    MessagePort* messagePort = V8Proxy::ToNativeObject<MessagePort>(V8ClassIndex::MESSAGEPORT, args.Holder());
 
     V8Proxy* proxy = V8Proxy::retrieve(messagePort->scriptExecutionContext());
     if (!proxy)
         return v8::Undefined();  // probably leaked
 
-    RefPtr<EventListener> listener =
-        proxy->FindObjectEventListener(args[1], false);
+    RefPtr<EventListener> listener = proxy->FindObjectEventListener(args[1], false);
 
     if (listener) {
-        String type = ToWebCoreString(args[0]);
+        String type = toWebCoreString(args[0]);
         bool useCapture = args[2]->BooleanValue();
         messagePort->removeEventListener(type, listener.get(), useCapture);
 
-        RemoveHiddenDependency(args.Holder(), args[1]);
+        removeHiddenDependency(args.Holder(), args[1], V8Custom::kMessagePortRequestCacheIndex);
     }
 
     return v8::Undefined();