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

Unified Diff: chrome/renderer/pepper/chrome_pdf_print_client.cc

Issue 2426503002: Make printing work better with OOPIF. (Closed)
Patch Set: Fix build, fix some tests Created 4 years, 2 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
Index: chrome/renderer/pepper/chrome_pdf_print_client.cc
diff --git a/chrome/renderer/pepper/chrome_pdf_print_client.cc b/chrome/renderer/pepper/chrome_pdf_print_client.cc
index a0d8feed42cb2204b3f47a3b4cd26b78e6ffa6a4..4085c1025c1677e0ffbdf34e2bfcca60ec90d394 100644
--- a/chrome/renderer/pepper/chrome_pdf_print_client.cc
+++ b/chrome/renderer/pepper/chrome_pdf_print_client.cc
@@ -6,7 +6,7 @@
#include "components/printing/renderer/print_web_view_helper.h"
#include "content/public/renderer/pepper_plugin_instance.h"
-#include "content/public/renderer/render_view.h"
+#include "content/public/renderer/render_frame.h"
#include "third_party/WebKit/public/web/WebDocument.h"
#include "third_party/WebKit/public/web/WebElement.h"
#include "third_party/WebKit/public/web/WebLocalFrame.h"
@@ -25,18 +25,17 @@ blink::WebElement GetWebElement(PP_Instance instance_id) {
printing::PrintWebViewHelper* GetPrintWebViewHelper(
const blink::WebElement& element) {
if (element.isNull())
- return NULL;
- blink::WebView* view = element.document().frame()->view();
- content::RenderView* render_view = content::RenderView::FromWebView(view);
- return printing::PrintWebViewHelper::Get(render_view);
+ return nullptr;
+ auto* render_frame =
+ content::RenderFrame::FromWebFrame(element.document().frame());
+ return printing::PrintWebViewHelper::Get(render_frame);
}
} // namespace
-ChromePDFPrintClient::ChromePDFPrintClient() {
-}
-ChromePDFPrintClient::~ChromePDFPrintClient() {
-}
+ChromePDFPrintClient::ChromePDFPrintClient() {}
+
+ChromePDFPrintClient::~ChromePDFPrintClient() {}
bool ChromePDFPrintClient::IsPrintingEnabled(PP_Instance instance_id) {
blink::WebElement element = GetWebElement(instance_id);
@@ -47,9 +46,8 @@ bool ChromePDFPrintClient::IsPrintingEnabled(PP_Instance instance_id) {
bool ChromePDFPrintClient::Print(PP_Instance instance_id) {
blink::WebElement element = GetWebElement(instance_id);
printing::PrintWebViewHelper* helper = GetPrintWebViewHelper(element);
- if (helper) {
- helper->PrintNode(element);
- return true;
- }
- return false;
+ if (!helper)
+ return false;
+ helper->PrintNode(element);
+ return true;
}

Powered by Google App Engine
This is Rietveld 408576698