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

Unified Diff: content/browser/loader/buffered_resource_handler.cc

Issue 694773003: Allow URL requests for object/embed tags to be intercepted as streams. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@refactor-guest-view-container-3
Patch Set: Created 6 years, 1 month 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: content/browser/loader/buffered_resource_handler.cc
diff --git a/content/browser/loader/buffered_resource_handler.cc b/content/browser/loader/buffered_resource_handler.cc
index f96b5506d8c455f1526a89b3917d5e65bb3d82dd..c80b8cb72671f942acfcf375f583aa0708c8608a 100644
--- a/content/browser/loader/buffered_resource_handler.cc
+++ b/content/browser/loader/buffered_resource_handler.cc
@@ -312,9 +312,27 @@ bool BufferedResourceHandler::SelectNextHandler(bool* defer) {
return UseAlternateNextHandler(handler.Pass(), std::string());
}
+ // Allow requests for object/embed tags to be intercepted as streams.
+ if (info->GetResourceType() == content::RESOURCE_TYPE_OBJECT) {
+ DCHECK(!info->allow_download());
+ std::string payload;
+ scoped_ptr<ResourceHandler> handler(
+ host_->MaybeInterceptAsStream(request(), response_.get(), &payload));
+ if (handler) {
+ DCHECK(!net::IsSupportedMimeType(mime_type));
+ return UseAlternateNextHandler(handler.Pass(), payload);
+ }
+ }
+
if (!info->allow_download())
return true;
+ // info->allow_download() == true implies
+ // info->GetResourceType() == RESOURCE_TYPE_MAIN_FRAME or
+ // info->GetResourceType() == RESOURCE_TYPE_SUB_FRAME.
+ DCHECK(info->GetResourceType() == RESOURCE_TYPE_MAIN_FRAME ||
+ info->GetResourceType() == RESOURCE_TYPE_SUB_FRAME);
+
bool must_download = MustDownload();
if (!must_download) {
if (net::IsSupportedMimeType(mime_type))
« no previous file with comments | « content/browser/loader/buffered_resource_handler.h ('k') | content/browser/loader/buffered_resource_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698