summaryrefslogtreecommitdiffstats
path: root/chromium/third_party/WebKit/Source/bindings/v8/custom/V8MessageChannelCustom.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/WebKit/Source/bindings/v8/custom/V8MessageChannelCustom.cpp')
-rw-r--r--chromium/third_party/WebKit/Source/bindings/v8/custom/V8MessageChannelCustom.cpp15
1 files changed, 7 insertions, 8 deletions
diff --git a/chromium/third_party/WebKit/Source/bindings/v8/custom/V8MessageChannelCustom.cpp b/chromium/third_party/WebKit/Source/bindings/v8/custom/V8MessageChannelCustom.cpp
index 67ec60fbd92..d39c588710d 100644
--- a/chromium/third_party/WebKit/Source/bindings/v8/custom/V8MessageChannelCustom.cpp
+++ b/chromium/third_party/WebKit/Source/bindings/v8/custom/V8MessageChannelCustom.cpp
@@ -29,12 +29,11 @@
*/
#include "config.h"
-#include "V8MessageChannel.h"
+#include "bindings/core/v8/V8MessageChannel.h"
-#include "V8MessagePort.h"
+#include "bindings/core/v8/V8MessagePort.h"
#include "bindings/v8/V8Binding.h"
-#include "bindings/v8/V8HiddenPropertyName.h"
-#include "bindings/v8/V8Utilities.h"
+#include "bindings/v8/V8HiddenValue.h"
#include "core/dom/MessageChannel.h"
#include "core/workers/WorkerGlobalScope.h"
#include "wtf/RefPtr.h"
@@ -43,17 +42,17 @@ namespace WebCore {
void V8MessageChannel::constructorCustom(const v8::FunctionCallbackInfo<v8::Value>& info)
{
- ExecutionContext* context = getExecutionContext();
+ ExecutionContext* context = currentExecutionContext(info.GetIsolate());
- RefPtr<MessageChannel> obj = MessageChannel::create(context);
+ RefPtrWillBeRawPtr<MessageChannel> obj = MessageChannel::create(context);
v8::Local<v8::Object> wrapper = info.Holder();
// Create references from the MessageChannel wrapper to the two
// MessagePort wrappers to make sure that the MessagePort wrappers
// stay alive as long as the MessageChannel wrapper is around.
- V8HiddenPropertyName::setNamedHiddenReference(wrapper, "port1", toV8(obj->port1(), info.Holder(), info.GetIsolate()));
- V8HiddenPropertyName::setNamedHiddenReference(wrapper, "port2", toV8(obj->port2(), info.Holder(), info.GetIsolate()));
+ V8HiddenValue::setHiddenValue(info.GetIsolate(), wrapper, V8HiddenValue::port1(info.GetIsolate()), toV8(obj->port1(), info.Holder(), info.GetIsolate()));
+ V8HiddenValue::setHiddenValue(info.GetIsolate(), wrapper, V8HiddenValue::port2(info.GetIsolate()), toV8(obj->port2(), info.Holder(), info.GetIsolate()));
V8DOMWrapper::associateObjectWithWrapper<V8MessageChannel>(obj.release(), &wrapperTypeInfo, wrapper, info.GetIsolate(), WrapperConfiguration::Dependent);
info.GetReturnValue().Set(wrapper);