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

Side by Side Diff: third_party/WebKit/Source/modules/mediastream/MediaDevicesRequest.h

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 /* 1 /*
2 * Copyright (C) 2014 Google Inc. All rights reserved. 2 * Copyright (C) 2014 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 13 matching lines...) Expand all
24 */ 24 */
25 25
26 #ifndef MediaDevicesRequest_h 26 #ifndef MediaDevicesRequest_h
27 #define MediaDevicesRequest_h 27 #define MediaDevicesRequest_h
28 28
29 #include "bindings/core/v8/ScriptPromise.h" 29 #include "bindings/core/v8/ScriptPromise.h"
30 #include "core/dom/ActiveDOMObject.h" 30 #include "core/dom/ActiveDOMObject.h"
31 #include "modules/ModulesExport.h" 31 #include "modules/ModulesExport.h"
32 #include "modules/mediastream/MediaDeviceInfo.h" 32 #include "modules/mediastream/MediaDeviceInfo.h"
33 #include "platform/heap/Handle.h" 33 #include "platform/heap/Handle.h"
34 #include "wtf/PassOwnPtr.h"
34 35
35 namespace blink { 36 namespace blink {
36 37
37 class Document; 38 class Document;
38 class ExceptionState; 39 class ExceptionState;
39 class UserMediaController; 40 class UserMediaController;
40 class ScriptState; 41 class ScriptState;
41 class ScriptPromiseResolver; 42 class ScriptPromiseResolver;
42 43
43 class MODULES_EXPORT MediaDevicesRequest final : public GarbageCollectedFinalize d<MediaDevicesRequest>, public ActiveDOMObject { 44 class MODULES_EXPORT MediaDevicesRequest final : public GarbageCollectedFinalize d<MediaDevicesRequest>, public ActiveDOMObject {
(...skipping 16 matching lines...) Expand all
60 private: 61 private:
61 MediaDevicesRequest(ScriptState*, UserMediaController*); 62 MediaDevicesRequest(ScriptState*, UserMediaController*);
62 63
63 Member<UserMediaController> m_controller; 64 Member<UserMediaController> m_controller;
64 Member<ScriptPromiseResolver> m_resolver; 65 Member<ScriptPromiseResolver> m_resolver;
65 }; 66 };
66 67
67 } // namespace blink 68 } // namespace blink
68 69
69 #endif // MediaDevicesRequest_h 70 #endif // MediaDevicesRequest_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698