Changeset 185077 in webkit
- Timestamp:
- Jun 1, 2015 3:26:20 PM (9 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r185071 r185077 1 2015-06-01 Matt Rajca <mrajca@apple.com> 2 3 Implemented the `eventTargetInterface` and `scriptExecutionContext` methods required by EventTarget, as well as 4 some required infrastructure. 5 https://bugs.webkit.org/show_bug.cgi?id=145523 6 7 Reviewed by Eric Carlson. 8 9 * Modules/mediasession/MediaRemoteControls.cpp: 10 (WebCore::MediaRemoteControls::MediaRemoteControls): Initialize all instance variables. 11 * Modules/mediasession/MediaRemoteControls.h: MediaRemoteControl's constructor now takes a script execution 12 context, which we provide to EventTarget. The required eventTargetInterface method has also been implemented. 13 (WebCore::MediaRemoteControls::create): 14 * Modules/mediasession/MediaRemoteControls.idl: Indicate MediaRemoteControls now takes a constructor that is 15 passed in a script execution context. To prevent build errors, event handlers have been removed until they are 16 implemented. 17 * WebCore.xcodeproj/project.pbxproj: We should be building the derived JSMediaRemoteControls class with WebCore. 18 * dom/EventTargetFactory.in: Ensure a MediaRemoteControlsEventTargetInterfaceType is generated. 19 1 20 2015-06-01 Benjamin Poulain <bpoulain@apple.com> 2 21 -
trunk/Source/WebCore/Modules/mediasession/MediaRemoteControls.cpp
r185069 r185077 31 31 namespace WebCore { 32 32 33 MediaRemoteControls::MediaRemoteControls(ScriptExecutionContext& context) 34 : m_scriptExecutionContext(context) 35 { 36 } 37 33 38 MediaRemoteControls::~MediaRemoteControls() 34 39 { -
trunk/Source/WebCore/Modules/mediasession/MediaRemoteControls.h
r185069 r185077 36 36 class MediaRemoteControls : public RefCounted<MediaRemoteControls>, public EventTargetWithInlineData { 37 37 public: 38 static Ref<MediaRemoteControls> create(ScriptExecutionContext& context) 39 { 40 return adoptRef(*new MediaRemoteControls(context)); 41 } 42 38 43 bool previousTrackEnabled() const { return m_previousTrackEnabled; } 39 44 void setPreviousTrackEnabled(bool enabled) { m_previousTrackEnabled = enabled; } … … 53 58 virtual ~MediaRemoteControls(); 54 59 55 protected: 56 MediaRemoteControls() = default; 60 MediaRemoteControls(ScriptExecutionContext&); 61 62 virtual EventTargetInterface eventTargetInterface() const override { return MediaRemoteControlsEventTargetInterfaceType; } 63 virtual ScriptExecutionContext* scriptExecutionContext() const override { return &m_scriptExecutionContext; } 57 64 58 65 private: 59 bool m_previousTrackEnabled; 60 bool m_nextTrackEnabled; 61 bool m_seekForwardEnabled; 62 bool m_seekBackwardEnabled; 66 ScriptExecutionContext& m_scriptExecutionContext; 67 68 bool m_previousTrackEnabled { false }; 69 bool m_nextTrackEnabled { false }; 70 bool m_seekForwardEnabled { false }; 71 bool m_seekBackwardEnabled { false }; 63 72 64 73 virtual void refEventTarget() override final { ref(); } -
trunk/Source/WebCore/Modules/mediasession/MediaRemoteControls.idl
r185069 r185077 26 26 [ 27 27 Conditional=MEDIA_SESSION, 28 Constructor, 29 ConstructorCallWith=ScriptExecutionContext, 28 30 EventTarget, 29 31 ] interface MediaRemoteControls : EventTarget { … … 32 34 attribute boolean seekForwardEnabled; 33 35 attribute boolean seekBackwardEnabled; 34 35 attribute EventHandler onprevioustrack;36 attribute EventHandler onnexttrack;37 attribute EventHandler onseekforward;38 attribute EventHandler onseekbackward;39 36 }; -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r185069 r185077 5685 5685 C6F420A216B7164E0052A9F2 /* JSMutationCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C6F420A016B7164E0052A9F2 /* JSMutationCallback.cpp */; }; 5686 5686 C6F420A316B7164E0052A9F2 /* JSMutationCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = C6F420A116B7164E0052A9F2 /* JSMutationCallback.h */; }; 5687 C9026B651B1CF5FE001D99A7 /* JSMediaRemoteControls.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C9026B631B1CF5AB001D99A7 /* JSMediaRemoteControls.cpp */; }; 5687 5688 C90843CF1B18E47D00B68564 /* MediaRemoteControls.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C90843CD1B18E47D00B68564 /* MediaRemoteControls.cpp */; }; 5688 5689 C90843D01B18E47D00B68564 /* MediaRemoteControls.h in Headers */ = {isa = PBXBuildFile; fileRef = C90843CE1B18E47D00B68564 /* MediaRemoteControls.h */; }; … … 13238 13239 C6F420A016B7164E0052A9F2 /* JSMutationCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMutationCallback.cpp; sourceTree = "<group>"; }; 13239 13240 C6F420A116B7164E0052A9F2 /* JSMutationCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMutationCallback.h; sourceTree = "<group>"; }; 13241 C9026B631B1CF5AB001D99A7 /* JSMediaRemoteControls.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JSMediaRemoteControls.cpp; path = "JSMediaRemoteControls.cpp"; sourceTree = "<group>"; }; 13242 C9026B641B1CF5AB001D99A7 /* JSMediaRemoteControls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JSMediaRemoteControls.h; path = "JSMediaRemoteControls.h"; sourceTree = "<group>"; }; 13240 13243 C90843CD1B18E47D00B68564 /* MediaRemoteControls.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaRemoteControls.cpp; sourceTree = "<group>"; }; 13241 13244 C90843CE1B18E47D00B68564 /* MediaRemoteControls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaRemoteControls.h; sourceTree = "<group>"; }; … … 19202 19205 CDB859F8160D493E00E5B07F /* JSMediaKeyEvent.cpp */, 19203 19206 CDB859F9160D493E00E5B07F /* JSMediaKeyEvent.h */, 19207 C9026B631B1CF5AB001D99A7 /* JSMediaRemoteControls.cpp */, 19208 C9026B641B1CF5AB001D99A7 /* JSMediaRemoteControls.h */, 19204 19209 7E46F6F81627A2C900062223 /* JSOESElementIndexUint.cpp */, 19205 19210 7E46F6F91627A2C900062223 /* JSOESElementIndexUint.h */, … … 28897 28902 D3A94A46122DC40F00A37BBC /* JSMediaQueryList.cpp in Sources */, 28898 28903 7C5343FC17B74B63004232F0 /* JSMediaQueryListListener.cpp in Sources */, 28904 C9026B651B1CF5FE001D99A7 /* JSMediaRemoteControls.cpp in Sources */, 28899 28905 CD9DE17417AAC74C00EA386D /* JSMediaSource.cpp in Sources */, 28900 28906 07C59B7117F79C7C000FBCBB /* JSMediaSourceStates.cpp in Sources */, -
trunk/Source/WebCore/dom/EventTargetFactory.in
r179810 r185077 17 17 MediaKeySession conditional=ENCRYPTED_MEDIA_V2 18 18 MediaController conditional=VIDEO 19 MediaRemoteControls conditional=MEDIA_SESSION 19 20 MediaSource conditional=MEDIA_SOURCE 20 21 MediaStream conditional=MEDIA_STREAM
Note: See TracChangeset
for help on using the changeset viewer.