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

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

Issue 1846913009: HeapSupplements are now just Supplements. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 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 16 matching lines...) Expand all
27 27
28 #include "core/frame/LocalFrame.h" 28 #include "core/frame/LocalFrame.h"
29 #include "modules/mediastream/UserMediaClient.h" 29 #include "modules/mediastream/UserMediaClient.h"
30 #include "wtf/PassOwnPtr.h" 30 #include "wtf/PassOwnPtr.h"
31 31
32 namespace blink { 32 namespace blink {
33 33
34 class MediaDevicesRequest; 34 class MediaDevicesRequest;
35 class UserMediaRequest; 35 class UserMediaRequest;
36 36
37 class UserMediaController final : public GarbageCollected<UserMediaController>, public HeapSupplement<LocalFrame> { 37 class UserMediaController final : public GarbageCollected<UserMediaController>, public Supplement<LocalFrame> {
38 USING_GARBAGE_COLLECTED_MIXIN(UserMediaController); 38 USING_GARBAGE_COLLECTED_MIXIN(UserMediaController);
39 public: 39 public:
40 static RawPtr<UserMediaController> create(UserMediaClient*); 40 static RawPtr<UserMediaController> create(UserMediaClient*);
41 41
42 DECLARE_VIRTUAL_TRACE(); 42 DECLARE_VIRTUAL_TRACE();
43 43
44 UserMediaClient* client() const { return m_client; } 44 UserMediaClient* client() const { return m_client; }
45 45
46 void requestUserMedia(UserMediaRequest*); 46 void requestUserMedia(UserMediaRequest*);
47 void cancelUserMediaRequest(UserMediaRequest*); 47 void cancelUserMediaRequest(UserMediaRequest*);
48 48
49 void requestMediaDevices(MediaDevicesRequest*); 49 void requestMediaDevices(MediaDevicesRequest*);
50 void cancelMediaDevicesRequest(MediaDevicesRequest*); 50 void cancelMediaDevicesRequest(MediaDevicesRequest*);
51 51
52 void requestSources(MediaStreamTrackSourcesRequest*); 52 void requestSources(MediaStreamTrackSourcesRequest*);
53 53
54 static const char* supplementName(); 54 static const char* supplementName();
55 static UserMediaController* from(LocalFrame* frame) { return static_cast<Use rMediaController*>(HeapSupplement<LocalFrame>::from(frame, supplementName())); } 55 static UserMediaController* from(LocalFrame* frame) { return static_cast<Use rMediaController*>(Supplement<LocalFrame>::from(frame, supplementName())); }
56 56
57 private: 57 private:
58 explicit UserMediaController(UserMediaClient*); 58 explicit UserMediaController(UserMediaClient*);
59 59
60 UserMediaClient* m_client; 60 UserMediaClient* m_client;
61 }; 61 };
62 62
63 inline void UserMediaController::requestUserMedia(UserMediaRequest* request) 63 inline void UserMediaController::requestUserMedia(UserMediaRequest* request)
64 { 64 {
65 m_client->requestUserMedia(request); 65 m_client->requestUserMedia(request);
(...skipping 15 matching lines...) Expand all
81 } 81 }
82 82
83 inline void UserMediaController::requestSources(MediaStreamTrackSourcesRequest* request) 83 inline void UserMediaController::requestSources(MediaStreamTrackSourcesRequest* request)
84 { 84 {
85 m_client->requestSources(request); 85 m_client->requestSources(request);
86 } 86 }
87 87
88 } // namespace blink 88 } // namespace blink
89 89
90 #endif // UserMediaController_h 90 #endif // UserMediaController_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698