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

Unified Diff: Source/core/html/HTMLMediaElement.cpp

Issue 24009002: Move synchronously fetching to ResourceFetcher, as well as most of the logic (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: Source/core/html/HTMLMediaElement.cpp
diff --git a/Source/core/html/HTMLMediaElement.cpp b/Source/core/html/HTMLMediaElement.cpp
index a9b98e35e2ff94a6068766ec05b510b8ab92e4d7..ed3625ff495349674f36be871fa6f1203335e37c 100644
--- a/Source/core/html/HTMLMediaElement.cpp
+++ b/Source/core/html/HTMLMediaElement.cpp
@@ -844,11 +844,11 @@ void HTMLMediaElement::loadNextSourceChild()
loadResource(mediaURL, contentType, keySystem);
}
-void HTMLMediaElement::loadResource(const KURL& initialURL, ContentType& contentType, const String& keySystem)
+void HTMLMediaElement::loadResource(const KURL& url, ContentType& contentType, const String& keySystem)
{
- ASSERT(isSafeToLoadURL(initialURL, Complain));
+ ASSERT(isSafeToLoadURL(url, Complain));
- LOG(Media, "HTMLMediaElement::loadResource(%s, %s, %s)", urlForLoggingMedia(initialURL).utf8().data(), contentType.raw().utf8().data(), keySystem.utf8().data());
+ LOG(Media, "HTMLMediaElement::loadResource(%s, %s, %s)", urlForLoggingMedia(url).utf8().data(), contentType.raw().utf8().data(), keySystem.utf8().data());
Frame* frame = document().frame();
if (!frame) {
@@ -856,12 +856,6 @@ void HTMLMediaElement::loadResource(const KURL& initialURL, ContentType& content
return;
}
- KURL url = initialURL;
- if (!frame->loader()->willLoadMediaElementURL(url)) {
- mediaLoadingFailed(MediaPlayer::FormatError);
- return;
- }
-
// The resource fetch algorithm
m_networkState = NETWORK_LOADING;

Powered by Google App Engine
This is Rietveld 408576698