| Index: third_party/WebKit/Source/bindings/modules/v8/V8ServiceWorkerMessageEventInternal.h
|
| diff --git a/third_party/WebKit/Source/bindings/modules/v8/V8ServiceWorkerMessageEventInternal.h b/third_party/WebKit/Source/bindings/modules/v8/V8ServiceWorkerMessageEventInternal.h
|
| index ff32ddc7272a369c5bbd8a35c5ef1e7d30575ab4..0c090d54312eb6f5b095060ebe68ea22869744d4 100644
|
| --- a/third_party/WebKit/Source/bindings/modules/v8/V8ServiceWorkerMessageEventInternal.h
|
| +++ b/third_party/WebKit/Source/bindings/modules/v8/V8ServiceWorkerMessageEventInternal.h
|
| @@ -58,7 +58,11 @@ void V8ServiceWorkerMessageEventInternal::constructorCustom(
|
|
|
| // TODO(bashi): Workaround for http://crbug.com/529941. We need to store
|
| // |data| as a private value to avoid cyclic references.
|
| + /* DO NOT SUBMIT - merge conflict marker.
|
| + * Please spell |hasData| (not |HasData|) below. */
|
| if (eventInitDict.hasData()) {
|
| + /* DO NOT SUBMIT - merge conflict marker.
|
| + * Please spell |data| (not |Data|) below. */
|
| v8::Local<v8::Value> v8Data = eventInitDict.data().v8Value();
|
| V8PrivateProperty::getMessageEventCachedData(isolate).set(wrapper, v8Data);
|
| if (DOMWrapperWorld::current(isolate).isIsolatedWorld()) {
|
| @@ -85,6 +89,8 @@ void V8ServiceWorkerMessageEventInternal::dataAttributeGetterCustom(
|
|
|
| v8::Local<v8::Value> data;
|
| if (SerializedScriptValue* serializedValue = event->serializedData()) {
|
| + /* DO NOT SUBMIT - merge conflict marker.
|
| + * Please spell |ports| (not |Ports|) below. */
|
| MessagePortArray ports = event->ports();
|
| SerializedScriptValue::DeserializeOptions options;
|
| options.messagePorts = &ports;
|
|
|