Ignore:
Timestamp:
04/11/12 15:04:01 (2 years ago)
Author:
commit-queue@webkit.org
Message:

Add keySystem attribute to canPlayType() for Encrypted Media Extensions
https://bugs.webkit.org/show_bug.cgi?id=82973

Patch by David Dorwin <ddorwin@chromium.org> on 2012-04-11
Reviewed by Adam Barth.

The new attribute is behind the ENABLE(ENCRYPTED_MEDIA) feature define.
Implementation is based on v0.1 of the draft proposal at
http://dvcs.w3.org/hg/html-media/raw-file/tip/encrypted-media/encrypted-media.html#extensions.

Source/Platform:

  • chromium/public/WebMimeRegistry.h:

(WebKit::WebMimeRegistry::supportsMediaMIMEType):

Source/WebCore:

Tests: media/encrypted-media/encrypted-media-can-play-type-webm.html

media/encrypted-media/encrypted-media-can-play-type.html

  • dom/DOMImplementation.cpp:

(WebCore::DOMImplementation::createDocument):

  • html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::canPlayType):
(WebCore::HTMLMediaElement::selectMediaResource):
(WebCore::HTMLMediaElement::loadNextSourceChild):
(WebCore::HTMLMediaElement::loadResource):
(WebCore::HTMLMediaElement::havePotentialSourceChild):
(WebCore::HTMLMediaElement::selectNextSourceChild):
(WebCore::HTMLMediaElement::getPluginProxyParams):

  • html/HTMLMediaElement.h:

(HTMLMediaElement):

  • html/HTMLMediaElement.idl:
  • platform/graphics/MediaPlayer.cpp:

(WebCore):
(WebCore::bestMediaEngineForTypeAndCodecs):
(WebCore::MediaPlayer::load):
(WebCore::MediaPlayer::loadWithNextMediaEngine):
(WebCore::MediaPlayer::supportsType):
(WebCore::MediaPlayer::networkStateChanged):

  • platform/graphics/MediaPlayer.h:

(MediaPlayer):
(WebCore):

Source/WebKit/chromium:

  • src/WebMediaPlayerClientImpl.cpp:

(WebKit::WebMediaPlayerClientImpl::supportsType):

  • src/WebMediaPlayerClientImpl.h:

(WebMediaPlayerClientImpl):

LayoutTests:

  • media/encrypted-media/encrypted-media-can-play-type-expected.txt: Added.
  • media/encrypted-media/encrypted-media-can-play-type-webm-expected.txt: Added.
  • media/encrypted-media/encrypted-media-can-play-type-webm.html: Added.
  • media/encrypted-media/encrypted-media-can-play-type.html: Added.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r113913 r113914  
     12012-04-11  David Dorwin  <ddorwin@chromium.org> 
     2 
     3        Add keySystem attribute to canPlayType() for Encrypted Media Extensions 
     4        https://bugs.webkit.org/show_bug.cgi?id=82973 
     5 
     6        Reviewed by Adam Barth. 
     7 
     8        The new attribute is behind the ENABLE(ENCRYPTED_MEDIA) feature define. 
     9        Implementation is based on v0.1 of the draft proposal at 
     10        http://dvcs.w3.org/hg/html-media/raw-file/tip/encrypted-media/encrypted-media.html#extensions. 
     11 
     12        * media/encrypted-media/encrypted-media-can-play-type-expected.txt: Added. 
     13        * media/encrypted-media/encrypted-media-can-play-type-webm-expected.txt: Added. 
     14        * media/encrypted-media/encrypted-media-can-play-type-webm.html: Added. 
     15        * media/encrypted-media/encrypted-media-can-play-type.html: Added. 
     16 
    1172012-04-11  Anders Carlsson  <andersca@apple.com> 
    218 
Note: See TracChangeset for help on using the changeset viewer.