From d961508014c7d95571a3a7c1a65a0dbac17a3191 Mon Sep 17 00:00:00 2001 From: "sanjeevr@chromium.org" Date: Fri, 12 Mar 2010 18:41:34 +0000 Subject: Fixed the Pepper print interface to take in the print dimensions and printer DPI only in the PrintBegin method. The plugin is expected to remember this until PrintEnd is called. BUG=None TEST=Test printing with plugins that support the new interface Review URL: http://codereview.chromium.org/858007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41453 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/glue/webplugin_impl.cc | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'webkit/glue/webplugin_impl.cc') diff --git a/webkit/glue/webplugin_impl.cc b/webkit/glue/webplugin_impl.cc index ec7bf71..e797676 100644 --- a/webkit/glue/webplugin_impl.cc +++ b/webkit/glue/webplugin_impl.cc @@ -389,26 +389,17 @@ int WebPluginImpl::printBegin(const WebRect& printable_area, int printer_dpi) { if (!supportsPaginatedPrint()) return 0; - print_settings_.is_printing = true; - print_settings_.printable_area = printable_area; - print_settings_.printer_dpi = printer_dpi; return delegate_->PrintBegin(printable_area, printer_dpi); } bool WebPluginImpl::printPage(int page_number, WebCanvas* canvas) { if (!delegate_) return false; - if (!print_settings_.is_printing) { - NOTREACHED(); - return false; - } - return delegate_->PrintPage(page_number, print_settings_.printable_area, - print_settings_.printer_dpi, canvas); + + return delegate_->PrintPage(page_number, canvas); } void WebPluginImpl::printEnd() { - DCHECK(print_settings_.is_printing); - print_settings_.Clear(); if (delegate_) delegate_->PrintEnd(); } -- cgit v1.1