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

Unified Diff: extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc

Issue 2287213002: Ensure loading PDFs doesn't generate 2 http requests (Closed)
Patch Set: Ensure loading PDFs doesn't generate 2 http requests Created 4 years, 4 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
« no previous file with comments | « extensions/browser/guest_view/mime_handler_view/mime_handler_view_browsertest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc
diff --git a/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc b/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc
index 22d508220bde816bb7197ba39c9628df7bdce115..527fd2d8c7f1e8e442d3f4d075a0de0acc1e699f 100644
--- a/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc
+++ b/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc
@@ -117,8 +117,10 @@ MimeHandlerViewContainer::MimeHandlerViewContainer(
}
MimeHandlerViewContainer::~MimeHandlerViewContainer() {
- if (loader_)
+ if (loader_) {
+ DCHECK(is_embedded_);
loader_->cancel();
+ }
if (render_frame()) {
g_mime_handler_view_container_map.Get()[render_frame()].erase(this);
@@ -139,7 +141,7 @@ MimeHandlerViewContainer::FromRenderFrame(content::RenderFrame* render_frame) {
}
void MimeHandlerViewContainer::OnReady() {
- if (!render_frame())
+ if (!render_frame() || !is_embedded_)
return;
blink::WebFrame* frame = render_frame()->GetWebFrame();
@@ -325,7 +327,10 @@ void MimeHandlerViewContainer::OnMimeHandlerViewGuestOnLoadCompleted(
void MimeHandlerViewContainer::CreateMimeHandlerViewGuest() {
// The loader has completed loading |view_id_| so we can dispose it.
- loader_.reset();
+ if (loader_) {
+ DCHECK(is_embedded_);
+ loader_.reset();
+ }
DCHECK_NE(element_instance_id(), guest_view::kInstanceIDNone);
« no previous file with comments | « extensions/browser/guest_view/mime_handler_view/mime_handler_view_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698