From d022d108a32d1ce597b0529accebdec296821de8 Mon Sep 17 00:00:00 2001
From: deepak1556 <hop2deep@gmail.com>
Date: Thu, 2 Mar 2017 23:11:19 +0530
Subject: [PATCH] Dont intercept pdf request for subframes     Will not work
 without OOPIF support

---
 atom/browser/atom_resource_dispatcher_host_delegate.cc | 6 +++---
 atom/common/atom_constants.cc                          | 1 -
 atom/common/atom_constants.h                           | 1 -
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/atom/browser/atom_resource_dispatcher_host_delegate.cc b/atom/browser/atom_resource_dispatcher_host_delegate.cc
index 341c76589d9..42b1bd4b068 100644
--- a/atom/browser/atom_resource_dispatcher_host_delegate.cc
+++ b/atom/browser/atom_resource_dispatcher_host_delegate.cc
@@ -8,14 +8,12 @@
 #include "atom/browser/web_contents_permission_helper.h"
 #include "atom/common/atom_constants.h"
 #include "atom/common/platform_util.h"
-#include "base/guid.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/stream_info.h"
 #include "net/base/escape.h"
 #include "net/ssl/client_cert_store.h"
-#include "net/url_request/url_request.h"
 #include "url/gurl.h"
 
 #if defined(USE_NSS_CERTS)
@@ -122,7 +120,9 @@ bool AtomResourceDispatcherHostDelegate::ShouldInterceptResourceAsStream(
     const std::string& mime_type,
     GURL* origin,
     std::string* payload) {
-  if (mime_type == "application/pdf") {
+  const content::ResourceRequestInfo* info =
+      content::ResourceRequestInfo::ForRequest(request);
+  if (mime_type == "application/pdf" && info->IsMainFrame()) {
     *origin = GURL(kPdfViewerUIOrigin);
     return true;
   }
diff --git a/atom/common/atom_constants.cc b/atom/common/atom_constants.cc
index ff3754f04bb..85307ded9e7 100644
--- a/atom/common/atom_constants.cc
+++ b/atom/common/atom_constants.cc
@@ -30,6 +30,5 @@ const char kPdfPluginSrc[] = "src";
 
 const char kPdfViewerUIOrigin[] = "chrome://pdf-viewer/";
 const char kPdfViewerUIHost[] = "pdf-viewer";
-const char kPdfViewerUIStreamId[] = "streamId";
 
 }  // namespace atom
diff --git a/atom/common/atom_constants.h b/atom/common/atom_constants.h
index 8e04fed70de..f507214d9d8 100644
--- a/atom/common/atom_constants.h
+++ b/atom/common/atom_constants.h
@@ -28,7 +28,6 @@ extern const char kPdfPluginSrc[];
 // Constants for PDF viewer webui.
 extern const char kPdfViewerUIOrigin[];
 extern const char kPdfViewerUIHost[];
-extern const char kPdfViewerUIStreamId[];
 
 }  // namespace atom