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

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..fc2e533f172020bd925e7fa450eb6e247db2485f 100644
--- a/content/browser/loader/buffered_resource_handler.cc
+++ b/content/browser/loader/buffered_resource_handler.cc
@@ -312,6 +312,26 @@ bool BufferedResourceHandler::SelectNextHandler(bool* defer) {
return UseAlternateNextHandler(handler.Pass(), std::string());
}
+ // info->allow_download() == true implies
+ // info->GetResourceType() == RESOURCE_TYPE_MAIN_FRAME or
+ // info->GetResourceType() == RESOURCE_TYPE_SUB_FRAME.
+ if (info->allow_download()) {
+ DCHECK(info->GetResourceType() == RESOURCE_TYPE_MAIN_FRAME ||
+ info->GetResourceType() == RESOURCE_TYPE_SUB_FRAME);
mmenke 2014/11/18 16:32:17 Can move this down below the "!info->allow_downloa
raymes 2014/11/19 04:08:37 Done.
+ }
+
+ // Allow requests for object/embed tags to be intercepted as streams.
+ if (info->GetResourceType() == content::RESOURCE_TYPE_OBJECT) {
+ DCHECK(!info->allow_download());
+ DCHECK(!net::IsSupportedMimeType(mime_type));
mmenke 2014/11/18 16:32:17 In addition to never getting intercepted as stream
raymes 2014/11/19 04:08:37 Arg no that's not necessarily true. I had already
+ std::string payload;
+ scoped_ptr<ResourceHandler> handler(
+ host_->MaybeInterceptAsStream(request(), response_.get(), &payload));
+ if (handler) {
+ return UseAlternateNextHandler(handler.Pass(), payload);
+ }
+ }
+
if (!info->allow_download())
return true;

Powered by Google App Engine
This is Rietveld 408576698