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

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

Issue 139763004: Remove unused url argument to HTMLMediaElement::canPlayType (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: compile? Created 6 years, 11 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 | « Source/core/html/HTMLMediaElement.h ('k') | no next file » | 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 565 matching lines...) Expand 10 before | Expand all | Expand 10 after
576 void HTMLMediaElement::setSrc(const AtomicString& url) 576 void HTMLMediaElement::setSrc(const AtomicString& url)
577 { 577 {
578 setAttribute(srcAttr, url); 578 setAttribute(srcAttr, url);
579 } 579 }
580 580
581 HTMLMediaElement::NetworkState HTMLMediaElement::networkState() const 581 HTMLMediaElement::NetworkState HTMLMediaElement::networkState() const
582 { 582 {
583 return m_networkState; 583 return m_networkState;
584 } 584 }
585 585
586 String HTMLMediaElement::canPlayType(const String& mimeType, const String& keySy stem, const KURL& url) const 586 String HTMLMediaElement::canPlayType(const String& mimeType, const String& keySy stem) const
587 { 587 {
588 WebMimeRegistry::SupportsType support = supportsType(ContentType(mimeType), keySystem); 588 WebMimeRegistry::SupportsType support = supportsType(ContentType(mimeType), keySystem);
589 String canPlay; 589 String canPlay;
590 590
591 // 4.8.10.3 591 // 4.8.10.3
592 switch (support) 592 switch (support)
593 { 593 {
594 case WebMimeRegistry::IsNotSupported: 594 case WebMimeRegistry::IsNotSupported:
595 canPlay = emptyString(); 595 canPlay = emptyString();
596 break; 596 break;
597 case WebMimeRegistry::MayBeSupported: 597 case WebMimeRegistry::MayBeSupported:
598 canPlay = "maybe"; 598 canPlay = "maybe";
599 break; 599 break;
600 case WebMimeRegistry::IsSupported: 600 case WebMimeRegistry::IsSupported:
601 canPlay = "probably"; 601 canPlay = "probably";
602 break; 602 break;
603 } 603 }
604 604
605 WTF_LOG(Media, "HTMLMediaElement::canPlayType(%s, %s, %s) -> %s", mimeType.u tf8().data(), keySystem.utf8().data(), url.elidedString().utf8().data(), canPlay .utf8().data()); 605 WTF_LOG(Media, "HTMLMediaElement::canPlayType(%s, %s) -> %s", mimeType.utf8( ).data(), keySystem.utf8().data(), canPlay.utf8().data());
606 606
607 return canPlay; 607 return canPlay;
608 } 608 }
609 609
610 void HTMLMediaElement::load() 610 void HTMLMediaElement::load()
611 { 611 {
612 RefPtr<HTMLMediaElement> protect(this); // loadInternal may result in a 'bef oreload' event, which can make arbitrary DOM mutations. 612 RefPtr<HTMLMediaElement> protect(this); // loadInternal may result in a 'bef oreload' event, which can make arbitrary DOM mutations.
613 613
614 WTF_LOG(Media, "HTMLMediaElement::load()"); 614 WTF_LOG(Media, "HTMLMediaElement::load()");
615 615
(...skipping 3307 matching lines...) Expand 10 before | Expand all | Expand 10 after
3923 { 3923 {
3924 m_mediaSource->setWebMediaSourceAndOpen(adoptPtr(webMediaSource)); 3924 m_mediaSource->setWebMediaSourceAndOpen(adoptPtr(webMediaSource));
3925 } 3925 }
3926 3926
3927 bool HTMLMediaElement::isInteractiveContent() const 3927 bool HTMLMediaElement::isInteractiveContent() const
3928 { 3928 {
3929 return fastHasAttribute(controlsAttr); 3929 return fastHasAttribute(controlsAttr);
3930 } 3930 }
3931 3931
3932 } 3932 }
OLDNEW
« no previous file with comments | « Source/core/html/HTMLMediaElement.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698