Index: chrome/renderer/print_web_view_helper.cc |
diff --git a/chrome/renderer/print_web_view_helper.cc b/chrome/renderer/print_web_view_helper.cc |
index 1735d90b7e661e1a46a8eebc778efd4688d310ab..9504e9859e3248e99f3eb6ea7bbef805c309cd92 100644 |
--- a/chrome/renderer/print_web_view_helper.cc |
+++ b/chrome/renderer/print_web_view_helper.cc |
@@ -4,6 +4,10 @@ |
#include "chrome/renderer/print_web_view_helper.h" |
+#if defined(USE_SKIA) |
+#include <algorithm> |
+#include <cmath> |
+#endif |
#include <string> |
#include "base/command_line.h" |
@@ -36,8 +40,20 @@ |
#include "content/common/view_messages.h" |
#endif |
+#if defined(USE_SKIA) |
+#include "base/i18n/time_formatting.h" |
+#include "base/string_number_conversions.h" |
+#include "base/time.h" |
+#include "skia/ext/vector_canvas.h" |
+#include "skia/ext/vector_platform_device_skia.h" |
+#include "third_party/skia/include/core/SkTypeface.h" |
+#include "ui/base/text/text_elider.h" |
+#endif // USE_SKIA |
+ |
+using base::Time; |
using printing::ConvertPixelsToPoint; |
using printing::ConvertPixelsToPointDouble; |
+using printing::ConvertPointsToPixelDouble; |
using printing::ConvertUnit; |
using printing::ConvertUnitDouble; |
using WebKit::WebConsoleMessage; |
@@ -87,6 +103,8 @@ bool PrintMsg_Print_Params_IsEqual( |
oldParams.params.supports_alpha_blend == |
newParams.params.supports_alpha_blend && |
oldParams.pages.size() == newParams.pages.size() && |
+ oldParams.params.display_header_footer == |
+ newParams.params.display_header_footer && |
std::equal(oldParams.pages.begin(), oldParams.pages.end(), |
newParams.pages.begin()); |
} |
@@ -101,8 +119,210 @@ void CalculatePrintCanvasSize(const PrintMsg_Print_Params& print_params, |
print_params.desired_dpi)); |
} |
+#if defined(USE_SKIA) |
+// Splits the horizontal width equally into segments with an interstice |
+// between each segment. Returns the width of this segment. |
+SkScalar GetSegmentWidth(const PageSizeMargins& page_layout) { |
+ SkScalar page_width = page_layout.margin_left + |
+ page_layout.content_width + |
vandebo (ex-Chrome)
2011/08/03 19:00:05
nit: indent should be 4.
Aayush Kumar
2011/08/04 18:25:04
Done.
|
+ page_layout.margin_right; |
+ // Interstice is left at both ends of the page as well as between |
+ // each region, so 1 is added. |
+ SkScalar total_interstice_width = |
+ (printing::kSettingHeaderFooterHorizontalRegions + 1) * |
+ printing::kSettingHeaderFooterInterstice; |
+ return (page_width - total_interstice_width) / |
+ printing::kSettingHeaderFooterHorizontalRegions; |
vandebo (ex-Chrome)
2011/08/03 19:00:05
nit: indent should be 4.
Aayush Kumar
2011/08/04 18:25:04
Done.
|
+} |
+ |
+// Given a text, the positions, and the paint object, this method gets the |
+// coordinates and prints the text at those coordinates on the canvas. |
+void PrintHeaderFooterText( |
+ string16 text, |
+ SkPaint paint, |
+ skia::VectorCanvas* canvas, |
+ printing::HorizontalHeaderFooterPosition horizontal_position, |
+ printing::VerticalHeaderFooterPosition vertical_position, |
+ float webkit_scale_factor, |
+ const PageSizeMargins& page_layout, |
+ const SkScalar& max_text_width, |
vandebo (ex-Chrome)
2011/08/03 19:00:05
POD should be passed in directly... i.e. SkScalar
Aayush Kumar
2011/08/04 18:25:04
Done.
|
+ const gfx::Font& font, |
+ const SkScalar& space_for_descenders) { |
vandebo (ex-Chrome)
2011/08/03 19:00:05
and here
vandebo (ex-Chrome)
2011/08/03 19:00:05
I guess I misunderstood before... this isn't the s
Aayush Kumar
2011/08/04 18:25:04
Done.
Aayush Kumar
2011/08/04 18:25:04
Renamed back to "height_to_baseline"
vandebo (ex-Chrome)
2011/08/04 20:46:21
nit: hmm, maybe offset_to_baseline would be better
Aayush Kumar
2011/08/04 23:00:30
Done.
|
+ text = ui::ElideText(text, font, ConvertPointsToPixelDouble(max_text_width), |
+ false); |
+ |
+ size_t text_byte_length = text.length() * sizeof(char16); |
+ // Get the (x, y) coordinate from where printing of the current text should |
+ // start depending on the horizontal alignment (LEFT, RIGHT, CENTER) and |
+ // vertical alignment (TOP, BOTTOM). |
+ SkScalar text_width_in_points = paint.measureText(text.c_str(), |
+ text_byte_length); |
+ SkScalar x = 0; |
+ switch (horizontal_position) { |
+ case printing::LEFT: { |
vandebo (ex-Chrome)
2011/08/03 19:00:05
{}'s are not needed on the cases statements in thi
Aayush Kumar
2011/08/04 18:25:04
According to the google C++ style guide, braces se
vandebo (ex-Chrome)
2011/08/04 20:46:21
Indeed, but the overriding rule is to follow exist
Aayush Kumar
2011/08/04 23:00:30
Done.
|
+ x = printing::kSettingHeaderFooterInterstice - page_layout.margin_left; |
+ break; |
+ } |
+ case printing::RIGHT: { |
+ x = page_layout.content_width + page_layout.margin_right - |
+ printing::kSettingHeaderFooterInterstice - text_width_in_points; |
+ break; |
+ } |
+ case printing::CENTER: { |
+ SkScalar available_width = GetSegmentWidth(page_layout); |
+ x = available_width - page_layout.margin_left + |
+ (available_width - text_width_in_points) / 2; |
+ break; |
+ } |
+ default: { |
+ NOTREACHED(); |
+ } |
+ } |
+ |
+ SkScalar y = 0; |
+ switch (vertical_position) { |
+ case printing::TOP: { |
+ y = printing::kSettingHeaderFooterInterstice - |
+ page_layout.margin_top - space_for_descenders; |
+ break; |
+ } |
+ case printing::BOTTOM: { |
+ y = page_layout.margin_bottom + page_layout.content_height - |
+ printing::kSettingHeaderFooterInterstice - space_for_descenders; |
+ break; |
+ } |
+ default: { |
+ NOTREACHED(); |
+ } |
+ } |
+ |
+ x = x / webkit_scale_factor; |
+ y = y / webkit_scale_factor; |
+ paint.setTextSize(paint.getTextSize() / webkit_scale_factor); |
+ canvas->drawText(text.c_str(), text_byte_length, x, y, paint); |
+} |
+#endif // USE_SKIA |
+ |
} // namespace |
+#if defined(USE_SKIA) |
+// static - Not anonymous so that platform implementations can use it. |
+void PrintWebViewHelper::PrintHeaderAndFooter( |
+ SkDevice* device, |
+ skia::VectorCanvas* canvas, |
+ int page_number, |
+ int total_pages, |
+ float webkit_scale_factor, |
+ const PageSizeMargins& page_layout, |
+ const DictionaryValue& header_footer_info) { |
+ // Set the drawing area to draw in the margins. |
+ static_cast<skia::VectorPlatformDeviceSkia*>(device)->setDrawingArea( |
+ SkPDFDevice::kMargin_DrawingArea); |
+ |
+ // Setting up styles for the headers and footers text. |
+ SkPaint paint; |
+ paint.setColor(SK_ColorBLACK); |
+ paint.setTextEncoding(SkPaint::kUTF16_TextEncoding); |
+ paint.setTextSize(printing::kSettingHeaderFooterFontSize); |
+ gfx::Font font(UTF8ToUTF16(printing::kSettingHeaderFooterFontName), |
+ ceil(ConvertPointsToPixelDouble( |
+ printing::kSettingHeaderFooterFontSize))); |
+ paint.setTypeface(SkTypeface::CreateFromName( |
+ UTF16ToUTF8(font.GetFontName()).c_str(), SkTypeface::kNormal)); |
+ |
+ // Ensure we have enough space to print above and below the page to print |
+ // headers. |
+ string16 date = base::TimeFormatShortDateNumeric(Time::Now()); |
+ string16 title; |
+ if (!header_footer_info.GetString(printing::kSettingHeaderFooterTitle, |
+ &title)) { |
+ NOTREACHED(); |
+ } |
+ |
+ SkRect header_bounds; |
vandebo (ex-Chrome)
2011/08/03 19:00:05
Put header_bounds below header_text
Aayush Kumar
2011/08/04 18:25:04
Done.
|
+ string16 header_text = date + title; |
+ paint.measureText(header_text.c_str(), header_text.length() * sizeof(char16), |
+ &header_bounds, 0); |
+ |
+ SkScalar text_height = |
+ printing::kSettingHeaderFooterInterstice + header_bounds.height(); |
+ |
+ if (text_height > page_layout.margin_top) |
+ return; |
+ |
+ // Ensure we have enough space to print above and below the page to print |
+ // footers. |
+ string16 page_of_total_pages = base::IntToString16(page_number) + |
+ UTF8ToUTF16("/") + |
+ base::IntToString16(total_pages); |
+ std::string url; |
+ if (!header_footer_info.GetString(printing::kSettingHeaderFooterURL, |
+ &url)) { |
+ NOTREACHED(); |
+ } |
+ |
+ SkRect footer_bounds; |
vandebo (ex-Chrome)
2011/08/03 19:00:05
Put footer_bounds below footer_text
Aayush Kumar
2011/08/04 18:25:04
Done.
|
+ string16 footer_text = page_of_total_pages + UTF8ToUTF16(url); |
+ paint.measureText(footer_text.c_str(), footer_text.length() * sizeof(char16), |
+ &footer_bounds, 0); |
+ |
+ text_height = |
+ printing::kSettingHeaderFooterInterstice + footer_bounds.height(); |
+ |
+ if (text_height > page_layout.margin_bottom) |
+ return; |
+ |
+ SkScalar segment_width = GetSegmentWidth(page_layout); |
+ // Print the Date. |
vandebo (ex-Chrome)
2011/08/03 19:00:05
Redundant comment.
Aayush Kumar
2011/08/04 18:25:04
Done.
|
+ PrintHeaderFooterText(date, paint, canvas, printing::LEFT, printing::TOP, |
+ webkit_scale_factor, page_layout, segment_width, font, |
+ header_bounds.top()); |
+ |
+ // Print the title. |
vandebo (ex-Chrome)
2011/08/03 19:00:05
Redundant comment.
Aayush Kumar
2011/08/04 18:25:04
Done.
|
+ SkScalar date_width = paint.measureText(date.c_str(), |
+ date.length() * sizeof(char16)); |
+ // Calculate the available title width. If the date string is not long |
+ // enough, then, we increase the available space we have for the title. |
+ // Assumes there is no header text to RIGHT of title. |
+ SkScalar max_title_width = std::min(2 * segment_width, |
+ 2 * (segment_width - date_width) + |
+ segment_width); |
+ PrintHeaderFooterText(title, paint, canvas, printing::CENTER, |
+ printing::TOP, webkit_scale_factor, page_layout, |
+ max_title_width, font, header_bounds.top()); |
+ |
+ // Print the page numbers at the bottom right corner of page. |
vandebo (ex-Chrome)
2011/08/03 19:00:05
Redundant comment.
Aayush Kumar
2011/08/04 18:25:04
Done.
|
+ PrintHeaderFooterText(page_of_total_pages, paint, canvas, printing::RIGHT, |
+ printing::BOTTOM, webkit_scale_factor, page_layout, |
+ segment_width, font, footer_bounds.bottom()); |
+ |
+ // Print the URL. |
vandebo (ex-Chrome)
2011/08/03 19:00:05
Redundant comment.
Aayush Kumar
2011/08/04 18:25:04
Done.
|
+ GURL gurl(url); |
+ SkScalar page_width = paint.measureText( |
+ page_of_total_pages.c_str(), |
+ page_of_total_pages.length() * sizeof(char16)); |
+ |
+ // Calculate the available URL width. We increase the available URL width |
+ // if the |page_of_total_pages| string isn't long enough. |
+ // Assumes no footer text being printed in the CENTER. |
+ SkScalar max_url_width = |
+ (page_layout.content_width + page_layout.margin_left + |
+ page_layout.margin_right) * 3 / 4; |
+ max_url_width = std::min(max_url_width, |
+ 2 * (segment_width - page_width) + segment_width); |
+ string16 url_elided = ui::ElideUrl(gurl, font, |
+ ConvertPointsToPixelDouble(max_url_width), |
+ std::string()); |
+ PrintHeaderFooterText(url_elided, paint, canvas, printing::LEFT, |
+ printing::BOTTOM, webkit_scale_factor, page_layout, |
+ max_url_width, font, footer_bounds.bottom()); |
+ |
+ // Restore the drawing area to draw in the content area. |
vandebo (ex-Chrome)
2011/08/03 19:00:05
Redundant comment.
Aayush Kumar
2011/08/04 18:25:04
Done.
|
+ static_cast<skia::VectorPlatformDeviceSkia*>(device)->setDrawingArea( |
+ SkPDFDevice::kContent_DrawingArea); |
+} |
+#endif // USE_SKIA |
+ |
PrepareFrameAndViewForPrint::PrepareFrameAndViewForPrint( |
const PrintMsg_Print_Params& print_params, |
WebFrame* frame, |
@@ -256,7 +476,7 @@ void PrintWebViewHelper::OnPrintForPrintPreview( |
return; |
} |
- if (!UpdatePrintSettings(job_settings)) { |
+ if (!UpdatePrintSettings(const_cast<DictionaryValue*>(&job_settings))) { |
DidFinishPrinting(FAIL_PRINT); |
return; |
} |
@@ -314,7 +534,7 @@ void PrintWebViewHelper::OnPrintPreview(const DictionaryValue& settings) { |
return; |
} |
- if (!UpdatePrintSettings(settings)) { |
+ if (!UpdatePrintSettings(const_cast<DictionaryValue*>(&settings))) { |
DidFinishPrinting(FAIL_PREVIEW); |
return; |
} |
@@ -760,20 +980,46 @@ bool PrintWebViewHelper::UpdatePrintSettingsRequestId( |
return true; |
} |
-bool PrintWebViewHelper::UpdatePrintSettings( |
- const DictionaryValue& job_settings) { |
+bool PrintWebViewHelper::UpdatePrintSettings(DictionaryValue* job_settings) { |
PrintMsg_PrintPages_Params settings; |
Send(new PrintHostMsg_UpdatePrintSettings(routing_id(), |
- print_pages_params_->params.document_cookie, job_settings, &settings)); |
+ print_pages_params_->params.document_cookie, *job_settings, &settings)); |
if (settings.params.dpi < kMinDpi || !settings.params.document_cookie) |
return false; |
- if (!UpdatePrintSettingsRequestId(job_settings, &(settings.params))) |
+ if (!UpdatePrintSettingsRequestId(*job_settings, &(settings.params))) |
return false; |
print_pages_params_.reset(new PrintMsg_PrintPages_Params(settings)); |
+ // Getting Header and Footer settings. |
+ bool display_header_footer = false; |
+ if (!job_settings->GetBoolean(printing::kSettingHeaderFooter, |
+ &display_header_footer)) { |
+ NOTREACHED(); |
+ } |
+ if (!job_settings->Remove(printing::kSettingHeaderFooter, NULL)) |
vandebo (ex-Chrome)
2011/08/03 19:00:05
I don't think it's worth the effort to remove thes
Aayush Kumar
2011/08/04 18:25:04
Done.
|
+ NOTREACHED(); |
+ print_pages_params_->params.display_header_footer = display_header_footer; |
+ |
+ if (display_header_footer) { |
+ string16 title; |
+ std::string url; |
+ if (!job_settings->GetString(printing::kSettingHeaderFooterTitle, &title) || |
+ !job_settings->GetString(printing::kSettingHeaderFooterURL, &url)) { |
+ NOTREACHED(); |
+ } |
+ header_footer_info_.reset(new DictionaryValue()); |
+ header_footer_info_->SetString(printing::kSettingHeaderFooterURL, url); |
+ header_footer_info_->SetString(printing::kSettingHeaderFooterTitle, title); |
+ |
+ if (!job_settings->Remove(printing::kSettingHeaderFooterTitle, NULL) || |
+ !job_settings->Remove(printing::kSettingHeaderFooterURL, NULL)) { |
+ NOTREACHED(); |
+ } |
+ } |
+ |
Send(new PrintHostMsg_DidGetDocumentCookie(routing_id(), |
settings.params.document_cookie)); |
return true; |