Skip GetNewBrowserInfo call for PDF renderer processes (see issue #3047)

With PdfUnseasoned the PDF file will be loaded in a dedicated renderer process.
We identify this process by adding the kPdfRenderer command-line flag (similar
to how kExtensionProcess is used to identify an extension renderer process). We
then avoid calling GetNewBrowserInfo for the PDF renderer process because we
know the request will otherwise time out.
This commit is contained in:
Marshall Greenblatt
2021-11-29 14:58:09 -05:00
parent f6cf7f9ec7
commit f4d5395c4b
9 changed files with 63 additions and 46 deletions

View File

@@ -110,16 +110,6 @@
#include "base/strings/sys_string_conversions.h"
#endif
namespace {
bool IsStandaloneExtensionProcess() {
return extensions::ExtensionsEnabled() &&
extensions::CefExtensionsRendererClient::
IsStandaloneExtensionProcess();
}
} // namespace
AlloyContentRendererClient::AlloyContentRendererClient()
: main_entry_time_(base::TimeTicks::Now()),
render_manager_(new CefRenderManager) {
@@ -200,7 +190,7 @@ void AlloyContentRendererClient::RenderThreadStarted() {
content::RenderThread* thread = content::RenderThread::Get();
const bool is_extension = IsStandaloneExtensionProcess();
const bool is_extension = CefRenderManager::IsExtensionProcess();
thread->SetRendererProcessType(
is_extension

View File

@@ -7,19 +7,16 @@
#include "libcef/renderer/alloy/alloy_render_thread_observer.h"
#include "libcef/renderer/extensions/extensions_dispatcher_delegate.h"
#include "base/command_line.h"
#include "base/stl_util.h"
#include "chrome/common/url_constants.h"
#include "chrome/renderer/extensions/extension_process_policy.h"
#include "chrome/renderer/extensions/resource_request_policy.h"
#include "components/guest_view/renderer/guest_view_container_dispatcher.h"
#include "content/public/common/content_constants.h"
#include "content/public/common/content_switches.h"
#include "content/public/renderer/render_frame.h"
#include "content/public/renderer/render_thread.h"
#include "extensions/common/constants.h"
#include "extensions/common/permissions/permissions_data.h"
#include "extensions/common/switches.h"
#include "extensions/renderer/dispatcher.h"
#include "extensions/renderer/extension_frame_helper.h"
#include "extensions/renderer/extensions_render_frame_observer.h"
@@ -149,10 +146,4 @@ void CefExtensionsRendererClient::RunScriptsAtDocumentIdle(
extension_dispatcher_->RunScriptsAtDocumentIdle(render_frame);
}
// static
bool CefExtensionsRendererClient::IsStandaloneExtensionProcess() {
return base::CommandLine::ForCurrentProcess()->HasSwitch(
extensions::switches::kExtensionProcess);
}
} // namespace extensions

View File

@@ -78,8 +78,6 @@ class CefExtensionsRendererClient : public ExtensionsRendererClient {
void RunScriptsAtDocumentEnd(content::RenderFrame* render_frame);
void RunScriptsAtDocumentIdle(content::RenderFrame* render_frame);
static bool IsStandaloneExtensionProcess();
private:
std::unique_ptr<extensions::Dispatcher> extension_dispatcher_;
std::unique_ptr<guest_view::GuestViewContainerDispatcher>

View File

@@ -30,9 +30,11 @@
#include "base/command_line.h"
#include "base/strings/string_number_conversions.h"
#include "cef/libcef/common/mojom/cef.mojom.h"
#include "content/public/common/content_switches.h"
#include "content/public/renderer/render_frame.h"
#include "content/public/renderer/render_thread.h"
#include "content/public/renderer/render_view.h"
#include "extensions/common/switches.h"
#include "mojo/public/cpp/bindings/binder_map.h"
#include "services/network/public/mojom/cors_origin_pattern.mojom.h"
#include "third_party/blink/public/platform/web_string.h"
@@ -181,6 +183,18 @@ CefRenderManager::GetBrowserManager() {
return browser_manager_;
}
// static
bool CefRenderManager::IsExtensionProcess() {
return base::CommandLine::ForCurrentProcess()->HasSwitch(
extensions::switches::kExtensionProcess);
}
// static
bool CefRenderManager::IsPdfProcess() {
return base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kPdfRenderer);
}
void CefRenderManager::BindReceiver(
mojo::PendingReceiver<cef::mojom::RenderManager> receiver) {
receivers_.Add(this, std::move(receiver));
@@ -293,25 +307,26 @@ CefRefPtr<CefBrowserImpl> CefRenderManager::MaybeCreateBrowser(
return nullptr;
}
const int render_frame_routing_id = render_frame->GetRoutingID();
const bool is_pdf = IsPdfProcess();
// Retrieve the browser information synchronously. This will also register
// the routing ids with the browser info object in the browser process.
auto params = cef::mojom::NewBrowserInfo::New();
GetBrowserManager()->GetNewBrowserInfo(render_frame_routing_id, &params);
if (!is_pdf) {
// Retrieve browser information synchronously.
GetBrowserManager()->GetNewBrowserInfo(render_frame->GetRoutingID(),
&params);
if (params->browser_id == 0) {
// The popup may have been canceled during creation.
return nullptr;
}
}
if (is_windowless) {
*is_windowless = params->is_windowless;
}
if (params->browser_id == 0) {
// The popup may have been canceled during creation.
return nullptr;
}
if (params->is_guest_view || params->browser_id < 0) {
// Don't create a CefBrowser for guest views, or if the new browser info
// response has timed out.
if (is_pdf || params->is_guest_view || params->browser_id < 0) {
// Don't create a CefBrowser for a PDF renderer, guest view, or if the new
// browser info response has timed out.
guest_views_.insert(std::make_pair(
render_view, std::make_unique<CefGuestView>(this, render_view,
params->is_windowless)));

View File

@@ -67,6 +67,12 @@ class CefRenderManager : public cef::mojom::RenderManager {
// Connects to CefBrowserManager in the browser process.
mojo::Remote<cef::mojom::BrowserManager>& GetBrowserManager();
// Returns true if this renderer process is hosting an extension.
static bool IsExtensionProcess();
// Returns true if this renderer process is hosting a PDF.
static bool IsPdfProcess();
private:
friend class CefBrowserImpl;
friend class CefGuestView;