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

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

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 #include "modules/serviceworkers/ServiceWorkerMessageEvent.h" 5 #include "modules/serviceworkers/ServiceWorkerMessageEvent.h"
6 6
7 namespace blink { 7 namespace blink {
8 8
9 ServiceWorkerMessageEvent::ServiceWorkerMessageEvent() 9 ServiceWorkerMessageEvent::ServiceWorkerMessageEvent()
10 { 10 {
11 } 11 }
12 12
13 ServiceWorkerMessageEvent::ServiceWorkerMessageEvent(const AtomicString& type, c onst ServiceWorkerMessageEventInit& initializer) 13 ServiceWorkerMessageEvent::ServiceWorkerMessageEvent(const AtomicString& type, c onst ServiceWorkerMessageEventInit& initializer)
14 : Event(type, initializer) 14 : Event(type, initializer)
15 { 15 {
16 if (initializer.hasOrigin()) 16 if (initializer.hasOrigin())
17 m_origin = initializer.origin(); 17 m_origin = initializer.origin();
18 if (initializer.hasLastEventId()) 18 if (initializer.hasLastEventId())
19 m_lastEventId = initializer.lastEventId(); 19 m_lastEventId = initializer.lastEventId();
20 if (initializer.hasSource()) { 20 if (initializer.hasSource()) {
21 if (initializer.source().isServiceWorker()) 21 if (initializer.source().isServiceWorker())
22 m_sourceAsServiceWorker = initializer.source().getAsServiceWorker(); 22 m_sourceAsServiceWorker = initializer.source().getAsServiceWorker();
23 else if (initializer.source().isMessagePort()) 23 else if (initializer.source().isMessagePort())
24 m_sourceAsMessagePort = initializer.source().getAsMessagePort(); 24 m_sourceAsMessagePort = initializer.source().getAsMessagePort();
25 } 25 }
26 if (initializer.hasPorts()) 26 if (initializer.hasPorts())
27 m_ports = new MessagePortArray(initializer.ports()); 27 m_ports = new MessagePortArray(initializer.ports());
28 if (initializer.hasData())
29 m_data = initializer.data();
30 } 28 }
31 29
32 ServiceWorkerMessageEvent::ServiceWorkerMessageEvent(PassRefPtr<SerializedScript Value> data, const String& origin, const String& lastEventId, ServiceWorker* sou rce, MessagePortArray* ports) 30 ServiceWorkerMessageEvent::ServiceWorkerMessageEvent(PassRefPtr<SerializedScript Value> data, const String& origin, const String& lastEventId, ServiceWorker* sou rce, MessagePortArray* ports)
33 : Event(EventTypeNames::message, false, false) 31 : Event(EventTypeNames::message, false, false)
34 , m_serializedData(data) 32 , m_serializedData(data)
35 , m_origin(origin) 33 , m_origin(origin)
36 , m_lastEventId(lastEventId) 34 , m_lastEventId(lastEventId)
37 , m_sourceAsServiceWorker(source) 35 , m_sourceAsServiceWorker(source)
38 , m_ports(ports) 36 , m_ports(ports)
39 { 37 {
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 74
77 DEFINE_TRACE(ServiceWorkerMessageEvent) 75 DEFINE_TRACE(ServiceWorkerMessageEvent)
78 { 76 {
79 visitor->trace(m_sourceAsServiceWorker); 77 visitor->trace(m_sourceAsServiceWorker);
80 visitor->trace(m_sourceAsMessagePort); 78 visitor->trace(m_sourceAsMessagePort);
81 visitor->trace(m_ports); 79 visitor->trace(m_ports);
82 Event::trace(visitor); 80 Event::trace(visitor);
83 } 81 }
84 82
85 } // namespace blink 83 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698