Changeset 100159 in webkit

Timestamp:

Nov 14, 2011 9:55:16 AM (12 years ago)

Author:

jer.noble@apple.com

Message:

Implement MediaController.
​https://bugs.webkit.org/show_bug.cgi?id=71408

Reviewed by Eric Carlson.

Source/JavaScriptCore:

Change the definition of WTF_USE_COREAUDIO to exclude Windows completely, as
CoreAudioClock.h is not available there.

• wtf/Platform.h:

Source/WebCore:

Tests: media/media-controller-playback.html

media/media-controller.html

Adds support for the MediaController DOM object, and the mediagroup and mediacontroller
HTMLMediaElement attributes.

MediaController is an DOM object which synchronizes playback of multiple HTMLMediaElements. It can
either be created by a page script and assigned to a HTMLMediaElement using the controller property,
or all HTMLMediaElements with identical mediagroup attributes will have a MediaController assigned
automatically.

Add an abstract interface implemented by both MediaController and HTMLMediaElement.

• html/MediaControllerInterface.h: Added.

(WebCore::MediaControllerInterface::~MediaControllerInterface):

Add the MediaController object and IDL.

• html/MediaController.cpp: Added.

(mediaGroupToMediaControllerMap):
(MediaController::mediaControllerForMediaGroup):
(MediaController::create):
(MediaController::MediaController):
(MediaController::~MediaController):
(MediaController::addMediaElement):
(MediaController::removeMediaElement):
(MediaController::containsMediaElement):
(MediaController::buffered):
(MediaController::seekable):
(MediaController::played):
(MediaController::duration):
(MediaController::currentTime):
(MediaController::setCurrentTime):
(MediaController::play):
(MediaController::pause):
(MediaController::setDefaultPlaybackRate):
(MediaController::setPlaybackRate):
(MediaController::setVolume):
(MediaController::setMuted):
(MediaController::reportControllerState):
(MediaController::updateReadyState):
(MediaController::updatePlaybackState):
(MediaController::updateMediaElements):
(MediaController::scheduleEvent):
(MediaController::asyncEventTimerFired):
(MediaController::scriptExecutionContext):
(MediaController::hasAudio):
(MediaController::hasVideo):
(MediaController::hasClosedCaptions):
(MediaController::setClosedCaptionsVisible):
(MediaController::supportsScanning):
(MediaController::beginScrubbing):
(MediaController::endScrubbing):
(MediaController::canPlay):
(MediaController::isLiveStream):
(MediaController::hasSource):
(MediaController::returnToRealtime):
(MediaController::isBlocked):
(MediaController::hasEnded):

• html/MediaController.h: Added.

(WebCore::MediaController::mediaGroup):
(WebCore::MediaController::paused):
(WebCore::MediaController::defaultPlaybackRate):
(WebCore::MediaController::playbackRate):
(WebCore::MediaController::volume):
(WebCore::MediaController::muted):
(WebCore::MediaController::readyState):
(WebCore::MediaController::playbackState):
(WebCore::MediaController::supportsFullscreen):
(WebCore::MediaController::isFullscreen):
(WebCore::MediaController::enterFullscreen):
(WebCore::MediaController::closedCaptionsVisible):
(WebCore::MediaController::refEventTarget):
(WebCore::MediaController::derefEventTarget):
(WebCore::MediaController::toMediaController):
(WebCore::MediaController::eventTargetData):
(WebCore::MediaController::ensureEventTargetData):

• html/MediaController.idl: Added.

Add convenience functions to TimeRanges which can calculate intersections and
unions between TimeRanges objects.

• html/TimeRanges.cpp:

(TimeRanges::copy):
(TimeRanges::invert):
(TimeRanges::intersectWith):
(TimeRanges::unionWith):

• html/TimeRanges.h:

Add MediaControllerConstructor to the Window object.

• page/DOMWindow.idl:

Add the two new attribute names, mediagroup and controller.

• html/HTMLAttributeNames.in:

Add support for the new attributes, and add overridden behavior when a media element
has a current media controller:

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::~HTMLMediaElement):
(WebCore::HTMLMediaElement::parseMappedAttribute):
(WebCore::HTMLMediaElement::prepareForLoad):
(WebCore::HTMLMediaElement::setReadyState):
(WebCore::HTMLMediaElement::setCurrentTime):
(WebCore::HTMLMediaElement::setPlaybackRate):
(WebCore::HTMLMediaElement::playInternal):
(WebCore::HTMLMediaElement::togglePlayState):
(WebCore::HTMLMediaElement::mediaPlayerTimeChanged):
(WebCore::HTMLMediaElement::seekable):
(WebCore::HTMLMediaElement::potentiallyPlaying):
(WebCore::HTMLMediaElement::endedPlayback):
(WebCore::HTMLMediaElement::updateVolume):
(WebCore::HTMLMediaElement::updatePlayState):
(WebCore::HTMLMediaElement::userCancelledLoad):
(WebCore::HTMLMediaElement::mediaGroup):
(WebCore::HTMLMediaElement::setMediaGroup):
(WebCore::HTMLMediaElement::controller):
(WebCore::HTMLMediaElement::setController):
(WebCore::HTMLMediaElement::updateMediaController):
(WebCore::HTMLMediaElement::isBlockedOnMediaController):

• html/HTMLMediaElement.h:

(WebCore::HTMLMediaElement::hasSource):
(WebCore::HTMLMediaElement::isLiveStream):

• html/HTMLMediaElement.idl:
• bindings/js/JSHTMLMediaElementCustom.cpp: Added.

(WebCore::JSHTMLMediaElement::setMediaController):

Add convenience functions to store a mapping of media-elements-per-document to allow
a quick lookup of media elements with the same media group within a given document:

• html/HTMLMediaElement.cpp:

(WebCore::documentToElementSetMap):
(WebCore::addElementToDocumentMap):
(WebCore::removeElementFromDocumentMap):

Add a function "seekable" which returns a TimeRanges containing the seekable time ranges
in a media element. By default this is a single range of [0, maxTimeSeekable].

• platform/graphics/MediaPlayer.cpp:

(WebCore::MediaPlayer::seekable):

• platform/graphics/MediaPlayer.h:
• platform/graphics/MediaPlayerPrivate.h:

(WebCore::MediaPlayerPrivateInterface::seekable):

Support functions to cast between MediaController and EventTarget.

• bindings/js/JSEventTarget.cpp:

(WebCore::toJS):

• dom/EventTarget.cpp:

(WebCore::EventTarget::toMediaController):

• dom/EventTarget.h:

Fixed an infinite-recursion bug due to a collision between WTF::currentTime and
ClockGeneric::currentTime:

• platform/ClockGeneric.cpp:

(ClockGeneric::ClockGeneric):
(ClockGeneric::setCurrentTime):
(ClockGeneric::currentTime):
(ClockGeneric::setPlayRate):
(ClockGeneric::start):
(ClockGeneric::stop):
(ClockGeneric::now):

• platform/ClockGeneric.h:

Boilerplate to support creating the derived sources for MediaController and adding new sources
to the project:

• CMakeLists.txt:
• DerivedSources.cpp:
• DerivedSources.make:
• GNUmakefile.list.am:
• WebCore.gypi:
• WebCore.xcodeproj/project.pbxproj:

LayoutTests:

• media/media-controller-expected.txt: Added.
• media/media-controller-playback-expected.txt: Added.
• media/media-controller-playback.html: Added.
• media/media-controller.html: Added.
• platform/mac/fast/dom/Window/window-properties-expected.txt:
• platform/mac/fast/js/global-constructors-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/media-controller-expected.txt (added)
• LayoutTests/media/media-controller-playback-expected.txt (added)
• LayoutTests/media/media-controller-playback.html (added)
• LayoutTests/media/media-controller.html (added)
• LayoutTests/platform/mac/fast/dom/Window/window-properties-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/fast/js/global-constructors-expected.txt (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/wtf/Platform.h (modified) (1 diff)
• Source/WebCore/CMakeLists.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/DerivedSources.cpp (modified) (1 diff)
• Source/WebCore/DerivedSources.make (modified) (1 diff)
• Source/WebCore/DerivedSources.pri (modified) (1 diff)
• Source/WebCore/GNUmakefile.list.am (modified) (4 diffs)
• Source/WebCore/Target.pri (modified) (8 diffs)
• Source/WebCore/WebCore.gypi (modified) (4 diffs)
• Source/WebCore/WebCore.vcproj/WebCore.vcproj (modified) (2 diffs)
• Source/WebCore/WebCore.xcodeproj/project.pbxproj (modified) (12 diffs)
• Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp (modified) (1 diff)
• Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h (modified) (1 diff)
• Source/WebCore/bindings/js/JSBindingsAllInOne.cpp (modified) (1 diff)
• Source/WebCore/bindings/js/JSHTMLMediaElementCustom.cpp (copied) (copied from trunk/Source/WebCore/platform/ClockGeneric.h) (3 diffs)
• Source/WebCore/bindings/v8/custom/V8HTMLMediaElementCustom.cpp (copied) (copied from trunk/Source/WebCore/platform/ClockGeneric.h) (3 diffs)
• Source/WebCore/dom/EventTarget.h (modified) (1 diff)
• Source/WebCore/dom/EventTargetFactory.in (modified) (1 diff)
• Source/WebCore/html/HTMLAttributeNames.in (modified) (1 diff)
• Source/WebCore/html/HTMLMediaElement.cpp (modified) (23 diffs)
• Source/WebCore/html/HTMLMediaElement.h (modified) (10 diffs)
• Source/WebCore/html/HTMLMediaElement.idl (modified) (1 diff)
• Source/WebCore/html/MediaController.cpp (added)
• Source/WebCore/html/MediaController.h (added)
• Source/WebCore/html/MediaController.idl (copied) (copied from trunk/Source/WebCore/platform/ClockGeneric.cpp) (2 diffs)
• Source/WebCore/html/MediaControllerInterface.h (added)
• Source/WebCore/html/TimeRanges.cpp (modified) (3 diffs)
• Source/WebCore/html/TimeRanges.h (modified) (1 diff)
• Source/WebCore/page/DOMWindow.idl (modified) (1 diff)
• Source/WebCore/platform/ClockGeneric.cpp (modified) (5 diffs)
• Source/WebCore/platform/ClockGeneric.h (modified) (1 diff)
• Source/WebCore/platform/graphics/MediaPlayer.cpp (modified) (1 diff)
• Source/WebCore/platform/graphics/MediaPlayer.h (modified) (1 diff)
• Source/WebCore/platform/graphics/MediaPlayerPrivate.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-11-11  Jer Noble  <jer.noble@apple.com>
+
+        Implement MediaController.
+        https://bugs.webkit.org/show_bug.cgi?id=71408
+
+        Reviewed by Eric Carlson.
+
+        * media/media-controller-expected.txt: Added.
+        * media/media-controller-playback-expected.txt: Added.
+        * media/media-controller-playback.html: Added.
+        * media/media-controller.html: Added.
+        * platform/mac/fast/dom/Window/window-properties-expected.txt:
+        * platform/mac/fast/js/global-constructors-expected.txt:
+
 2011-11-14  Andrew Scherkus  <scherkus@chromium.org>
 

trunk/LayoutTests/platform/mac/fast/dom/Window/window-properties-expected.txt

@@ -1277 +1277 @@
 window.Math.sqrt [function]
 window.Math.tan [function]
+window.MediaController [object MediaControllerConstructor]
+window.MediaController.prototype [object MediaControllerPrototype]
+window.MediaController.prototype.addEventListener [function]
+window.MediaController.prototype.dispatchEvent [function]
+window.MediaController.prototype.pause [function]
+window.MediaController.prototype.play [function]
+window.MediaController.prototype.removeEventListener [function]
 window.MediaError [object MediaErrorConstructor]
 window.MediaError.MEDIA_ERR_ABORTED [number]

trunk/LayoutTests/platform/mac/fast/js/global-constructors-expected.txt

@@ -128 +128 @@
 PASS ImageData.toString() is '[object ImageDataConstructor]'
 PASS KeyboardEvent.toString() is '[object KeyboardEventConstructor]'
+PASS MediaController.toString() is '[object MediaControllerConstructor]'
 PASS MediaError.toString() is '[object MediaErrorConstructor]'
 PASS MediaList.toString() is '[object MediaListConstructor]'

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-11-11  Jer Noble  <jer.noble@apple.com>
+
+        Implement MediaController.
+        https://bugs.webkit.org/show_bug.cgi?id=71408
+
+        Reviewed by Eric Carlson.
+
+        Change the definition of WTF_USE_COREAUDIO to exclude Windows completely, as 
+        CoreAudioClock.h is not available there.
+
+        * wtf/Platform.h:
+
 2011-11-14  Patrick Gansterer  <paroga@webkit.org>
 

trunk/Source/JavaScriptCore/wtf/Platform.h

@@ -1128 +1128 @@
 #endif
 
-#if PLATFORM(MAC) || (PLATFORM(WIN) && !OS(WINCE) && !PLATFORM(WIN_CAIRO))
+#if PLATFORM(MAC)
 #define WTF_USE_COREAUDIO 1
 #endif

trunk/Source/WebCore/CMakeLists.txt

@@ -277 +277 @@
     html/HTMLVideoElement.idl
     html/ImageData.idl
+    html/MediaController.idl
     html/MediaError.idl
     html/TextMetrics.idl

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-08  Jer Noble  <jer.noble@apple.com>
+
+        Implement MediaController.
+        https://bugs.webkit.org/show_bug.cgi?id=71408
+
+        Reviewed by Eric Carlson.
+
+        Tests: media/media-controller-playback.html
+               media/media-controller.html
+
+        Adds support for the MediaController DOM object, and the mediagroup and mediacontroller
+        HTMLMediaElement attributes.
+
+        MediaController is an DOM object which synchronizes playback of multiple HTMLMediaElements. It can
+        either be created by a page script and assigned to a HTMLMediaElement using the controller property,
+        or all HTMLMediaElements with identical mediagroup attributes will have a MediaController assigned 
+        automatically.
+
+        Add an abstract interface implemented by both MediaController and HTMLMediaElement.
+        * html/MediaControllerInterface.h: Added.
+        (WebCore::MediaControllerInterface::~MediaControllerInterface):
+
+        Add the MediaController object and IDL.
+        * html/MediaController.cpp: Added.
+        (mediaGroupToMediaControllerMap):
+        (MediaController::mediaControllerForMediaGroup):
+        (MediaController::create):
+        (MediaController::MediaController):
+        (MediaController::~MediaController):
+        (MediaController::addMediaElement):
+        (MediaController::removeMediaElement):
+        (MediaController::containsMediaElement):
+        (MediaController::buffered):
+        (MediaController::seekable):
+        (MediaController::played):
+        (MediaController::duration):
+        (MediaController::currentTime):
+        (MediaController::setCurrentTime):
+        (MediaController::play):
+        (MediaController::pause):
+        (MediaController::setDefaultPlaybackRate):
+        (MediaController::setPlaybackRate):
+        (MediaController::setVolume):
+        (MediaController::setMuted):
+        (MediaController::reportControllerState):
+        (MediaController::updateReadyState):
+        (MediaController::updatePlaybackState):
+        (MediaController::updateMediaElements):
+        (MediaController::scheduleEvent):
+        (MediaController::asyncEventTimerFired):
+        (MediaController::scriptExecutionContext):
+        (MediaController::hasAudio):
+        (MediaController::hasVideo):
+        (MediaController::hasClosedCaptions):
+        (MediaController::setClosedCaptionsVisible):
+        (MediaController::supportsScanning):
+        (MediaController::beginScrubbing):
+        (MediaController::endScrubbing):
+        (MediaController::canPlay):
+        (MediaController::isLiveStream):
+        (MediaController::hasSource):
+        (MediaController::returnToRealtime):
+        (MediaController::isBlocked):
+        (MediaController::hasEnded):
+        * html/MediaController.h: Added.
+        (WebCore::MediaController::mediaGroup):
+        (WebCore::MediaController::paused):
+        (WebCore::MediaController::defaultPlaybackRate):
+        (WebCore::MediaController::playbackRate):
+        (WebCore::MediaController::volume):
+        (WebCore::MediaController::muted):
+        (WebCore::MediaController::readyState):
+        (WebCore::MediaController::playbackState):
+        (WebCore::MediaController::supportsFullscreen):
+        (WebCore::MediaController::isFullscreen):
+        (WebCore::MediaController::enterFullscreen):
+        (WebCore::MediaController::closedCaptionsVisible):
+        (WebCore::MediaController::refEventTarget):
+        (WebCore::MediaController::derefEventTarget):
+        (WebCore::MediaController::toMediaController):
+        (WebCore::MediaController::eventTargetData):
+        (WebCore::MediaController::ensureEventTargetData):
+        * html/MediaController.idl: Added.
+
+        Add convenience functions to TimeRanges which can calculate intersections and
+        unions between TimeRanges objects.
+        * html/TimeRanges.cpp:
+        (TimeRanges::copy):
+        (TimeRanges::invert):
+        (TimeRanges::intersectWith):
+        (TimeRanges::unionWith):
+        * html/TimeRanges.h:
+
+        Add MediaControllerConstructor to the Window object.
+        * page/DOMWindow.idl:
+
+        Add the two new attribute names, mediagroup and controller.
+        * html/HTMLAttributeNames.in:
+
+        Add support for the new attributes, and add overridden behavior when a media element
+        has a current media controller:
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::~HTMLMediaElement):
+        (WebCore::HTMLMediaElement::parseMappedAttribute):
+        (WebCore::HTMLMediaElement::prepareForLoad):
+        (WebCore::HTMLMediaElement::setReadyState):
+        (WebCore::HTMLMediaElement::setCurrentTime):
+        (WebCore::HTMLMediaElement::setPlaybackRate):
+        (WebCore::HTMLMediaElement::playInternal):
+        (WebCore::HTMLMediaElement::togglePlayState):
+        (WebCore::HTMLMediaElement::mediaPlayerTimeChanged):
+        (WebCore::HTMLMediaElement::seekable):
+        (WebCore::HTMLMediaElement::potentiallyPlaying):
+        (WebCore::HTMLMediaElement::endedPlayback):
+        (WebCore::HTMLMediaElement::updateVolume):
+        (WebCore::HTMLMediaElement::updatePlayState):
+        (WebCore::HTMLMediaElement::userCancelledLoad):
+        (WebCore::HTMLMediaElement::mediaGroup):
+        (WebCore::HTMLMediaElement::setMediaGroup):
+        (WebCore::HTMLMediaElement::controller):
+        (WebCore::HTMLMediaElement::setController):
+        (WebCore::HTMLMediaElement::updateMediaController):
+        (WebCore::HTMLMediaElement::isBlockedOnMediaController):
+        * html/HTMLMediaElement.h:
+        (WebCore::HTMLMediaElement::hasSource):
+        (WebCore::HTMLMediaElement::isLiveStream):
+        * html/HTMLMediaElement.idl:
+        * bindings/js/JSHTMLMediaElementCustom.cpp: Added.
+        (WebCore::JSHTMLMediaElement::setMediaController):
+
+        Add convenience functions to store a mapping of media-elements-per-document to allow
+        a quick lookup of media elements with the same media group within a given document:
+        * html/HTMLMediaElement.cpp:
+        (WebCore::documentToElementSetMap):
+        (WebCore::addElementToDocumentMap):
+        (WebCore::removeElementFromDocumentMap):
+        
+        Add a function "seekable" which returns a TimeRanges containing the seekable time ranges
+        in a media element.  By default this is a single range of [0, maxTimeSeekable].
+        * platform/graphics/MediaPlayer.cpp:
+        (WebCore::MediaPlayer::seekable):
+        * platform/graphics/MediaPlayer.h:
+        * platform/graphics/MediaPlayerPrivate.h:
+        (WebCore::MediaPlayerPrivateInterface::seekable):
+
+        Support functions to cast between MediaController and EventTarget.
+        * bindings/js/JSEventTarget.cpp:
+        (WebCore::toJS):
+        * dom/EventTarget.cpp:
+        (WebCore::EventTarget::toMediaController):
+        * dom/EventTarget.h:
+
+        Fixed an infinite-recursion bug due to a collision between WTF::currentTime and
+        ClockGeneric::currentTime:
+        * platform/ClockGeneric.cpp:
+        (ClockGeneric::ClockGeneric):
+        (ClockGeneric::setCurrentTime):
+        (ClockGeneric::currentTime):
+        (ClockGeneric::setPlayRate):
+        (ClockGeneric::start):
+        (ClockGeneric::stop):
+        (ClockGeneric::now):
+        * platform/ClockGeneric.h:
+
+        Boilerplate to support creating the derived sources for MediaController and adding new sources
+        to the project:
+        * CMakeLists.txt:
+        * DerivedSources.cpp:
+        * DerivedSources.make:
+        * GNUmakefile.list.am:
+        * WebCore.gypi:
+        * WebCore.xcodeproj/project.pbxproj:
+
 2011-11-14  Florin Malita  <fmalita@google.com>
 

trunk/Source/WebCore/DerivedSources.cpp

@@ -229 +229 @@
 #include "JSKeyboardEvent.cpp"
 #include "JSLocation.cpp"
+#include "JSMediaController.cpp"
 #include "JSMediaError.cpp"
 #include "JSMediaList.cpp"

trunk/Source/WebCore/DerivedSources.make

@@ -278 +278 @@
     Location \
     LowPass2FilterNode \
+    MediaController \
     MediaElementAudioSourceNode \
     MediaError \

trunk/Source/WebCore/DerivedSources.pri

@@ -315 +315 @@
     html/HTMLVideoElement.idl \
     html/ImageData.idl \
+    html/MediaController.idl \
     html/MediaError.idl \
     html/TextMetrics.idl \

trunk/Source/WebCore/GNUmakefile.list.am

@@ -360 +360 @@
         DerivedSources/WebCore/JSLocation.cpp \
         DerivedSources/WebCore/JSLocation.h \
+        DerivedSources/WebCore/JSMediaController.cpp \
+        DerivedSources/WebCore/JSMediaController.h \
         DerivedSources/WebCore/JSMediaError.cpp \
         DerivedSources/WebCore/JSMediaError.h \
@@ -792 +794 @@
         Source/WebCore/bindings/js/JSHTMLInputElementCustom.h \
         Source/WebCore/bindings/js/JSHTMLLinkElementCustom.cpp \
+        Source/WebCore/bindings/js/JSHTMLMediaElementCustom.cpp \
         Source/WebCore/bindings/js/JSHTMLObjectElementCustom.cpp \
         Source/WebCore/bindings/js/JSHTMLObjectElementCustom.h \
@@ -1879 +1882 @@
         Source/WebCore/html/LoadableTextTrack.cpp \
         Source/WebCore/html/LoadableTextTrack.h \
+        Source/WebCore/html/MediaController.cpp \
+        Source/WebCore/html/MediaController.h \
         Source/WebCore/html/MediaDocument.cpp \
         Source/WebCore/html/MediaDocument.h \
@@ -2462 +2467 @@
         Source/WebCore/platform/AsyncFileSystem.h \
         Source/WebCore/platform/AutodrainedPool.h \
+        Source/WebCore/platform/Clock.cpp \
+        Source/WebCore/platform/Clock.h \
+        Source/WebCore/platform/ClockGeneric.cpp \
+        Source/WebCore/platform/ClockGeneric.h \
         Source/WebCore/platform/ColorChooser.cpp \
         Source/WebCore/platform/ColorChooser.h \

trunk/Source/WebCore/Target.pri

@@ -189 +189 @@
         bindings/v8/custom/V8HTMLInputElementCustom.cpp \
         bindings/v8/custom/V8HTMLLinkElementCustom.cpp \
+        bindings/v8/custom/V8HTMLMediaElementCustom.cpp \
         bindings/v8/custom/V8HTMLOptionsCollectionCustom.cpp \
         bindings/v8/custom/V8HTMLOutputElementCustom.cpp \
@@ -299 +300 @@
         bindings/js/JSHTMLInputElementCustom.cpp \
         bindings/js/JSHTMLLinkElementCustom.cpp \
+        bindings/js/JSHTMLMediaElementCustom.cpp \
         bindings/js/JSHTMLObjectElementCustom.cpp \
         bindings/js/JSHTMLOptionsCollectionCustom.cpp \
@@ -1015 +1017 @@
     platform/text/LocalizedNumberNone.cpp \
     platform/text/QuotedPrintable.cpp \
+    platform/Clock.cpp \
+    platform/ClockGeneric.cpp \
     platform/ContentType.cpp \
     platform/CrossThreadCopier.cpp \
@@ -1025 +1029 @@
     platform/FileStream.cpp \
     platform/FileSystem.cpp \
-    platform/ClockGeneric.cpp \
     platform/GeolocationService.cpp \
     platform/image-decoders/qt/ImageFrameQt.cpp \
@@ -1859 +1862 @@
     html/LinkRelAttribute.h \
     html/LoadableTextTrack.h \
+    html/MediaController.h \
     html/MediaDocument.h \
     html/MicroDataItemValue.h \
@@ -2047 +2051 @@
     platform/Arena.h \
     platform/AsyncFileStream.h \
+    platform/Clock.h \
+    platform/ClockGeneric.h \
     platform/ContentType.h \
     platform/ContextMenu.h \
@@ -2065 +2071 @@
     platform/mock/SpeechInputClientMock.h \
     platform/mock/ScrollbarThemeMock.h \
-    platform/ClockGeneric.h \
     platform/graphics/BitmapImage.h \
     platform/graphics/Color.h \
@@ -3089 +3094 @@
         html/HTMLSourceElement.cpp \
         html/HTMLVideoElement.cpp \
+        html/MediaController.cpp \
         html/shadow/MediaControlElements.cpp \
         html/TimeRanges.cpp \

trunk/Source/WebCore/WebCore.gypi

@@ -1332 +1332 @@
             'html/HTMLVideoElement.idl',
             'html/ImageData.idl',
+            'html/MediaController.idl',
             'html/MediaError.idl',
             'html/TextMetrics.idl',
@@ -1878 +1879 @@
             'bindings/js/JSHTMLInputElementCustom.h',
             'bindings/js/JSHTMLLinkElementCustom.cpp',
+            'bindings/js/JSHTMLMediaElementCustom.cpp',
             'bindings/js/JSHTMLObjectElementCustom.cpp',
             'bindings/js/JSHTMLObjectElementCustom.h',
@@ -2200 +2202 @@
             'bindings/v8/custom/V8HTMLInputElementCustom.cpp',
             'bindings/v8/custom/V8HTMLLinkElementCustom.cpp',
+            'bindings/v8/custom/V8HTMLMediaElementCustom.cpp',
             'bindings/v8/custom/V8HTMLOptionsCollectionCustom.cpp',
             'bindings/v8/custom/V8HTMLOutputElementCustom.cpp',
@@ -5607 +5610 @@
             'html/LoadableTextTrack.cpp',
             'html/LoadableTextTrack.h',
+            'html/MediaController.cpp',
+            'html/MediaController.h',
             'html/MediaDocument.cpp',
             'html/MediaDocument.h',

trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

@@ -26263 +26263 @@
                         </File>
                         <File
+                                RelativePath="..\platform\Clock.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\platform\Clock.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\platform\ClockGeneric.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\platform\ClockGeneric.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\platform\ContentType.cpp"
                                 >
@@ -57719 +57735 @@
                         </File>
                         <File
+                                RelativePath="..\html\MediaController.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\html\MediaController.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\html\MediaDocument.cpp"
                                 >

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -5721 +5721 @@
                 CD0DBFEF1422768500280263 /* IRC_Composite_C_R0195_T345_P330.wav in Copy Audio Resources */ = {isa = PBXBuildFile; fileRef = CD0DBE0E1422759500280263 /* IRC_Composite_C_R0195_T345_P330.wav */; };
                 CD0DBFF01422768500280263 /* IRC_Composite_C_R0195_T345_P345.wav in Copy Audio Resources */ = {isa = PBXBuildFile; fileRef = CD0DBE0F1422759500280263 /* IRC_Composite_C_R0195_T345_P345.wav */; };
+                CD27F6E51457685A0078207D /* JSMediaController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD27F6E2145767580078207D /* JSMediaController.cpp */; };
+                CD27F6E7145770D30078207D /* MediaController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD27F6E6145770D30078207D /* MediaController.cpp */; };
                 CD82030A1395AB6A00F956C6 /* WebVideoFullscreenController.h in Headers */ = {isa = PBXBuildFile; fileRef = CD8203061395AB6A00F956C6 /* WebVideoFullscreenController.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 CD82030B1395AB6A00F956C6 /* WebVideoFullscreenController.mm in Sources */ = {isa = PBXBuildFile; fileRef = CD8203071395AB6A00F956C6 /* WebVideoFullscreenController.mm */; settings = {COMPILER_FLAGS = "-Wno-undef"; }; };
@@ -5727 +5729 @@
                 CD8203101395ACE700F956C6 /* WebWindowAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = CD82030E1395ACE700F956C6 /* WebWindowAnimation.h */; };
                 CD8203111395ACE700F956C6 /* WebWindowAnimation.mm in Sources */ = {isa = PBXBuildFile; fileRef = CD82030F1395ACE700F956C6 /* WebWindowAnimation.mm */; };
+                CDD525D7145B6DD0008D204D /* JSHTMLMediaElementCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDF65CCC145B6AFE00C4C7AA /* JSHTMLMediaElementCustom.cpp */; };
                 CDEA763014608A53008B31F1 /* PlatformClockCA.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDEA762E146084DE008B31F1 /* PlatformClockCA.cpp */; };
                 CDEA76341460B56F008B31F1 /* ClockGeneric.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDEA76321460AE29008B31F1 /* ClockGeneric.cpp */; };
@@ -5732 +5735 @@
                 CDEA7C841276230400B846DD /* RenderFullScreen.h in Headers */ = {isa = PBXBuildFile; fileRef = CDEA7C821276230400B846DD /* RenderFullScreen.h */; };
                 CDEA7C851276230400B846DD /* RenderFullScreen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDEA7C831276230400B846DD /* RenderFullScreen.cpp */; };
+                CDF65CC8145B1E7500C4C7AA /* MediaController.h in Headers */ = {isa = PBXBuildFile; fileRef = CD27F6E4145767870078207D /* MediaController.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                CDF65CCA145B448800C4C7AA /* MediaControllerInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = CDF65CC9145B43A700C4C7AA /* MediaControllerInterface.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 CE02F0C411E83ADD00C6684A /* ScriptControllerBase.h in Headers */ = {isa = PBXBuildFile; fileRef = CE02F0C311E83ADD00C6684A /* ScriptControllerBase.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 CE057FA51220731100A476D5 /* DocumentMarkerController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE057FA31220731100A476D5 /* DocumentMarkerController.cpp */; };
@@ -13041 +13046 @@
                 CD0DBE0E1422759500280263 /* IRC_Composite_C_R0195_T345_P330.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = IRC_Composite_C_R0195_T345_P330.wav; path = platform/audio/resources/IRC_Composite_C_R0195_T345_P330.wav; sourceTree = SOURCE_ROOT; };
                 CD0DBE0F1422759500280263 /* IRC_Composite_C_R0195_T345_P345.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = IRC_Composite_C_R0195_T345_P345.wav; path = platform/audio/resources/IRC_Composite_C_R0195_T345_P345.wav; sourceTree = SOURCE_ROOT; };
+                CD27F6E014575C1B0078207D /* MediaController.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = MediaController.idl; sourceTree = "<group>"; };
+                CD27F6E2145767580078207D /* JSMediaController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMediaController.cpp; sourceTree = "<group>"; };
+                CD27F6E3145767580078207D /* JSMediaController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMediaController.h; sourceTree = "<group>"; };
+                CD27F6E4145767870078207D /* MediaController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaController.h; sourceTree = "<group>"; };
+                CD27F6E6145770D30078207D /* MediaController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaController.cpp; sourceTree = "<group>"; };
                 CD4E0AFA11F7BC27009D3811 /* fullscreen.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = fullscreen.css; sourceTree = "<group>"; };
                 CD8203061395AB6A00F956C6 /* WebVideoFullscreenController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebVideoFullscreenController.h; sourceTree = "<group>"; };
@@ -13049 +13059 @@
                 CD82030F1395ACE700F956C6 /* WebWindowAnimation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebWindowAnimation.mm; sourceTree = "<group>"; };
                 CDBD93BA1333BD4B002570E3 /* fullscreenQuickTime.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = fullscreenQuickTime.css; sourceTree = "<group>"; };
+                CDCE5CCF14633BC900D47CCA /* EventFactory.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = EventFactory.in; sourceTree = "<group>"; };
+                CDCE5CD014633BC900D47CCA /* EventTargetFactory.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = EventTargetFactory.in; sourceTree = "<group>"; };
                 CDEA762C14608224008B31F1 /* Clock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Clock.h; sourceTree = "<group>"; };
                 CDEA762E146084DE008B31F1 /* PlatformClockCA.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlatformClockCA.cpp; sourceTree = "<group>"; };
@@ -13057 +13069 @@
                 CDEA7C821276230400B846DD /* RenderFullScreen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderFullScreen.h; sourceTree = "<group>"; };
                 CDEA7C831276230400B846DD /* RenderFullScreen.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderFullScreen.cpp; sourceTree = "<group>"; };
+                CDF65CC9145B43A700C4C7AA /* MediaControllerInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaControllerInterface.h; sourceTree = "<group>"; };
+                CDF65CCC145B6AFE00C4C7AA /* JSHTMLMediaElementCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLMediaElementCustom.cpp; sourceTree = "<group>"; };
                 CE02F0C311E83ADD00C6684A /* ScriptControllerBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptControllerBase.h; sourceTree = "<group>"; };
                 CE057FA31220731100A476D5 /* DocumentMarkerController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DocumentMarkerController.cpp; sourceTree = "<group>"; };
@@ -17399 +17413 @@
                                 F55B3DAB1251F12D003EF269 /* WeekInputType.cpp */,
                                 F55B3DAC1251F12D003EF269 /* WeekInputType.h */,
+                                CD27F6E014575C1B0078207D /* MediaController.idl */,
+                                CD27F6E4145767870078207D /* MediaController.h */,
+                                CD27F6E6145770D30078207D /* MediaController.cpp */,
+                                CDF65CC9145B43A700C4C7AA /* MediaControllerInterface.h */,
                         );
                         path = html;
@@ -17632 +17650 @@
                         isa = PBXGroup;
                         children = (
+                                CD27F6E2145767580078207D /* JSMediaController.cpp */,
+                                CD27F6E3145767580078207D /* JSMediaController.h */,
                                 49EECEF2105070C400099FAB /* JSArrayBuffer.cpp */,
                                 49EECEF3105070C400099FAB /* JSArrayBuffer.h */,
@@ -19658 +19678 @@
                                 E1AD14221295EA7F00ACA989 /* JSHTMLInputElementCustom.h */,
                                 E1AD139A1295D92600ACA989 /* JSHTMLLinkElementCustom.cpp */,
+                                CDF65CCC145B6AFE00C4C7AA /* JSHTMLMediaElementCustom.cpp */,
                                 BC305CA30C0781BB00CD20F0 /* JSHTMLObjectElementCustom.cpp */,
                                 E1AD14241295EA9500ACA989 /* JSHTMLObjectElementCustom.h */,
@@ -20975 +20996 @@
                         isa = PBXGroup;
                         children = (
+                                CDCE5CCF14633BC900D47CCA /* EventFactory.in */,
+                                CDCE5CD014633BC900D47CCA /* EventTargetFactory.in */,
                                 E1C4DE6D0EA75C650023CCD6 /* ActiveDOMObject.cpp */,
                                 E1C4DE680EA75C1E0023CCD6 /* ActiveDOMObject.h */,
@@ -24674 +24697 @@
                                 31313F661443B35F006E2A90 /* FilterEffectRenderer.h in Headers */,
                                 29CD61DE146D02890068E82A /* WebKitCSSShaderValue.h in Headers */,
+                                CDF65CC8145B1E7500C4C7AA /* MediaController.h in Headers */,
+                                CDF65CCA145B448800C4C7AA /* MediaControllerInterface.h in Headers */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -27532 +27557 @@
                                 CDEA763014608A53008B31F1 /* PlatformClockCA.cpp in Sources */,
                                 CDEA76341460B56F008B31F1 /* ClockGeneric.cpp in Sources */,
+                                CD27F6E51457685A0078207D /* JSMediaController.cpp in Sources */,
+                                CD27F6E7145770D30078207D /* MediaController.cpp in Sources */,
+                                CDD525D7145B6DD0008D204D /* JSHTMLMediaElementCustom.cpp in Sources */,
                                 CDEA76351460B71A008B31F1 /* Clock.cpp in Sources */,
                                 976F36EA14686225005E93B4 /* SecurityContext.cpp in Sources */,

trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp

@@ -114 +114 @@
 }
 
+bool RuntimeEnabledFeatures::mediaControllerEnabled()
+{
+    return MediaPlayer::isAvailable();
+}
+
 bool RuntimeEnabledFeatures::mediaErrorEnabled()
 {

trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h

@@ -93 +93 @@
     static bool htmlVideoElementEnabled();
     static bool htmlSourceElementEnabled();
+    static bool mediaControllerEnabled();
     static bool mediaErrorEnabled();
     static bool timeRangesEnabled();

trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp

@@ -93 +93 @@
 #include "JSHTMLInputElementCustom.cpp"
 #include "JSHTMLLinkElementCustom.cpp"
+#include "JSHTMLMediaElementCustom.cpp"
 #include "JSHTMLObjectElementCustom.cpp"
 #include "JSHTMLOptionsCollectionCustom.cpp"

trunk/Source/WebCore/bindings/js/JSHTMLMediaElementCustom.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2011 Apple Inc.  All rights reserved.
+ * Copyright (C) 2011 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -11 +11 @@
  *    documentation and/or other materials provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
@@ -24 +24 @@
  */
 
-#ifndef ClockGeneric_h
-#define ClockGeneric_h
+#include "config.h"
+#if ENABLE(VIDEO)
 
-#include "Clock.h"
+#include "JSHTMLMediaElement.h"
+
+#include "JSMediaController.h"
 
 namespace WebCore {
 
-class ClockGeneric : public Clock {
-public:
-    ClockGeneric();
+using namespace JSC;
 
-private:
-    virtual void setCurrentTime(float);
-    virtual float currentTime() const;
-
-    virtual void setPlayRate(float);
-    virtual float playRate() const { return m_rate; }
-
-    virtual void start();
-    virtual void stop();
-    virtual bool isRunning() const { return m_running; }
-
-    bool m_running;
-    float m_rate;
-    float m_offset;
-    double m_startTime;
-    mutable double m_lastTime;
-};
+void JSHTMLMediaElement::setController(ExecState*, JSValue value)
+{
+    HTMLMediaElement* imp = static_cast<HTMLMediaElement*>(impl());
+    // 4.8.10.11.2 Media controllers: controller attribute.
+    // On setting, it must first remove the element's mediagroup attribute, if any, 
+    imp->setMediaGroup(String());
+    // and then set the current media controller to the given value.
+    imp->setController(toMediaController(value));
+}
 
 }
-
 #endif

trunk/Source/WebCore/bindings/v8/custom/V8HTMLMediaElementCustom.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2011 Apple Inc.  All rights reserved.
+ * Copyright (C) 2011 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -11 +11 @@
  *    documentation and/or other materials provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
@@ -24 +24 @@
  */
 
-#ifndef ClockGeneric_h
-#define ClockGeneric_h
+#include "config.h"
 
-#include "Clock.h"
+#if ENABLE(VIDEO)
+
+#include "V8HTMLMediaElement.h"
+
+#include "V8MediaController.h"
+#include "V8Proxy.h"
 
 namespace WebCore {
 
-class ClockGeneric : public Clock {
-public:
-    ClockGeneric();
+void V8HTMLMediaElement::controllerAccessorSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
+{
+    INC_STATS("DOM.HTMLMediaElement.mediaController._set");
+    HTMLMediaElement* imp = V8HTMLMediaElement::toNative(info.Holder());
+    MediaController* controller = 0;
+    if (V8MediaController::HasInstance(value))
+        controller = V8MediaController::toNative(value->ToObject());
+    
+    if (!controller) {
+        throwError("Value is not of type MediaController");
+        return;
+    }
 
-private:
-    virtual void setCurrentTime(float);
-    virtual float currentTime() const;
-
-    virtual void setPlayRate(float);
-    virtual float playRate() const { return m_rate; }
-
-    virtual void start();
-    virtual void stop();
-    virtual bool isRunning() const { return m_running; }
-
-    bool m_running;
-    float m_rate;
-    float m_offset;
-    double m_startTime;
-    mutable double m_lastTime;
-};
+    // 4.8.10.11.2 Media controllers: controller attribute.
+    // On setting, it must first remove the element's mediagroup attribute, if any, 
+    imp->setMediaGroup(String());
+    // and then set the current media controller to the given value.
+    imp->setController(controller);
+}
 
 }
 
 #endif
+

trunk/Source/WebCore/dom/EventTarget.h

@@ -56 +56 @@
     class JavaScriptAudioNode;
     class LocalMediaStream;
+    class MediaController;
     class MediaStream;
     class MessagePort;

trunk/Source/WebCore/dom/EventTargetFactory.in

@@ -14 +14 @@
 JavaScriptAudioNode conditional=WEB_AUDIO
 LocalMediaStream conditional=MEDIA_STREAM
+MediaController conditional=VIDEO
 MediaStream conditional=MEDIA_STREAM
 MessagePort

trunk/Source/WebCore/html/HTMLAttributeNames.in

@@ -149 +149 @@
 mayscript
 media
+mediagroup
 method
 min

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -53 +53 @@
 #include "HTMLVideoElement.h"
 #include "Logging.h"
+#include "MediaController.h"
 #include "MediaControls.h"
 #include "MediaDocument.h"
@@ -139 +140 @@
 
 using namespace HTMLNames;
+using namespace std;
+
+typedef HashMap<Document*, HashSet<HTMLMediaElement*> > DocumentElementSetMap;
+static DocumentElementSetMap& documentToElementSetMap()
+{
+    DEFINE_STATIC_LOCAL(DocumentElementSetMap, map, ());
+    return map;
+}
+
+static void addElementToDocumentMap(HTMLMediaElement* element, Document* document)
+{
+    DocumentElementSetMap& map = documentToElementSetMap();
+    HashSet<HTMLMediaElement*> set = map.take(document);
+    set.add(element);
+    map.add(document, set);
+}
+
+static void removeElementFromDocumentMap(HTMLMediaElement* element, Document* document)
+{
+    DocumentElementSetMap& map = documentToElementSetMap();
+    HashSet<HTMLMediaElement*> set = map.take(document);
+    set.remove(element);
+    if (!set.isEmpty())
+        map.add(document, set);
+}
 
 HTMLMediaElement::HTMLMediaElement(const QualifiedName& tagName, Document* document)
@@ -220 +246 @@
 
     setHasCustomWillOrDidRecalcStyle();
+    addElementToDocumentMap(this, document);
 }
 
@@ -239 +266 @@
     }
 #endif
+
+    if (m_mediaController)
+        m_mediaController->removeMediaElement(this);
+
+    removeElementFromDocumentMap(this, document());
 }
 
@@ -248 +280 @@
     document()->unregisterForDocumentActivationCallbacks(this);
     document()->unregisterForMediaVolumeCallbacks(this);
+    removeElementFromDocumentMap(this, document());
     HTMLElement::willMoveToNewOwnerDocument();
 }
@@ -259 +292 @@
     document()->registerForDocumentActivationCallbacks(this);
     document()->registerForMediaVolumeCallbacks(this);
+    addElementToDocumentMap(this, document());
     HTMLElement::didMoveToNewOwnerDocument();
 }
@@ -305 +339 @@
             m_player->setPreload(m_preload);
 
-    } else if (attrName == onabortAttr)
+    } else if (attrName == mediagroupAttr)
+        setMediaGroup(attr->value());
+    else if (attrName == onabortAttr)
         setAttributeEventListener(eventNames().abortEvent, createAttributeEventListener(this, attr));
     else if (attrName == onbeforeloadAttr)
@@ -614 +650 @@
         invalidateCachedTime();
         scheduleEvent(eventNames().emptiedEvent);
+        updateMediaController();
     }
 
@@ -1249 +1286 @@
 
     updatePlayState();
+    updateMediaController();
 }
 
@@ -1548 +1586 @@
 void HTMLMediaElement::setCurrentTime(float time, ExceptionCode& ec)
 {
+    if (m_mediaController) {
+        ec = INVALID_STATE_ERR;
+        return;
+    }
     seek(time, ec);
 }
@@ -1599 +1641 @@
 {
     LOG(Media, "HTMLMediaElement::setPlaybackRate(%f)", rate);
-
+    
     if (m_playbackRate != rate) {
         m_playbackRate = rate;
@@ -1605 +1647 @@
         scheduleEvent(eventNames().ratechangeEvent);
     }
-    if (m_player && potentiallyPlaying() && m_player->rate() != rate)
+
+    if (m_player && potentiallyPlaying() && m_player->rate() != rate && !m_mediaController)
         m_player->setRate(rate);
+}
+
+void HTMLMediaElement::updatePlaybackRate()
+{
+    float effectiveRate = m_mediaController ? m_mediaController->playbackRate() : m_playbackRate;
+    if (m_player && potentiallyPlaying() && m_player->rate() != effectiveRate && !m_mediaController)
+        m_player->setRate(effectiveRate);
 }
 
@@ -1701 +1751 @@
         seek(0, unused);
     }
-    
+
+    if (m_mediaController)
+        m_mediaController->bringElementUpToSpeed(this);
+
     if (m_paused) {
         m_paused = false;
@@ -1715 +1768 @@
 
     updatePlayState();
+    updateMediaController();
 }
 
@@ -1906 +1960 @@
     // this method is only called from the built-in media controller
     if (canPlay()) {
-        setPlaybackRate(defaultPlaybackRate());
+        updatePlaybackRate();
         playInternal();
     } else 
@@ -2334 +2388 @@
     float now = currentTime();
     float dur = duration();
-    if (!isnan(dur) && dur && now >= dur) {
-        if (loop()) {
+    
+    // When the current playback position reaches the end of the media resource when the direction of
+    // playback is forwards, then the user agent must follow these steps:
+    if (!isnan(dur) && dur && now >= dur && m_playbackRate > 0) {
+        // If the media element has a loop attribute specified and does not have a current media controller,
+        if (loop() && !m_mediaController) {
             ExceptionCode ignoredException;
             m_sentEndEvent = false;
-            seek(0, ignoredException);
+            //  then seek to the earliest possible position of the media resource and abort these steps.
+            seek(startTime(), ignoredException);
         } else {
-            if (!m_paused) {
+            // If the media element does not have a current media controller, and the media element
+            // has still ended playback, and the direction of playback is still forwards, and paused
+            // is false,
+            if (!m_mediaController && !m_paused) {
+                // changes paused to true and fires a simple event named pause at the media element.
                 m_paused = true;
                 scheduleEvent(eventNames().pauseEvent);
             }
+            // Queue a task to fire a simple event named ended at the media element.
             if (!m_sentEndEvent) {
                 m_sentEndEvent = true;
                 scheduleEvent(eventNames().endedEvent);
             }
+            // If the media element has a current media controller, then report the controller state
+            // for the media element's current media controller.
+            updateMediaController();
         }
     }
@@ -2534 +2601 @@
 PassRefPtr<TimeRanges> HTMLMediaElement::seekable() const
 {
-    // FIXME real ranges support
-    if (!maxTimeSeekable())
-        return TimeRanges::create();
-    return TimeRanges::create(minTimeSeekable(), maxTimeSeekable());
+    return m_player ? m_player->seekable() : TimeRanges::create();
 }
 
@@ -2546 +2610 @@
     // checks in couldPlayIfEnoughData().
     bool pausedToBuffer = m_readyStateMaximum >= HAVE_FUTURE_DATA && m_readyState < HAVE_FUTURE_DATA;
-    return (pausedToBuffer || m_readyState >= HAVE_FUTURE_DATA) && couldPlayIfEnoughData();
+    return (pausedToBuffer || m_readyState >= HAVE_FUTURE_DATA) && couldPlayIfEnoughData() && !isBlockedOnMediaController();
 }
 
@@ -2568 +2632 @@
 
     // and the current playback position is the end of the media resource and the direction
-    // of playback is forwards and the media element does not have a loop attribute specified,
+    // of playback is forwards, Either the media element does not have a loop attribute specified,
+    // or the media element has a current media controller.
     float now = currentTime();
     if (m_playbackRate > 0)
-        return dur > 0 && now >= dur && !loop();
+        return dur > 0 && now >= dur && (!loop() || m_mediaController);
 
     // or the current playback position is the earliest possible position and the direction 
@@ -2617 +2682 @@
         Page* page = document()->page();
         float volumeMultiplier = page ? page->mediaVolume() : 1;
-    
-        m_player->setMuted(m_muted);
+        bool shouldMute = m_muted;
+
+        if (m_mediaController) {
+            volumeMultiplier *= m_mediaController->volume();
+            shouldMute = m_mediaController->muted();
+        }
+
+        m_player->setMuted(shouldMute);
         m_player->setVolume(m_volume * volumeMultiplier);
     }
@@ -2685 +2756 @@
             mediaControls()->playbackStopped();
     }
-    
+
+    updateMediaController();
+
     if (renderer())
         renderer()->updateFromElement();
 }
-    
+
 void HTMLMediaElement::setPausedInternal(bool b)
 {
@@ -2749 +2822 @@
     // Reset m_readyState since m_player is gone.
     m_readyState = HAVE_NOTHING;
+    updateMediaController();
 }
 
@@ -3241 +3315 @@
 #endif
 
-}
-
-#endif
+const String& HTMLMediaElement::mediaGroup() const
+{
+    return m_mediaGroup;
+}
+
+void HTMLMediaElement::setMediaGroup(const String& group)
+{
+    if (m_mediaGroup == group)
+        return;
+    m_mediaGroup = group;
+
+    // When a media element is created with a mediagroup attribute, and when a media element's mediagroup 
+    // attribute is set, changed, or removed, the user agent must run the following steps:
+    // 1. Let m [this] be the media element in question.
+    // 2. Let m have no current media controller, if it currently has one.
+    setController(0);
+
+    // 3. If m's mediagroup attribute is being removed, then abort these steps.
+    if (group.isNull() || group.isEmpty())
+        return;
+
+    // 4. If there is another media element whose Document is the same as m's Document (even if one or both
+    // of these elements are not actually in the Document), 
+    HashSet<HTMLMediaElement*> elements = documentToElementSetMap().get(document());
+    for (HashSet<HTMLMediaElement*>::iterator i = elements.begin(); i != elements.end(); ++i) {
+        if (*i == this)
+            continue;
+
+        // and which also has a mediagroup attribute, and whose mediagroup attribute has the same value as
+        // the new value of m's mediagroup attribute,        
+        if ((*i)->mediaGroup() == group) {
+            //  then let controller be that media element's current media controller.
+            setController((*i)->controller());
+            return;
+        }
+    }
+
+    // Otherwise, let controller be a newly created MediaController.
+    setController(MediaController::create(Node::scriptExecutionContext()));
+}
+
+MediaController* HTMLMediaElement::controller() const
+{
+    return m_mediaController.get();
+}
+
+void HTMLMediaElement::setController(PassRefPtr<MediaController> controller)
+{
+    if (m_mediaController)
+        m_mediaController->removeMediaElement(this);
+
+    m_mediaController = controller;
+
+    if (m_mediaController)
+        m_mediaController->addMediaElement(this);
+}
+
+void HTMLMediaElement::updateMediaController()
+{
+    if (m_mediaController)
+        m_mediaController->reportControllerState();
+}
+
+bool HTMLMediaElement::isBlocked() const
+{
+    // A media element is a blocked media element if its readyState attribute is in the
+    // HAVE_NOTHING state, the HAVE_METADATA state, or the HAVE_CURRENT_DATA state,
+    if (m_readyState <= HAVE_CURRENT_DATA)
+        return true;
+
+    // or if the element has paused for user interaction.
+    return pausedForUserInteraction();
+}
+
+bool HTMLMediaElement::isBlockedOnMediaController() const
+{
+    if (!m_mediaController)
+        return false;
+
+    // A media element is blocked on its media controller if the MediaController is a blocked 
+    // media controller,
+    if (m_mediaController->isBlocked())
+        return true;
+
+    // or if its media controller position is either before the media resource's earliest possible 
+    // position relative to the MediaController's timeline or after the end of the media resource 
+    // relative to the MediaController's timeline.
+    float mediaControllerPosition = m_mediaController->currentTime();
+    if (mediaControllerPosition < startTime() || mediaControllerPosition > startTime() + duration())
+        return true;
+
+    return false;
+}
+
+}
+
+#endif

trunk/Source/WebCore/html/HTMLMediaElement.h

@@ -32 +32 @@
 #include "ActiveDOMObject.h"
 #include "MediaCanStartListener.h"
+#include "MediaControllerInterface.h"
 #include "MediaPlayer.h"
 
@@ -53 +54 @@
 class HTMLSourceElement;
 class HTMLTrackElement;
+class MediaController;
 class MediaControls;
 class MediaError;
@@ -67 +69 @@
 // no longer depends on typecasting a MediaPlayerClient to an HTMLMediaElement.
 
-class HTMLMediaElement : public HTMLElement, public MediaPlayerClient, private MediaCanStartListener, public ActiveDOMObject
+class HTMLMediaElement : public HTMLElement, public MediaPlayerClient, private MediaCanStartListener, public ActiveDOMObject, public MediaControllerInterface
 #if ENABLE(VIDEO_TRACK)
     , private TextTrackClient
@@ -113 +115 @@
     enum NetworkState { NETWORK_EMPTY, NETWORK_IDLE, NETWORK_LOADING, NETWORK_NO_SOURCE };
     NetworkState networkState() const;
-    
+
     String preload() const;    
     void setPreload(const String&);
@@ -122 +124 @@
 
 // ready state
-    enum ReadyState { HAVE_NOTHING, HAVE_METADATA, HAVE_CURRENT_DATA, HAVE_FUTURE_DATA, HAVE_ENOUGH_DATA };
     ReadyState readyState() const;
     bool seeking() const;
@@ -137 +138 @@
     float playbackRate() const;
     void setPlaybackRate(float);
+    void updatePlaybackRate();
     bool webkitPreservesPitch() const;
     void setWebkitPreservesPitch(bool);
@@ -251 +253 @@
     enum InvalidURLAction { DoNothing, Complain };
     bool isSafeToLoadURL(const KURL&, InvalidURLAction);
+
+    const String& mediaGroup() const;
+    void setMediaGroup(const String&);
+
+    MediaController* controller() const;
+    void setController(PassRefPtr<MediaController>);
 
 protected:
@@ -405 +413 @@
     void setPausedInternal(bool);
 
+    void setPlaybackRateInternal(float);
+
     virtual void mediaCanStart();
 
@@ -422 +432 @@
     virtual void setItemValueText(const String&, ExceptionCode&);
 #endif
+
+    void updateMediaController();
+    bool isBlocked() const;
+    bool isBlockedOnMediaController() const;
+    bool hasCurrentSrc() const { return !m_currentSrc.isEmpty(); }
+    bool isLiveStream() const { return movieLoadType() == MediaPlayer::LiveStream; }
+    bool isAutoplaying() const { return m_autoplaying; }
 
     Timer<HTMLMediaElement> m_loadTimer;
@@ -534 +551 @@
     Vector<CueIntervalTree::IntervalType> m_currentlyVisibleCues;
 #endif
+
+    String m_mediaGroup;
+    friend class MediaController;
+    RefPtr<MediaController> m_mediaController;
 };
 

trunk/Source/WebCore/html/HTMLMediaElement.idl

@@ -116 +116 @@
     readonly attribute [EnabledAtRuntime=webkitVideoTrack] TextTrackList textTracks;
 #endif
+
+    attribute [Reflect, ConvertNullToNullString, ConvertNullStringToNull] DOMString mediaGroup;
+    attribute [CustomSetter] MediaController controller;
 };
 }

trunk/Source/WebCore/html/MediaController.idl

@@ -1 +1 @@
 /*
- * Copyright (C) 2011 Apple Inc.  All rights reserved.
+ * Copyright (C) 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -24 +24 @@
  */
 
-#include "config.h"
-#include "ClockGeneric.h"
+module html {
+    interface [
+        Conditional=VIDEO,
+        Constructor,
+        CallWith=ScriptExecutionContext,
+        GenerateToJS,
+        EventTarget
+    ] MediaController {
+        readonly attribute TimeRanges buffered;
+        readonly attribute TimeRanges seekable;
 
-#include "FloatConversion.h"
-#include <wtf/CurrentTime.h>
+        readonly attribute double duration;
+        attribute double currentTime
+            setter raises (DOMException);
 
-using namespace WebCore;
+        readonly attribute boolean paused;
+        readonly attribute TimeRanges played;
+        void play();
+        void pause();
 
-ClockGeneric::ClockGeneric()
-    : m_running(false)
-    , m_rate(1)
-    , m_offset(0)
-{
-    m_startTime = m_lastTime = currentTime();
+        attribute double defaultPlaybackRate;
+        attribute double playbackRate;
+
+        attribute double volume
+            setter raises (DOMException);
+        attribute boolean muted;
+
+        // EventTarget interface
+        void addEventListener(in DOMString type, 
+                              in EventListener listener, 
+                              in [Optional] boolean useCapture);
+        void removeEventListener(in DOMString type, 
+                                 in EventListener listener, 
+                                 in [Optional] boolean useCapture);
+        boolean dispatchEvent(in Event evt)
+            raises(EventException);
+    };
 }
-
-void ClockGeneric::setCurrentTime(float time)
-{
-    m_startTime = m_lastTime = currentTime();
-    m_offset = time;
-}
-
-float ClockGeneric::currentTime() const
-{
-    if (m_running)
-        m_lastTime = currentTime();
-    float time = (narrowPrecisionToFloat(m_lastTime - m_startTime) * m_rate) + m_offset;
-    return time;
-}
-
-void ClockGeneric::setPlayRate(float rate)
-{
-    m_offset = currentTime();
-    m_lastTime = m_startTime = currentTime();
-    m_rate = rate;
-}
-
-void ClockGeneric::start()
-{
-    if (m_running)
-        return;
-
-    m_lastTime = m_startTime = currentTime();
-    m_running = true;
-}
-
-void ClockGeneric::stop()
-{
-    if (!m_running)
-        return;
-
-    m_offset = currentTime();
-    m_lastTime = m_startTime = currentTime();
-    m_running = false;
-}

trunk/Source/WebCore/html/TimeRanges.cpp

@@ -32 +32 @@
 
 using namespace WebCore;
+using namespace std;
 
 TimeRanges::TimeRanges(float start, float end)
@@ -38 +39 @@
 }
 
-PassRefPtr<TimeRanges> TimeRanges::copy()
+PassRefPtr<TimeRanges> TimeRanges::copy() const
 {
     RefPtr<TimeRanges> newSession = TimeRanges::create();
@@ -47 +48 @@
     
     return newSession.release();
+}
+
+void TimeRanges::invert()
+{
+    RefPtr<TimeRanges> inverted = TimeRanges::create();
+    float posInf = std::numeric_limits<float>::infinity();
+    float negInf = -std::numeric_limits<float>::infinity();
+
+    if (!m_ranges.size())
+        inverted->add(negInf, posInf);
+    else {
+        if (float start = m_ranges.first().m_start != negInf)
+            inverted->add(negInf, start);
+
+        for (size_t index = 0; index + 1 < m_ranges.size(); ++index)
+            inverted->add(m_ranges[index].m_end, m_ranges[index + 1].m_start);
+
+        if (float end = m_ranges.last().m_end != posInf)
+            inverted->add(end, posInf);
+    }
+
+    m_ranges.swap(inverted->m_ranges);
+}
+
+void TimeRanges::intersectWith(const TimeRanges* other)
+{
+    ASSERT(other);
+    RefPtr<TimeRanges> inverted = copy();
+    RefPtr<TimeRanges> invertedOther = other->copy();
+    inverted->unionWith(invertedOther.get());
+    inverted->invert();
+
+    m_ranges.swap(inverted->m_ranges);
+}
+
+void TimeRanges::unionWith(const TimeRanges* other)
+{
+    ASSERT(other);
+    RefPtr<TimeRanges> unioned = copy();
+    for (size_t index = 0; index < other->m_ranges.size(); ++index) {
+        const Range& range = other->m_ranges[index];
+        unioned->add(range.m_start, range.m_end);
+    }
+
+    m_ranges.swap(unioned->m_ranges);
 }
 

trunk/Source/WebCore/html/TimeRanges.h

@@ -47 +47 @@
     }
 
-    PassRefPtr<TimeRanges> copy();
+    PassRefPtr<TimeRanges> copy() const;
+    void invert();
+    void intersectWith(const TimeRanges*);
+    void unionWith(const TimeRanges*);
 
     unsigned length() const { return m_ranges.size(); }

trunk/Source/WebCore/page/DOMWindow.idl

@@ -636 +636 @@
         attribute [Conditional=VIDEO, EnabledAtRuntime] TimeRangesConstructor TimeRanges;
         attribute [Conditional=VIDEO, EnabledAtRuntime] HTMLSourceElementConstructor HTMLSourceElement;
+        attribute [Conditional=VIDEO, EnabledAtRuntime] MediaControllerConstructor MediaController;
 
 #if defined(ENABLE_ANIMATION_API) && ENABLE_ANIMATION_API

trunk/Source/WebCore/platform/ClockGeneric.cpp

@@ -37 +37 @@
     , m_offset(0)
 {
-    m_startTime = m_lastTime = currentTime();
+    m_startTime = m_lastTime = now();
 }
 
 void ClockGeneric::setCurrentTime(float time)
 {
-    m_startTime = m_lastTime = currentTime();
+    m_startTime = m_lastTime = now();
     m_offset = time;
 }
@@ -49 +49 @@
 {
     if (m_running)
-        m_lastTime = currentTime();
+        m_lastTime = now();
     float time = (narrowPrecisionToFloat(m_lastTime - m_startTime) * m_rate) + m_offset;
     return time;
@@ -56 +56 @@
 void ClockGeneric::setPlayRate(float rate)
 {
-    m_offset = currentTime();
-    m_lastTime = m_startTime = currentTime();
+    m_offset = now();
+    m_lastTime = m_startTime = now();
     m_rate = rate;
 }
@@ -66 +66 @@
         return;
 
-    m_lastTime = m_startTime = currentTime();
+    m_lastTime = m_startTime = now();
     m_running = true;
 }
@@ -75 +75 @@
         return;
 
-    m_offset = currentTime();
-    m_lastTime = m_startTime = currentTime();
+    m_offset = now();
+    m_lastTime = m_startTime = now();
     m_running = false;
 }
+
+float ClockGeneric::now() const
+{
+    return WTF::currentTime();
+}
+

trunk/Source/WebCore/platform/ClockGeneric.h

@@ -46 +46 @@
     virtual bool isRunning() const { return m_running; }
 
+    float now() const;
+
     bool m_running;
     float m_rate;

trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp

@@ -610 +610 @@
 }
 
+PassRefPtr<TimeRanges> MediaPlayer::seekable()
+{
+    return m_private->seekable();
+}
+
 float MediaPlayer::maxTimeSeekable()
 {

trunk/Source/WebCore/platform/graphics/MediaPlayer.h

@@ -242 +242 @@
 
     PassRefPtr<TimeRanges> buffered();
+    PassRefPtr<TimeRanges> seekable();
     float maxTimeSeekable();
 

trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h

@@ -30 +30 @@
 
 #include "MediaPlayer.h"
+#include "TimeRanges.h"
 #include <wtf/Forward.h>
 
@@ -92 +93 @@
     virtual MediaPlayer::ReadyState readyState() const = 0;
 
+    virtual PassRefPtr<TimeRanges> seekable() const { return maxTimeSeekable() ? TimeRanges::create(0, maxTimeSeekable()) : TimeRanges::create(); }
     virtual float maxTimeSeekable() const = 0;
     virtual PassRefPtr<TimeRanges> buffered() const = 0;