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 28d1babdec1348d64f9193a93e7b1c2adc260def..2f0a704ff35a82542dbda77607b0955bcf7ce6bb 100644 |
--- a/chrome/renderer/print_web_view_helper.cc |
+++ b/chrome/renderer/print_web_view_helper.cc |
@@ -45,6 +45,10 @@ |
#include "skia/ext/vector_canvas.h" |
#include "skia/ext/vector_platform_device_skia.h" |
#include "third_party/skia/include/core/SkTypeface.h" |
+#if !defined(OS_MACOSX) // USE_SKIA && !OS_MACOSX |
+#include "ui/gfx/canvas_skia.h" |
+#include "ui/gfx/render_text.h" |
+#endif // USE_SKIA && !defined(OS_MACOSX) |
#elif defined(OS_MACOSX) |
#include <CoreGraphics/CGContext.h> |
@@ -390,6 +394,38 @@ void PrintHeaderFooterText( |
printing::VerticalHeaderFooterPosition vertical_position, |
double offset_to_baseline) { |
#if defined(USE_SKIA) |
+#if !defined(OS_MACOSX) // RenderText does not support Mac yet. |
+ scoped_ptr<gfx::RenderText> render_text(gfx::RenderText::CreateRenderText()); |
+ DCHECK(render_text.get()); |
+ render_text->SetText(text); |
+ render_text->SetFontSize(printing::kSettingHeaderFooterFontSize); |
+ gfx::CanvasSkia gfx_canvas(canvas); |
+ SkISize device_size = gfx_canvas.GetSkCanvas()->getDeviceSize(); |
+ int height = render_text->GetFont().GetHeight() + |
+ printing::kSettingHeaderFooterInterstice + 1; |
+ int y = (vertical_position == printing::TOP) ? 1 - height : |
+ device_size.height() - 1; |
+ gfx::Rect rect(0, y, device_size.width(), height); |
vandebo (ex-Chrome)
2012/02/03 18:36:45
As far as I can tell, this moves where the headers
|
+ render_text->SetDisplayRect(rect); |
+ switch (horizontal_position) { |
+ case printing::LEFT: |
+ render_text->SetHorizontalAlignment(gfx::ALIGN_LEFT); |
+ break; |
+ case printing::RIGHT: |
+ render_text->SetHorizontalAlignment(gfx::ALIGN_RIGHT); |
+ break; |
+ case printing::CENTER: |
+ render_text->SetHorizontalAlignment(gfx::ALIGN_CENTER); |
+ break; |
+ default: |
+ NOTREACHED(); |
+ break; |
+ } |
+ render_text->Draw(&gfx_canvas); |
+#else |
+ // TODO(arthurhsu): following code has issues with i18n BiDi, see |
+ // crbug.com/108599. Need to remove it and use RenderText |
+ // code above once RenderText supports Mac. |
size_t text_byte_length = text.length() * sizeof(char16); |
double text_width_in_points = SkScalarToDouble(paint.measureText( |
text.c_str(), text_byte_length)); |
@@ -401,6 +437,7 @@ void PrintHeaderFooterText( |
paint.getTextSize() / webkit_scale_factor)); |
canvas->drawText(text.c_str(), text_byte_length, point.x(), point.y(), |
paint); |
+#endif // USE_SKIA && !OS_MACOSX |
#elif defined(OS_MACOSX) |
ScopedCFTypeRef<CFStringRef> cf_text(base::SysUTF16ToCFStringRef(text)); |
ScopedCFTypeRef<CFAttributedStringRef> cf_attr_text( |