diff options
author | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-19 01:14:19 +0000 |
---|---|---|
committer | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-19 01:14:19 +0000 |
commit | e1928c97a69d0cb03792e3b6e4c8a14121889f83 (patch) | |
tree | 478e9e3bda1642f7580f1866f2bb775386690448 /webkit | |
parent | 74ee77f94e79a277f6bf259e82910ffe8ea3862f (diff) | |
download | chromium_src-e1928c97a69d0cb03792e3b6e4c8a14121889f83.zip chromium_src-e1928c97a69d0cb03792e3b6e4c8a14121889f83.tar.gz chromium_src-e1928c97a69d0cb03792e3b6e4c8a14121889f83.tar.bz2 |
Remove local copy of V8MessagePortCustom.cpp now that it has been upstreamed.
BUG=11782
TEST=none needed, just removing obsolete file
Review URL: http://codereview.chromium.org/113566
Review URL: http://codereview.chromium.org/113569
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16354 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r-- | webkit/port/bindings/v8/V8MessagePortCustom.cpp | 167 | ||||
-rw-r--r-- | webkit/webkit.gyp | 3 |
2 files changed, 2 insertions, 168 deletions
diff --git a/webkit/port/bindings/v8/V8MessagePortCustom.cpp b/webkit/port/bindings/v8/V8MessagePortCustom.cpp index aba1344..e69de29 100644 --- a/webkit/port/bindings/v8/V8MessagePortCustom.cpp +++ b/webkit/port/bindings/v8/V8MessagePortCustom.cpp @@ -1,167 +0,0 @@ -/* - * 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 "ExceptionCode.h" -#include "MessagePort.h" -#include "V8Binding.h" -#include "V8CustomBinding.h" -#include "V8ObjectEventListener.h" -#include "V8Proxy.h" -#include "V8Utilities.h" - -namespace WebCore { - -ACCESSOR_GETTER(MessagePortOnmessage) -{ - INC_STATS("DOM.MessagePort.onmessage._get"); - 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()); - if (value->IsNull()) { - if (messagePort->onmessage()) { - V8ObjectEventListener* listener = static_cast<V8ObjectEventListener*>(messagePort->onmessage()); - removeHiddenDependency(info.Holder(), listener->getListenerObject(), V8Custom::kMessagePortRequestCacheIndex); - } - - // Clear the listener. - messagePort->setOnmessage(0); - - } else { - V8Proxy* proxy = V8Proxy::retrieve(messagePort->scriptExecutionContext()); - if (!proxy) - return; - - RefPtr<EventListener> listener = proxy->FindOrCreateObjectEventListener(value, false); - if (listener) { - messagePort->setOnmessage(listener); - createHiddenDependency(info.Holder(), value, V8Custom::kMessagePortRequestCacheIndex); - } - } -} - -ACCESSOR_GETTER(MessagePortOnclose) -{ - INC_STATS("DOM.MessagePort.onclose._get"); - 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()); - if (value->IsNull()) { - if (messagePort->onclose()) { - V8ObjectEventListener* listener = static_cast<V8ObjectEventListener*>(messagePort->onclose()); - removeHiddenDependency(info.Holder(), listener->getListenerObject(), V8Custom::kXMLHttpRequestCacheIndex); - } - - - // Clear the listener. - messagePort->setOnclose(0); - } else { - V8Proxy* proxy = V8Proxy::retrieve(messagePort->scriptExecutionContext()); - if (!proxy) - return; - - RefPtr<EventListener> listener = proxy->FindOrCreateObjectEventListener(value, false); - if (listener) { - messagePort->setOnclose(listener); - createHiddenDependency(info.Holder(), value, V8Custom::kMessagePortRequestCacheIndex); - } - } -} - -CALLBACK_FUNC_DECL(MessagePortStartConversation) -{ - INC_STATS("DOM.MessagePort.StartConversation()"); - 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()); - return wrapper; -} - -CALLBACK_FUNC_DECL(MessagePortAddEventListener) -{ - INC_STATS("DOM.MessagePort.AddEventListener()"); - 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); - if (listener) { - String type = toWebCoreString(args[0]); - bool useCapture = args[2]->BooleanValue(); - messagePort->addEventListener(type, listener, useCapture); - - createHiddenDependency(args.Holder(), args[1], V8Custom::kMessagePortRequestCacheIndex); - } - return v8::Undefined(); -} - -CALLBACK_FUNC_DECL(MessagePortRemoveEventListener) -{ - INC_STATS("DOM.MessagePort.RemoveEventListener()"); - 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); - - if (listener) { - String type = toWebCoreString(args[0]); - bool useCapture = args[2]->BooleanValue(); - messagePort->removeEventListener(type, listener.get(), useCapture); - - removeHiddenDependency(args.Holder(), args[1], V8Custom::kMessagePortRequestCacheIndex); - } - - return v8::Undefined(); -} - -} // namespace WebCore diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index 470c13d..3ad46a6 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -1033,6 +1033,8 @@ '../third_party/WebKit/WebCore/bindings/v8/custom/V8InspectorControllerCustom.cpp', '../third_party/WebKit/WebCore/bindings/v8/custom/V8LocationCustom.cpp', '../third_party/WebKit/WebCore/bindings/v8/custom/V8MessageChannelConstructor.cpp', + '../third_party/WebKit/WebCore/bindings/v8/custom/V8MessagePortCustom.cpp', + '../third_party/WebKit/WebCore/bindings/v8/custom/V8NamedNodeMapCustom.cpp', '../third_party/WebKit/WebCore/bindings/v8/custom/V8NamedNodesCollection.cpp', '../third_party/WebKit/WebCore/bindings/v8/custom/V8NamedNodesCollection.h', @@ -1127,7 +1129,6 @@ 'port/bindings/v8/RGBColor.h', 'port/bindings/v8/ScriptController.cpp', 'port/bindings/v8/ScriptController.h', - 'port/bindings/v8/V8MessagePortCustom.cpp', 'port/bindings/v8/V8SVGPODTypeWrapper.h', 'port/bindings/v8/NPV8Object.cpp', 'port/bindings/v8/NPV8Object.h', |