Chromium Code Reviews| 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 7f7030dedd9888cd34f06abed2e2f9ef2ef2e1aa..9844b251b2fa2eb70341fa44585421be57d45a0c 100644 |
| --- a/chrome/renderer/print_web_view_helper.cc |
| +++ b/chrome/renderer/print_web_view_helper.cc |
| @@ -383,7 +383,7 @@ SkPoint GetHeaderFooterPosition( |
| void PrintHeaderFooterText( |
| const string16& text, |
| WebKit::WebCanvas* canvas, |
| - HeaderFooterPaint paint, |
| + const HeaderFooterPaint& paint, |
| float webkit_scale_factor, |
| const PageSizeMargins& page_layout, |
| printing::HorizontalHeaderFooterPosition horizontal_position, |
| @@ -397,10 +397,7 @@ void PrintHeaderFooterText( |
| horizontal_position, |
| vertical_position, offset_to_baseline, |
| text_width_in_points); |
| - paint.setTextSize(SkDoubleToScalar( |
| - paint.getTextSize() / webkit_scale_factor)); |
| - canvas->drawText(text.c_str(), text_byte_length, point.x(), point.y(), |
| - paint); |
| + canvas->drawText(text.c_str(), text_byte_length, point.x(), point.y(), paint); |
| #elif defined(OS_MACOSX) |
| ScopedCFTypeRef<CFStringRef> cf_text(base::SysUTF16ToCFStringRef(text)); |
| ScopedCFTypeRef<CFAttributedStringRef> cf_attr_text( |
| @@ -485,7 +482,8 @@ void PrintWebViewHelper::PrintHeaderAndFooter( |
| SkPaint paint; |
| paint.setColor(SK_ColorBLACK); |
| paint.setTextEncoding(SkPaint::kUTF16_TextEncoding); |
| - paint.setTextSize(SkDoubleToScalar(printing::kSettingHeaderFooterFontSize)); |
| + paint.setTextSize(SkDoubleToScalar( |
| + printing::kSettingHeaderFooterFontSize / webkit_scale_factor)); |
|
groby-ooo-7-16
2012/02/13 01:19:34
Are you sure setTextSize can be hoisted up to here
|
| paint.setTypeface(SkTypeface::CreateFromName( |
| printing::kSettingHeaderFooterFontFamilyName, SkTypeface::kNormal)); |
| #elif defined(OS_MACOSX) |