Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1027)

Unified Diff: third_party/WebKit/Source/modules/serviceworkers/ExtendableMessageEvent.h

Issue 1696653002: Fix non-Oilpan build following r375129. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | third_party/WebKit/Source/modules/serviceworkers/ExtendableMessageEvent.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/modules/serviceworkers/ExtendableMessageEvent.h
diff --git a/third_party/WebKit/Source/modules/serviceworkers/ExtendableMessageEvent.h b/third_party/WebKit/Source/modules/serviceworkers/ExtendableMessageEvent.h
index 647f809858c22b33ab6e061ee11b127cc8fea1b6..48d02812154ab5c2607419fbc3a42040e19e001d 100644
--- a/third_party/WebKit/Source/modules/serviceworkers/ExtendableMessageEvent.h
+++ b/third_party/WebKit/Source/modules/serviceworkers/ExtendableMessageEvent.h
@@ -19,7 +19,7 @@ public:
static PassRefPtrWillBeRawPtr<ExtendableMessageEvent> create();
static PassRefPtrWillBeRawPtr<ExtendableMessageEvent> create(const AtomicString& type, const ExtendableMessageEventInit& initializer);
static PassRefPtrWillBeRawPtr<ExtendableMessageEvent> create(const AtomicString& type, const ExtendableMessageEventInit& initializer, WaitUntilObserver*);
- static PassRefPtrWillBeRawPtr<ExtendableMessageEvent> create(PassRefPtr<SerializedScriptValue> data, const String& origin, PassOwnPtrWillBeRawPtr<MessagePortArray> ports, WaitUntilObserver*);
+ static PassRefPtrWillBeRawPtr<ExtendableMessageEvent> create(PassRefPtr<SerializedScriptValue> data, const String& origin, MessagePortArray* ports, WaitUntilObserver*);
SerializedScriptValue* serializedData() const { return m_serializedData.get(); }
void setSerializedData(PassRefPtr<SerializedScriptValue> serializedData) { m_serializedData = serializedData; }
@@ -37,15 +37,15 @@ private:
ExtendableMessageEvent();
ExtendableMessageEvent(const AtomicString& type, const ExtendableMessageEventInit& initializer);
ExtendableMessageEvent(const AtomicString& type, const ExtendableMessageEventInit& initializer, WaitUntilObserver*);
- ExtendableMessageEvent(PassRefPtr<SerializedScriptValue> data, const String& origin, PassOwnPtrWillBeRawPtr<MessagePortArray> ports, WaitUntilObserver*);
+ ExtendableMessageEvent(PassRefPtr<SerializedScriptValue> data, const String& origin, MessagePortArray* ports, WaitUntilObserver*);
RefPtr<SerializedScriptValue> m_serializedData;
String m_origin;
String m_lastEventId;
- Member<ServiceWorkerClient> m_sourceAsClient;
- Member<ServiceWorker> m_sourceAsServiceWorker;
- Member<MessagePort> m_sourceAsMessagePort;
- OwnPtrWillBeMember<MessagePortArray> m_ports;
+ PersistentWillBeMember<ServiceWorkerClient> m_sourceAsClient;
+ PersistentWillBeMember<ServiceWorker> m_sourceAsServiceWorker;
+ PersistentWillBeMember<MessagePort> m_sourceAsMessagePort;
+ PersistentWillBeMember<MessagePortArray> m_ports;
};
} // namespace blink
« no previous file with comments | « no previous file | third_party/WebKit/Source/modules/serviceworkers/ExtendableMessageEvent.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698