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

Side by Side Diff: third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerMessageEvent.h

Issue 1688573002: ServiceWorkerMessageEvent shouldn't hold ScriptValue (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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ServiceWorkerMessageEvent_h 5 #ifndef ServiceWorkerMessageEvent_h
6 #define ServiceWorkerMessageEvent_h 6 #define ServiceWorkerMessageEvent_h
7 7
8 #include "core/dom/DOMArrayBuffer.h" 8 #include "core/dom/DOMArrayBuffer.h"
9 #include "core/dom/MessagePort.h" 9 #include "core/dom/MessagePort.h"
10 #include "modules/EventModules.h" 10 #include "modules/EventModules.h"
(...skipping 15 matching lines...) Expand all
26 return adoptRefWillBeNoop(new ServiceWorkerMessageEvent(type, initialize r)); 26 return adoptRefWillBeNoop(new ServiceWorkerMessageEvent(type, initialize r));
27 } 27 }
28 28
29 static PassRefPtrWillBeRawPtr<ServiceWorkerMessageEvent> create(MessagePortA rray* ports, PassRefPtr<SerializedScriptValue> data, ServiceWorker* source, cons t String& origin) 29 static PassRefPtrWillBeRawPtr<ServiceWorkerMessageEvent> create(MessagePortA rray* ports, PassRefPtr<SerializedScriptValue> data, ServiceWorker* source, cons t String& origin)
30 { 30 {
31 return adoptRefWillBeNoop(new ServiceWorkerMessageEvent(data, origin, St ring(), source, ports)); 31 return adoptRefWillBeNoop(new ServiceWorkerMessageEvent(data, origin, St ring(), source, ports));
32 } 32 }
33 33
34 ~ServiceWorkerMessageEvent() override; 34 ~ServiceWorkerMessageEvent() override;
35 35
36 ScriptValue data() const { return m_data; }
37 SerializedScriptValue* serializedData() const { return m_serializedData.get( ); } 36 SerializedScriptValue* serializedData() const { return m_serializedData.get( ); }
37 void setSerializedData(PassRefPtr<SerializedScriptValue> serializedData) { m _serializedData = serializedData; }
38 const String& origin() const { return m_origin; } 38 const String& origin() const { return m_origin; }
39 const String& lastEventId() const { return m_lastEventId; } 39 const String& lastEventId() const { return m_lastEventId; }
40 MessagePortArray ports(bool& isNull) const; 40 MessagePortArray ports(bool& isNull) const;
41 MessagePortArray ports() const; 41 MessagePortArray ports() const;
42 void source(ServiceWorkerOrMessagePort& result) const; 42 void source(ServiceWorkerOrMessagePort& result) const;
43 43
44 const AtomicString& interfaceName() const override; 44 const AtomicString& interfaceName() const override;
45 45
46 DECLARE_VIRTUAL_TRACE(); 46 DECLARE_VIRTUAL_TRACE();
47 47
48 private: 48 private:
49 ServiceWorkerMessageEvent(); 49 ServiceWorkerMessageEvent();
50 ServiceWorkerMessageEvent(const AtomicString& type, const ServiceWorkerMessa geEventInit& initializer); 50 ServiceWorkerMessageEvent(const AtomicString& type, const ServiceWorkerMessa geEventInit& initializer);
51 ServiceWorkerMessageEvent(PassRefPtr<SerializedScriptValue> data, const Stri ng& origin, const String& lastEventId, ServiceWorker* source, MessagePortArray* ports); 51 ServiceWorkerMessageEvent(PassRefPtr<SerializedScriptValue> data, const Stri ng& origin, const String& lastEventId, ServiceWorker* source, MessagePortArray* ports);
52 52
53 ScriptValue m_data;
54 RefPtr<SerializedScriptValue> m_serializedData; 53 RefPtr<SerializedScriptValue> m_serializedData;
55 String m_origin; 54 String m_origin;
56 String m_lastEventId; 55 String m_lastEventId;
57 PersistentWillBeMember<ServiceWorker> m_sourceAsServiceWorker; 56 PersistentWillBeMember<ServiceWorker> m_sourceAsServiceWorker;
58 PersistentWillBeMember<MessagePort> m_sourceAsMessagePort; 57 PersistentWillBeMember<MessagePort> m_sourceAsMessagePort;
59 PersistentWillBeMember<MessagePortArray> m_ports; 58 PersistentWillBeMember<MessagePortArray> m_ports;
60 }; 59 };
61 60
62 } // namespace blink 61 } // namespace blink
63 62
64 #endif // ServiceWorkerMessageEvent_h 63 #endif // ServiceWorkerMessageEvent_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698