Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Side by Side Diff: Source/core/html/HTMLMediaElement.cpp

Issue 876863006: Make canPlayType()'s keySystem argument depend on PrefixedEncryptedMedia (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Move CanPlayTypeKeySystem deprecation to IDL Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | Source/core/html/HTMLMediaElement.idl » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 691 matching lines...) Expand 10 before | Expand all | Expand 10 after
702 setAttribute(srcAttr, url); 702 setAttribute(srcAttr, url);
703 } 703 }
704 704
705 HTMLMediaElement::NetworkState HTMLMediaElement::networkState() const 705 HTMLMediaElement::NetworkState HTMLMediaElement::networkState() const
706 { 706 {
707 return m_networkState; 707 return m_networkState;
708 } 708 }
709 709
710 String HTMLMediaElement::canPlayType(const String& mimeType, const String& keySy stem) const 710 String HTMLMediaElement::canPlayType(const String& mimeType, const String& keySy stem) const
711 { 711 {
712 if (!keySystem.isNull())
713 UseCounter::countDeprecation(document(), UseCounter::CanPlayTypeKeySyste m);
714
715 WebMimeRegistry::SupportsType support = supportsType(ContentType(mimeType), keySystem); 712 WebMimeRegistry::SupportsType support = supportsType(ContentType(mimeType), keySystem);
716 String canPlay; 713 String canPlay;
717 714
718 // 4.8.10.3 715 // 4.8.10.3
719 switch (support) { 716 switch (support) {
720 case WebMimeRegistry::IsNotSupported: 717 case WebMimeRegistry::IsNotSupported:
721 canPlay = emptyString(); 718 canPlay = emptyString();
722 break; 719 break;
723 case WebMimeRegistry::MayBeSupported: 720 case WebMimeRegistry::MayBeSupported:
724 canPlay = "maybe"; 721 canPlay = "maybe";
(...skipping 3372 matching lines...) Expand 10 before | Expand all | Expand 10 after
4097 4094
4098 #if ENABLE(WEB_AUDIO) 4095 #if ENABLE(WEB_AUDIO)
4099 void HTMLMediaElement::clearWeakMembers(Visitor* visitor) 4096 void HTMLMediaElement::clearWeakMembers(Visitor* visitor)
4100 { 4097 {
4101 if (!visitor->isAlive(m_audioSourceNode) && audioSourceProvider()) 4098 if (!visitor->isAlive(m_audioSourceNode) && audioSourceProvider())
4102 audioSourceProvider()->setClient(nullptr); 4099 audioSourceProvider()->setClient(nullptr);
4103 } 4100 }
4104 #endif 4101 #endif
4105 4102
4106 } 4103 }
OLDNEW
« no previous file with comments | « no previous file | Source/core/html/HTMLMediaElement.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698