summaryrefslogtreecommitdiff
path: root/chromium/chrome/renderer/printing
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-12 14:27:29 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-13 09:35:20 +0000
commitc30a6232df03e1efbd9f3b226777b07e087a1122 (patch)
treee992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/chrome/renderer/printing
parent7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff)
downloadqtwebengine-chromium-85-based.tar.gz
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/chrome/renderer/printing')
-rw-r--r--chromium/chrome/renderer/printing/chrome_print_render_frame_helper_delegate.cc12
1 files changed, 8 insertions, 4 deletions
diff --git a/chromium/chrome/renderer/printing/chrome_print_render_frame_helper_delegate.cc b/chromium/chrome/renderer/printing/chrome_print_render_frame_helper_delegate.cc
index 49086491846..8fd541ac8bf 100644
--- a/chromium/chrome/renderer/printing/chrome_print_render_frame_helper_delegate.cc
+++ b/chromium/chrome/renderer/printing/chrome_print_render_frame_helper_delegate.cc
@@ -43,10 +43,14 @@ blink::WebElement ChromePrintRenderFrameHelperDelegate::GetPdfElement(
url.host_piece() == extension_misc::kPdfExtensionId;
if (inside_print_preview || inside_pdf_extension) {
// <object> with id="plugin" is created in
- // chrome/browser/resources/pdf/pdf_viewer.js.
- auto plugin_element = frame->GetDocument().GetElementById("plugin");
- if (!plugin_element.IsNull()) {
- return plugin_element;
+ // chrome/browser/resources/pdf/pdf_viewer_base.js.
+ auto viewer_element = frame->GetDocument().GetElementById("viewer");
+ if (!viewer_element.IsNull() && !viewer_element.ShadowRoot().IsNull()) {
+ auto plugin_element =
+ viewer_element.ShadowRoot().QuerySelector("#plugin");
+ if (!plugin_element.IsNull()) {
+ return plugin_element;
+ }
}
NOTREACHED();
}