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

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

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. Created 4 years, 6 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 ServiceWorkerClient_h 5 #ifndef ServiceWorkerClient_h
6 #define ServiceWorkerClient_h 6 #define ServiceWorkerClient_h
7 7
8 #include "bindings/core/v8/ScriptPromise.h" 8 #include "bindings/core/v8/ScriptPromise.h"
9 #include "bindings/core/v8/ScriptWrappable.h" 9 #include "bindings/core/v8/ScriptWrappable.h"
10 #include "bindings/core/v8/SerializedScriptValue.h" 10 #include "bindings/core/v8/SerializedScriptValue.h"
11 #include "modules/ModulesExport.h" 11 #include "modules/ModulesExport.h"
12 #include "platform/heap/Handle.h" 12 #include "platform/heap/Handle.h"
13 #include "public/platform/modules/serviceworker/WebServiceWorkerClientsInfo.h" 13 #include "public/platform/modules/serviceworker/WebServiceWorkerClientsInfo.h"
14 #include "wtf/Forward.h" 14 #include "wtf/Forward.h"
15 #include <memory>
15 16
16 namespace blink { 17 namespace blink {
17 18
18 class ExecutionContext; 19 class ExecutionContext;
19 class ScriptPromiseResolver; 20 class ScriptPromiseResolver;
20 class ScriptState; 21 class ScriptState;
21 22
22 class MODULES_EXPORT ServiceWorkerClient : public GarbageCollectedFinalized<Serv iceWorkerClient>, public ScriptWrappable { 23 class MODULES_EXPORT ServiceWorkerClient : public GarbageCollectedFinalized<Serv iceWorkerClient>, public ScriptWrappable {
23 DEFINE_WRAPPERTYPEINFO(); 24 DEFINE_WRAPPERTYPEINFO();
24 public: 25 public:
25 // To be used by CallbackPromiseAdapter. 26 // To be used by CallbackPromiseAdapter.
26 using WebType = OwnPtr<WebServiceWorkerClientInfo>; 27 using WebType = std::unique_ptr<WebServiceWorkerClientInfo>;
27 28
28 static ServiceWorkerClient* take(ScriptPromiseResolver*, PassOwnPtr<WebServi ceWorkerClientInfo>); 29 static ServiceWorkerClient* take(ScriptPromiseResolver*, std::unique_ptr<Web ServiceWorkerClientInfo>);
29 static ServiceWorkerClient* create(const WebServiceWorkerClientInfo&); 30 static ServiceWorkerClient* create(const WebServiceWorkerClientInfo&);
30 31
31 virtual ~ServiceWorkerClient(); 32 virtual ~ServiceWorkerClient();
32 33
33 // Client.idl 34 // Client.idl
34 String url() const { return m_url; } 35 String url() const { return m_url; }
35 String frameType() const; 36 String frameType() const;
36 String id() const { return m_uuid; } 37 String id() const { return m_uuid; }
37 void postMessage(ExecutionContext*, PassRefPtr<SerializedScriptValue> messag e, const MessagePortArray&, ExceptionState&); 38 void postMessage(ExecutionContext*, PassRefPtr<SerializedScriptValue> messag e, const MessagePortArray&, ExceptionState&);
38 39
39 DEFINE_INLINE_VIRTUAL_TRACE() { } 40 DEFINE_INLINE_VIRTUAL_TRACE() { }
40 41
41 protected: 42 protected:
42 explicit ServiceWorkerClient(const WebServiceWorkerClientInfo&); 43 explicit ServiceWorkerClient(const WebServiceWorkerClientInfo&);
43 44
44 String uuid() const { return m_uuid; } 45 String uuid() const { return m_uuid; }
45 46
46 private: 47 private:
47 String m_uuid; 48 String m_uuid;
48 String m_url; 49 String m_url;
49 WebURLRequest::FrameType m_frameType; 50 WebURLRequest::FrameType m_frameType;
50 }; 51 };
51 52
52 } // namespace blink 53 } // namespace blink
53 54
54 #endif // ServiceWorkerClient_h 55 #endif // ServiceWorkerClient_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698