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

Unified Diff: chrome/renderer/print_web_view_helper.cc

Issue 9111042: Fix RTL and complex script title in print preview header/footer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: User RenderText, Windows only solution Created 8 years, 8 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 b31cd851cfe5213c2219515b3dde4681cd01e5f7..06810fa48a8ccebd079f7d854c5f2a037646014b 100644
--- a/chrome/renderer/print_web_view_helper.cc
+++ b/chrome/renderer/print_web_view_helper.cc
@@ -49,6 +49,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.h"
+#include "ui/gfx/render_text.h"
+#endif // USE_SKIA && !defined(OS_MACOSX)
#elif defined(OS_MACOSX)
#include <CoreGraphics/CGContext.h>
@@ -406,6 +410,48 @@ void PrintHeaderFooterText(
printing::VerticalHeaderFooterPosition vertical_position,
double offset_to_baseline) {
#if defined(USE_SKIA)
+#if defined(OS_WIN)
Alexei Svitkine (slow) 2012/05/02 15:04:05 It might be a good idea to refactor this to a sepa
arthurhsu 2012/05/03 00:28:44 Done.
+ // TODO(arthurhsu): Following code works on Windows only so far.
+ // See crbug.com/108599 and its blockers for more information.
+ scoped_ptr<gfx::RenderText> render_text(gfx::RenderText::CreateRenderText());
+ DCHECK(render_text.get());
Alexei Svitkine (slow) 2012/05/02 15:04:05 What does this DCHECK() buy you? If it's NULL, the
arthurhsu 2012/05/03 00:28:44 Done.
+ render_text->SetText(text);
+ int font_size = printing::kSettingHeaderFooterFontSize / webkit_scale_factor;
+ render_text->SetFontSize(font_size);
+ int font_height = render_text->GetStringSize().height() / webkit_scale_factor;
Alexei Svitkine (slow) 2012/05/02 15:04:05 It would be more accurate to name this |text_heigh
Alexei Svitkine (slow) 2012/05/02 15:23:58 Can you explain the webkit_scale_factor? It seems
xji 2012/05/02 17:44:12 it re-SetFontSize() based on this factor on line 4
arthurhsu 2012/05/03 00:28:44 Done.
+ int y_offset = font_height - font_size;
+ SkScalar margin_left = page_layout.margin_left / webkit_scale_factor;
+ SkScalar margin_top = page_layout.margin_top / webkit_scale_factor;
+ SkScalar content_height = page_layout.content_height / webkit_scale_factor;
+
+ int save_count = canvas->save();
+ canvas->translate(-margin_left, -margin_top);
+ scoped_ptr<gfx::Canvas> gfx_canvas(new gfx::Canvas(canvas));
Alexei Svitkine (slow) 2012/05/01 14:56:39 I'm wondering whether you've tried using Canvas::D
arthurhsu 2012/05/01 17:26:38 Actually, I tried not to use it for debugging purp
Alexei Svitkine (slow) 2012/05/02 15:04:05 I suggest moving the gfx_canvas declaration to rig
arthurhsu 2012/05/03 00:28:44 Done.
+ int text_width = render_text->GetStringSize().width() / webkit_scale_factor;
Alexei Svitkine (slow) 2012/05/02 15:04:05 Suggest just calling GetStringSize() once and stor
arthurhsu 2012/05/03 00:28:44 Done.
+ SkPoint point = GetHeaderFooterPosition(webkit_scale_factor, page_layout,
+ horizontal_position,
+ vertical_position, offset_to_baseline,
+ SkScalarToDouble(text_width));
+ point.set(point.x() + margin_left, point.y() + margin_top);
+ // Workaround clipping issue of RenderText.
+ if (vertical_position == printing::TOP) {
+ if (point.y() - y_offset + font_height < margin_top + 1) {
Alexei Svitkine (slow) 2012/05/02 15:23:58 I think this logic can be written in a way that's
arthurhsu 2012/05/03 00:28:44 I've added more comments on this. On 2012/05/02 1
+ y_offset = point.y() + font_height - margin_top - 1;
+ }
+ } else { // BOTTOM
+ if (point.y() - y_offset > margin_top + content_height - 1) {
+ y_offset = point.y() - margin_top - content_height + 1;
+ }
+ }
+
+ gfx::Rect rect(point.x(), point.y() - y_offset, text_width, font_height);
+ render_text->SetDisplayRect(rect);
+ render_text->Draw(gfx_canvas.get());
+ gfx_canvas.reset();
Alexei Svitkine (slow) 2012/05/02 15:04:05 Is it necessary to explicitly reset it here? You'r
arthurhsu 2012/05/03 00:28:44 I do not wish to assume that dtor of gfx::Canvas d
Alexei Svitkine (slow) 2012/05/03 19:04:41 If you want to be that paranoid, then I suggest us
arthurhsu 2012/05/07 17:28:06 Done.
+ canvas->restoreToCount(save_count);
+#else
+ // TODO(arthurhsu): following code has issues with i18n BiDi, see
+ // crbug.com/108599.
size_t text_byte_length = text.length() * sizeof(char16);
double text_width_in_points = SkScalarToDouble(paint.measureText(
text.c_str(), text_byte_length));
@@ -417,6 +463,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_WIN
#elif defined(OS_MACOSX)
ScopedCFTypeRef<CFStringRef> cf_text(base::SysUTF16ToCFStringRef(text));
ScopedCFTypeRef<CFAttributedStringRef> cf_attr_text(
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698