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

Unified Diff: Source/core/loader/DocumentThreadableLoader.cpp

Issue 114123005: Show media and VTT text tracks in the devtools. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years 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/loader/DocumentThreadableLoader.cpp
diff --git a/Source/core/loader/DocumentThreadableLoader.cpp b/Source/core/loader/DocumentThreadableLoader.cpp
index f34ee2e5b9e546f8534478190bf39c4d74f1fb9f..7f812154a13e1154b80c867f46f9e6ceb29da9ad 100644
--- a/Source/core/loader/DocumentThreadableLoader.cpp
+++ b/Source/core/loader/DocumentThreadableLoader.cpp
@@ -44,6 +44,7 @@
#include "core/loader/DocumentThreadableLoaderClient.h"
#include "core/loader/FrameLoader.h"
#include "core/loader/ThreadableLoaderClient.h"
+#include "platform/Logging.h"
apavlov 2013/12/19 09:31:52 a debugging leftover include?
pwnall-personal 2013/12/19 09:39:34 Done. Fixed. Rebasing leftover. Sorry :(
#include "platform/SharedBuffer.h"
#include "platform/network/ResourceRequest.h"
#include "platform/weborigin/SchemeRegistry.h"
@@ -412,7 +413,10 @@ void DocumentThreadableLoader::loadRequest(const ResourceRequest& request, Secur
FetchRequest newRequest(request, m_options.initiator, options);
ASSERT(!resource());
- setResource(m_document->fetcher()->fetchRawResource(newRequest));
+ if (request.targetType() == ResourceRequest::TargetIsMedia)
+ setResource(m_document->fetcher()->fetchMedia(newRequest));
+ else
+ setResource(m_document->fetcher()->fetchRawResource(newRequest));
if (resource() && resource()->loader()) {
unsigned long identifier = resource()->identifier();
InspectorInstrumentation::documentThreadableLoaderStartedLoadingForClient(m_document, identifier, m_client);

Powered by Google App Engine
This is Rietveld 408576698