diff --git a/src/components/script/dom/bindings/codegen/Bindings.conf b/src/components/script/dom/bindings/codegen/Bindings.conf index 9c4ad41d61bb..bef2d7c7e22e 100644 --- a/src/components/script/dom/bindings/codegen/Bindings.conf +++ b/src/components/script/dom/bindings/codegen/Bindings.conf @@ -556,6 +556,7 @@ addHTMLElement('Text') addHTMLElement('HTMLAnchorElement') addHTMLElement('HTMLAppletElement') addHTMLElement('HTMLAreaElement') +addHTMLElement('HTMLAudioElement') addHTMLElement('HTMLButtonElement') addHTMLElement('HTMLBaseElement') addHTMLElement('HTMLBodyElement') @@ -616,6 +617,7 @@ addHTMLElement('HTMLTimeElement') addHTMLElement('HTMLTitleElement') addHTMLElement('HTMLTrackElement') addHTMLElement('HTMLUListElement') +addHTMLElement('HTMLVideoElement') addHTMLElement('HTMLUnknownElement') # If you add one of these, you need to make sure nsDOMQS.h has the relevant @@ -625,7 +627,6 @@ def addExternalHTMLElement(element): addExternalIface(element, nativeType=nativeElement, headerFile=nativeElement + '.h') -addExternalHTMLElement('HTMLVideoElement') addExternalIface('CanvasGradient', headerFile='nsIDOMCanvasRenderingContext2D.h') addExternalIface('CanvasPattern', headerFile='nsIDOMCanvasRenderingContext2D.h') addExternalIface('CSSRule') diff --git a/src/components/script/dom/bindings/codegen/HTMLAudioElement.webidl b/src/components/script/dom/bindings/codegen/HTMLAudioElement.webidl new file mode 100644 index 000000000000..90084eb52ebd --- /dev/null +++ b/src/components/script/dom/bindings/codegen/HTMLAudioElement.webidl @@ -0,0 +1,37 @@ +/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. + * + * The origin of this IDL file is + * http://www.whatwg.org/specs/web-apps/current-work/#the-audio-element + * + * © Copyright 2004-2011 Apple Computer, Inc., Mozilla Foundation, and + * Opera Software ASA. You are granted a license to use, reproduce + * and create derivative works of this document. + */ + +// import from http://mxr.mozilla.org/mozilla-central/source/dom/webidl/ + +[NamedConstructor=Audio(optional DOMString src)] +interface HTMLAudioElement : HTMLMediaElement {}; + +partial interface HTMLAudioElement +{ +/* + // Setup the audio stream for writing + [Pref="media.audio_data.enabled", Throws] + void mozSetup(unsigned long channels, unsigned long rate); + + // Write audio to the audio stream + [Pref="media.audio_data.enabled", Throws] + unsigned long mozWriteAudio(Float32Array data); + [Pref="media.audio_data.enabled", Throws] + unsigned long mozWriteAudio(sequence data); + + // Get the current offset (measured in samples since the start) of the audio + // stream created using mozWriteAudio(). + [Pref="media.audio_data.enabled", Throws] + unsigned long long mozCurrentSampleOffset(); +*/ +}; diff --git a/src/components/script/dom/bindings/codegen/HTMLVideoElement.webidl b/src/components/script/dom/bindings/codegen/HTMLVideoElement.webidl new file mode 100644 index 000000000000..4663a6addbce --- /dev/null +++ b/src/components/script/dom/bindings/codegen/HTMLVideoElement.webidl @@ -0,0 +1,56 @@ +/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. + * + * The origin of this IDL file is + * http://www.whatwg.org/specs/web-apps/current-work/#the-video-element + * + * © Copyright 2004-2011 Apple Computer, Inc., Mozilla Foundation, and + * Opera Software ASA. You are granted a license to use, reproduce + * and create derivative works of this document. + */ + +// import from http://mxr.mozilla.org/mozilla-central/source/dom/webidl/ + +interface HTMLVideoElement : HTMLMediaElement { + [SetterThrows] + attribute unsigned long width; + [SetterThrows] + attribute unsigned long height; + readonly attribute unsigned long videoWidth; + readonly attribute unsigned long videoHeight; + [SetterThrows] + attribute DOMString poster; +}; +/* +partial interface HTMLVideoElement { + // A count of the number of video frames that have demuxed from the media + // resource. If we were playing perfectly, we'd be able to paint this many + // frames. + readonly attribute unsigned long mozParsedFrames; + + // A count of the number of frames that have been decoded. We may drop + // frames if the decode is taking too much time. + readonly attribute unsigned long mozDecodedFrames; + + // A count of the number of frames that have been presented to the rendering + // pipeline. We may drop frames if they arrive late at the renderer. + readonly attribute unsigned long mozPresentedFrames; + + // Number of presented frames which were painted on screen. + readonly attribute unsigned long mozPaintedFrames; + + // Time which the last painted video frame was late by, in seconds. + readonly attribute double mozFrameDelay; + + // True if the video has an audio track available. + readonly attribute boolean mozHasAudio; +}; + +// https://dvcs.w3.org/hg/html-media/raw-file/default/media-source/media-source.html#idl-def-HTMLVideoElement +partial interface HTMLVideoElement { + [Pref="media.mediasource.enabled", Creator] + VideoPlaybackQuality getVideoPlaybackQuality(); +}; +*/ diff --git a/src/components/script/dom/bindings/element.rs b/src/components/script/dom/bindings/element.rs index af5e81740036..9c925a22d9ad 100644 --- a/src/components/script/dom/bindings/element.rs +++ b/src/components/script/dom/bindings/element.rs @@ -48,6 +48,8 @@ generate_cacheable_wrapper!(HTMLAppletElement, HTMLAppletElementBinding::Wrap) generate_binding_object!(HTMLAppletElement) generate_cacheable_wrapper!(HTMLAreaElement, HTMLAreaElementBinding::Wrap) generate_binding_object!(HTMLAreaElement) +generate_cacheable_wrapper!(HTMLAudioElement, HTMLAudioElementBinding::Wrap) +generate_binding_object!(HTMLAudioElement) generate_cacheable_wrapper!(HTMLBaseElement, HTMLBaseElementBinding::Wrap) generate_binding_object!(HTMLBaseElement) generate_cacheable_wrapper!(HTMLBodyElement, HTMLBodyElementBinding::Wrap) @@ -164,5 +166,7 @@ generate_cacheable_wrapper!(HTMLTrackElement, HTMLTrackElementBinding::Wrap) generate_binding_object!(HTMLTrackElement) generate_cacheable_wrapper!(HTMLUListElement, HTMLUListElementBinding::Wrap) generate_binding_object!(HTMLUListElement) +generate_cacheable_wrapper!(HTMLVideoElement, HTMLVideoElementBinding::Wrap) +generate_binding_object!(HTMLVideoElement) generate_cacheable_wrapper!(HTMLUnknownElement, HTMLUnknownElementBinding::Wrap) generate_binding_object!(HTMLUnknownElement) diff --git a/src/components/script/dom/bindings/node.rs b/src/components/script/dom/bindings/node.rs index 5e45268d2b4f..059cbe0061c4 100644 --- a/src/components/script/dom/bindings/node.rs +++ b/src/components/script/dom/bindings/node.rs @@ -26,6 +26,7 @@ pub fn create(cx: *JSContext, node: &mut AbstractNode) -> *JSObject ElementNodeTypeId(HTMLAnchorElementTypeId) => generate_element!(HTMLAnchorElement), ElementNodeTypeId(HTMLAppletElementTypeId) => generate_element!(HTMLAppletElement), ElementNodeTypeId(HTMLAreaElementTypeId) => generate_element!(HTMLAreaElement), + ElementNodeTypeId(HTMLAudioElementTypeId) => generate_element!(HTMLAudioElement), ElementNodeTypeId(HTMLBaseElementTypeId) => generate_element!(HTMLBaseElement), ElementNodeTypeId(HTMLBodyElementTypeId) => generate_element!(HTMLBodyElement), ElementNodeTypeId(HTMLBRElementTypeId) => generate_element!(HTMLBRElement), @@ -85,6 +86,7 @@ pub fn create(cx: *JSContext, node: &mut AbstractNode) -> *JSObject ElementNodeTypeId(HTMLTitleElementTypeId) => generate_element!(HTMLTitleElement), ElementNodeTypeId(HTMLTrackElementTypeId) => generate_element!(HTMLTrackElement), ElementNodeTypeId(HTMLUListElementTypeId) => generate_element!(HTMLUListElement), + ElementNodeTypeId(HTMLVideoElementTypeId) => generate_element!(HTMLVideoElement), ElementNodeTypeId(HTMLUnknownElementTypeId) => generate_element!(HTMLUnknownElement), CommentNodeTypeId => generate_element!(Comment), DoctypeNodeTypeId => generate_element!(DocumentType), diff --git a/src/components/script/dom/element.rs b/src/components/script/dom/element.rs index 59844882af52..ace84169b336 100644 --- a/src/components/script/dom/element.rs +++ b/src/components/script/dom/element.rs @@ -50,6 +50,7 @@ pub enum ElementTypeId { HTMLAnchorElementTypeId, HTMLAppletElementTypeId, HTMLAreaElementTypeId, + HTMLAudioElementTypeId, HTMLBaseElementTypeId, HTMLBRElementTypeId, HTMLBodyElementTypeId, @@ -109,6 +110,7 @@ pub enum ElementTypeId { HTMLTitleElementTypeId, HTMLTrackElementTypeId, HTMLUListElementTypeId, + HTMLVideoElementTypeId, HTMLUnknownElementTypeId, } diff --git a/src/components/script/dom/htmlaudioelement.rs b/src/components/script/dom/htmlaudioelement.rs new file mode 100644 index 000000000000..f7586e2460e8 --- /dev/null +++ b/src/components/script/dom/htmlaudioelement.rs @@ -0,0 +1,12 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +use dom::htmlmediaelement::HTMLMediaElement; + +pub struct HTMLAudioElement { + parent: HTMLMediaElement +} + +impl HTMLAudioElement { +} diff --git a/src/components/script/dom/htmlvideoelement.rs b/src/components/script/dom/htmlvideoelement.rs new file mode 100644 index 000000000000..19a6a546fed1 --- /dev/null +++ b/src/components/script/dom/htmlvideoelement.rs @@ -0,0 +1,41 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +use dom::bindings::utils::{DOMString, null_string, ErrorResult}; +use dom::htmlmediaelement::HTMLMediaElement; + +pub struct HTMLVideoElement { + parent: HTMLMediaElement +} + +impl HTMLVideoElement { + pub fn Width(&self) -> u32 { + 0 + } + + pub fn SetWidth(&mut self, _width: u32, _rv: &ErrorResult) { + } + + pub fn Height(&self) -> u32 { + 0 + } + + pub fn SetHeight(&mut self, _height: u32, _rv: &ErrorResult) { + } + + pub fn VideoWidth(&self) -> u32 { + 0 + } + + pub fn VideoHeight(&self) -> u32 { + 0 + } + + pub fn Poster(&self) -> DOMString { + null_string + } + + pub fn SetPoster(&mut self, _poster: &DOMString, _rv: &ErrorResult) { + } +} diff --git a/src/components/script/html/hubbub_html_parser.rs b/src/components/script/html/hubbub_html_parser.rs index bfc205aa6890..70948f3923ff 100644 --- a/src/components/script/html/hubbub_html_parser.rs +++ b/src/components/script/html/hubbub_html_parser.rs @@ -58,6 +58,19 @@ macro_rules! handle_htmlelement( } ) ) +macro_rules! handle_htmlmediaelement( + ($cx: expr, $tag:expr, $string:expr, $type_id:expr, $ctor:ident) => ( + if eq_slice($tag, $string) { + let _element = @$ctor { + parent: HTMLMediaElement::new($type_id, ($tag).to_str()) + }; + unsafe { + return Node::as_abstract_node(cx, _element); + } + } + ) +) + type JSResult = ~[~[u8]]; @@ -262,6 +275,9 @@ fn build_element_from_tag(cx: *JSContext, tag: &str) -> AbstractNode handle_htmlelement!(cx, tag, "section", HTMLElementTypeId, HTMLElement); handle_htmlelement!(cx, tag, "small", HTMLElementTypeId, HTMLElement); + handle_htmlmediaelement!(cx, tag, "audio", HTMLAudioElementTypeId, HTMLAudioElement); + handle_htmlmediaelement!(cx, tag, "video", HTMLVideoElementTypeId, HTMLVideoElement); + unsafe { let element = @HTMLUnknownElement { parent: HTMLElement::new(HTMLUnknownElementTypeId, tag.to_str()) diff --git a/src/components/script/script.rc b/src/components/script/script.rc index a08a354390cf..d891555e6171 100644 --- a/src/components/script/script.rc +++ b/src/components/script/script.rc @@ -58,6 +58,7 @@ pub mod dom { pub mod htmlanchorelement; pub mod htmlappletelement; pub mod htmlareaelement; + pub mod htmlaudioelement; pub mod htmlbaseelement; pub mod htmlbodyelement; pub mod htmlbrelement; @@ -120,6 +121,7 @@ pub mod dom { pub mod htmltitleelement; pub mod htmltrackelement; pub mod htmlulistelement; + pub mod htmlvideoelement; pub mod htmlunknownelement; pub mod mouseevent; pub mod node;