bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

39
libcef/renderer/render_manager.cc
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)));