| Index: third_party/WebKit/Source/bindings/modules/v8/custom/V8ServiceWorkerMessageEventCustom.cpp
|
| diff --git a/third_party/WebKit/Source/bindings/modules/v8/custom/V8ServiceWorkerMessageEventCustom.cpp b/third_party/WebKit/Source/bindings/modules/v8/custom/V8ServiceWorkerMessageEventCustom.cpp
|
| index 5746d7ef35db2f0f3f8bd7ccc6d81b3b9b1afa84..ddc53b5765f03f42358ff26cad4df65cd77e0046 100644
|
| --- a/third_party/WebKit/Source/bindings/modules/v8/custom/V8ServiceWorkerMessageEventCustom.cpp
|
| +++ b/third_party/WebKit/Source/bindings/modules/v8/custom/V8ServiceWorkerMessageEventCustom.cpp
|
| @@ -14,7 +14,8 @@ void V8ServiceWorkerMessageEvent::dataAttributeGetterCustom(const v8::FunctionCa
|
| {
|
| ServiceWorkerMessageEvent* event = V8ServiceWorkerMessageEvent::toImpl(info.Holder());
|
| v8::Isolate* isolate = info.GetIsolate();
|
| - v8::Local<v8::Value> result = V8HiddenValue::getHiddenValue(isolate, info.Holder(), V8HiddenValue::data(isolate));
|
| + ScriptState* scriptState = ScriptState::current(isolate);
|
| + v8::Local<v8::Value> result = V8HiddenValue::getHiddenValue(scriptState, info.Holder(), V8HiddenValue::data(isolate));
|
|
|
| if (!result.IsEmpty()) {
|
| v8SetReturnValue(info, result);
|
| @@ -26,11 +27,11 @@ void V8ServiceWorkerMessageEvent::dataAttributeGetterCustom(const v8::FunctionCa
|
| MessagePortArray ports = event->ports();
|
| data = serializedValue->deserialize(isolate, &ports);
|
| } else {
|
| - data = event->data().v8ValueFor(ScriptState::current(isolate));
|
| + data = event->data().v8ValueFor(scriptState);
|
| }
|
| if (data.IsEmpty())
|
| data = v8::Null(isolate);
|
| - V8HiddenValue::setHiddenValue(isolate, info.Holder(), V8HiddenValue::data(isolate), data);
|
| + V8HiddenValue::setHiddenValue(scriptState, info.Holder(), V8HiddenValue::data(isolate), data);
|
| v8SetReturnValue(info, data);
|
| }
|
|
|
|
|