Expose MediaElement and VideoElement to the Objective-C DOM bindings

https://bugs.webkit.org/show_bug.cgi?id=154830 Reviewed by Sam Weinig. Source/WebCore: * Modules/mediasession/HTMLMediaElementMediaSession.idl: * Modules/mediastream/HTMLMediaElementMediaStream.idl: * html/HTMLMediaElement.idl: * html/HTMLVideoElement.idl: Avoid Objective-C bindings for various extraneous bits, like MediaSource and MediaSession, to avoid exposing way more than we need to. * WebCore.xcodeproj/project.pbxproj: Add a bunch of Derived Sources. Source/WebKit/mac: * MigrateHeaders.make: Canonical link: https://commits.webkit.org/172960@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@197404 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · Mar 1, 2016 · 93a05cfeb9aef67da509a21160dc03b4c0a39c8d · 93a05cf
1 parent 43b2ab9
commit 93a05cfeb9aef67da509a21160dc03b4c0a39c8d
Show file tree

Hide file tree

Showing 8 changed files with 104 additions and 6 deletions.
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2016-03-01  Tim Horton  <timothy_horton@apple.com>
+
+        Expose MediaElement and VideoElement to the Objective-C DOM bindings
+        https://bugs.webkit.org/show_bug.cgi?id=154830
+
+        Reviewed by Sam Weinig.
+
+        * Modules/mediasession/HTMLMediaElementMediaSession.idl:
+        * Modules/mediastream/HTMLMediaElementMediaStream.idl:
+        * html/HTMLMediaElement.idl:
+        * html/HTMLVideoElement.idl:
+        Avoid Objective-C bindings for various extraneous bits, like MediaSource and MediaSession,
+        to avoid exposing way more than we need to.
+
+        * WebCore.xcodeproj/project.pbxproj:
+        Add a bunch of Derived Sources.
+
 2016-03-01  Antti Koivisto  <antti@apple.com>
 
         Text control shadow element style shouldn't depend on renderers

diff --git a/Source/WebCore/Modules/mediasession/HTMLMediaElementMediaSession.idl b/Source/WebCore/Modules/mediasession/HTMLMediaElementMediaSession.idl
@@ -26,9 +26,11 @@
 [
     Conditional=VIDEO&MEDIA_SESSION,
 ] partial interface HTMLMediaElement {
+#if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C
     attribute DOMString kind;
+#endif
 
-#if !defined(LANGUAGE_GOBJECT) || !LANGUAGE_GOBJECT
+#if (!defined(LANGUAGE_GOBJECT) || !LANGUAGE_GOBJECT) && (!defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C)
     attribute MediaSession? session;
 #endif
 };
diff --git a/Source/WebCore/Modules/mediastream/HTMLMediaElementMediaStream.idl b/Source/WebCore/Modules/mediastream/HTMLMediaElementMediaStream.idl
@@ -27,7 +27,7 @@
     Conditional=VIDEO&MEDIA_STREAM,
 ] partial interface HTMLMediaElement
 {
-#if !defined(LANGUAGE_GOBJECT) || !LANGUAGE_GOBJECT
+#if (!defined(LANGUAGE_GOBJECT) || !LANGUAGE_GOBJECT) && (!defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C)
     attribute MediaStream? srcObject;
 #endif
 };
diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
diff --git a/Source/WebCore/html/HTMLMediaElement.idl b/Source/WebCore/html/HTMLMediaElement.idl
@@ -90,11 +90,14 @@
     readonly attribute boolean webkitHasClosedCaptions;
     attribute boolean webkitClosedCaptionsVisible;
 
+#if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C
     // The number of bytes consumed by the media decoder.
     [Conditional=MEDIA_STATISTICS] readonly attribute unsigned long webkitAudioDecodedByteCount;
     [Conditional=MEDIA_STATISTICS] readonly attribute unsigned long webkitVideoDecodedByteCount;
+#endif
 
-#if !defined(LANGUAGE_GOBJECT) || !LANGUAGE_GOBJECT // Work around shortcomings in the gobject binding generator handling of conditional features by turning these off for gobject.
+    // Work around shortcomings in the gobject binding generator handling of conditional features by turning these off for gobject.
+#if (!defined(LANGUAGE_GOBJECT) || !LANGUAGE_GOBJECT) && (!defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C)
     [Conditional=ENCRYPTED_MEDIA, RaisesException] void webkitGenerateKeyRequest(DOMString? keySystem, optional Uint8Array initData);
     [Conditional=ENCRYPTED_MEDIA, RaisesException] void webkitAddKey(DOMString? keySystem, Uint8Array key, optional Uint8Array initData, [Default=NullString] optional DOMString sessionId);
     [Conditional=ENCRYPTED_MEDIA, RaisesException] void webkitCancelKeyRequest(DOMString? keySystem, [Default=NullString] optional DOMString sessionId);
@@ -111,12 +114,16 @@
     // FIXME: This should not use [TreatNullAs=LegacyNullString].
     [Reflect, TreatNullAs=LegacyNullString] attribute DOMString mediaGroup;
 
+#if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C
     [CustomSetter] attribute MediaController controller;
+#endif
 
-#if !defined(LANGUAGE_GOBJECT) || !LANGUAGE_GOBJECT
+#if (!defined(LANGUAGE_GOBJECT) || !LANGUAGE_GOBJECT) && (!defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C)
     [Conditional=MEDIA_SOURCE] VideoPlaybackQuality getVideoPlaybackQuality();
 #endif
 
+#if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C
     [Conditional=WIRELESS_PLAYBACK_TARGET] void webkitShowPlaybackTargetPicker();
     [Conditional=WIRELESS_PLAYBACK_TARGET] readonly attribute boolean webkitCurrentPlaybackTargetIsWireless;
+#endif
 };
diff --git a/Source/WebCore/html/HTMLVideoElement.idl b/Source/WebCore/html/HTMLVideoElement.idl
@@ -46,15 +46,18 @@ enum VideoPresentationMode { "fullscreen", "picture-in-picture", "inline" };
     [RaisesException] void webkitEnterFullScreen();
     void webkitExitFullScreen();
 
+#if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C
     [Conditional=WIRELESS_PLAYBACK_TARGET] attribute boolean webkitWirelessVideoPlaybackDisabled;
 
     // The number of frames that have been decoded and made available for playback.
     [Conditional=MEDIA_STATISTICS] readonly attribute unsigned long webkitDecodedFrameCount;
 
     // The number of decoded frames that have been dropped by the player for performance reasons during playback.
     [Conditional=MEDIA_STATISTICS] readonly attribute unsigned long webkitDroppedFrameCount;
+#endif
 
-#if !defined(LANGUAGE_GOBJECT) || !LANGUAGE_GOBJECT // Work around shortcomings in the gobject binding generator handling of conditional features by turning these off for gobject.
+    // Work around shortcomings in the gobject binding generator handling of conditional features by turning these off for gobject.
+#if (!defined(LANGUAGE_GOBJECT) || !LANGUAGE_GOBJECT) && (!defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C)
     [Conditional=VIDEO_PRESENTATION_MODE] boolean webkitSupportsPresentationMode(VideoPresentationMode mode);
     [Conditional=VIDEO_PRESENTATION_MODE] readonly attribute VideoPresentationMode webkitPresentationMode;
     [Conditional=VIDEO_PRESENTATION_MODE] void webkitSetPresentationMode(VideoPresentationMode mode);

diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog
@@ -1,3 +1,12 @@
+2016-03-01  Tim Horton  <timothy_horton@apple.com>
+
+        Expose MediaElement and VideoElement to the Objective-C DOM bindings
+        https://bugs.webkit.org/show_bug.cgi?id=154830
+
+        Reviewed by Sam Weinig.
+
+        * MigrateHeaders.make:
+
 2016-02-29  Simon Fraser  <simon.fraser@apple.com>
 
         Remove the experimental feature of antialiased font dilation

diff --git a/Source/WebKit/mac/MigrateHeaders.make b/Source/WebKit/mac/MigrateHeaders.make
@@ -118,6 +118,7 @@ all : \
     $(PRIVATE_HEADERS_DIR)/DOMHTMLLinkElement.h \
     $(PRIVATE_HEADERS_DIR)/DOMHTMLMapElement.h \
     $(PRIVATE_HEADERS_DIR)/DOMHTMLMarqueeElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLMediaElement.h \
     $(PRIVATE_HEADERS_DIR)/DOMHTMLMenuElement.h \
     $(PRIVATE_HEADERS_DIR)/DOMHTMLMetaElement.h \
     $(PRIVATE_HEADERS_DIR)/DOMHTMLModElement.h \
@@ -144,8 +145,10 @@ all : \
     $(INTERNAL_HEADERS_DIR)/DOMHTMLTextAreaElementInternal.h \
     $(PRIVATE_HEADERS_DIR)/DOMHTMLTitleElement.h \
     $(PRIVATE_HEADERS_DIR)/DOMHTMLUListElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLVideoElement.h \
     $(PRIVATE_HEADERS_DIR)/DOMImplementation.h \
     $(PRIVATE_HEADERS_DIR)/DOMKeyboardEvent.h \
+    $(PRIVATE_HEADERS_DIR)/DOMMediaError.h \
     $(PRIVATE_HEADERS_DIR)/DOMMediaList.h \
     $(PRIVATE_HEADERS_DIR)/DOMMouseEvent.h \
     $(PRIVATE_HEADERS_DIR)/DOMMutationEvent.h \
@@ -171,6 +174,7 @@ all : \
     $(PRIVATE_HEADERS_DIR)/DOMStyleSheetList.h \
     $(PRIVATE_HEADERS_DIR)/DOMStylesheets.h \
     $(PRIVATE_HEADERS_DIR)/DOMText.h \
+    $(PRIVATE_HEADERS_DIR)/DOMTimeRanges.h \
     $(PRIVATE_HEADERS_DIR)/DOMTraversal.h \
     $(PRIVATE_HEADERS_DIR)/DOMTreeWalker.h \
     $(PRIVATE_HEADERS_DIR)/DOMUIEvent.h \