summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
Diffstat (limited to 'ui')
-rw-r--r--ui/gfx/render_text.h5
-rw-r--r--ui/gfx/render_text_harfbuzz.cc38
-rw-r--r--ui/gfx/render_text_harfbuzz.h5
-rw-r--r--ui/gfx/render_text_win.cc8
4 files changed, 31 insertions, 25 deletions
diff --git a/ui/gfx/render_text.h b/ui/gfx/render_text.h
index f5cb746..e5a17a1 100644
--- a/ui/gfx/render_text.h
+++ b/ui/gfx/render_text.h
@@ -163,9 +163,8 @@ struct Line {
// Segments that make up this line in visual order.
std::vector<LineSegment> segments;
- // A line size is the sum of segment widths and the maximum of segment
- // heights.
- Size size;
+ // The sum of segment widths and the maximum of segment heights.
+ SizeF size;
// Sum of preceding lines' heights.
int preceding_heights;
diff --git a/ui/gfx/render_text_harfbuzz.cc b/ui/gfx/render_text_harfbuzz.cc
index a1aced1..c808376 100644
--- a/ui/gfx/render_text_harfbuzz.cc
+++ b/ui/gfx/render_text_harfbuzz.cc
@@ -433,8 +433,8 @@ void GetClusterAtImpl(size_t pos,
namespace internal {
TextRunHarfBuzz::TextRunHarfBuzz()
- : width(0),
- preceding_run_widths(0),
+ : width(0.0f),
+ preceding_run_widths(0.0f),
is_rtl(false),
level(0),
script(USCRIPT_INVALID_CODE),
@@ -497,8 +497,10 @@ Range TextRunHarfBuzz::GetGraphemeBounds(
base::i18n::BreakIterator* grapheme_iterator,
size_t text_index) {
DCHECK_LT(text_index, range.end());
+ // TODO(msw): Support floating point grapheme bounds.
+ const int preceding_run_widths_int = SkScalarRoundToInt(preceding_run_widths);
if (glyph_count == 0)
- return Range(preceding_run_widths, preceding_run_widths + width);
+ return Range(preceding_run_widths_int, preceding_run_widths_int + width);
Range chars;
Range glyphs;
@@ -532,13 +534,13 @@ Range TextRunHarfBuzz::GetGraphemeBounds(
cluster_width * before / static_cast<float>(total));
const int grapheme_end_x = cluster_begin_x + static_cast<int>(0.5f +
cluster_width * (before + 1) / static_cast<float>(total));
- return Range(preceding_run_widths + grapheme_begin_x,
- preceding_run_widths + grapheme_end_x);
+ return Range(preceding_run_widths_int + grapheme_begin_x,
+ preceding_run_widths_int + grapheme_end_x);
}
}
- return Range(preceding_run_widths + cluster_begin_x,
- preceding_run_widths + cluster_end_x);
+ return Range(preceding_run_widths_int + cluster_begin_x,
+ preceding_run_widths_int + cluster_end_x);
}
} // namespace internal
@@ -550,6 +552,11 @@ RenderTextHarfBuzz::RenderTextHarfBuzz()
RenderTextHarfBuzz::~RenderTextHarfBuzz() {}
Size RenderTextHarfBuzz::GetStringSize() {
+ const SizeF size_f = GetStringSizeF();
+ return Size(std::ceil(size_f.width()), size_f.height());
+}
+
+SizeF RenderTextHarfBuzz::GetStringSizeF() {
EnsureLayout();
return lines()[0].size;
}
@@ -789,7 +796,7 @@ void RenderTextHarfBuzz::EnsureLayout() {
ShapeRun(runs_[i]);
// Precalculate run width information.
- size_t preceding_run_widths = 0;
+ float preceding_run_widths = 0.0f;
for (size_t i = 0; i < runs_.size(); ++i) {
internal::TextRunHarfBuzz* run = runs_[visual_to_logical_[i]];
run->preceding_run_widths = preceding_run_widths;
@@ -826,7 +833,7 @@ void RenderTextHarfBuzz::EnsureLayout() {
lines[0].size.set_width(lines[0].size.width() + run.width);
lines[0].size.set_height(std::max(lines[0].size.height(),
- SkScalarRoundToInt(metrics.fDescent - metrics.fAscent)));
+ metrics.fDescent - metrics.fAscent));
lines[0].baseline = std::max(lines[0].baseline,
SkScalarRoundToInt(-metrics.fAscent));
}
@@ -1071,7 +1078,7 @@ void RenderTextHarfBuzz::ShapeRun(internal::TextRunHarfBuzz* run) {
}
run->glyph_count = 0;
- run->width = 0;
+ run->width = 0.0f;
}
bool RenderTextHarfBuzz::ShapeRunWithFont(internal::TextRunHarfBuzz* run,
@@ -1109,17 +1116,14 @@ bool RenderTextHarfBuzz::ShapeRunWithFont(internal::TextRunHarfBuzz* run,
run->glyphs.reset(new uint16[run->glyph_count]);
run->glyph_to_char.resize(run->glyph_count);
run->positions.reset(new SkPoint[run->glyph_count]);
- run->width = 0;
+ run->width = 0.0f;
for (size_t i = 0; i < run->glyph_count; ++i) {
run->glyphs[i] = infos[i].codepoint;
run->glyph_to_char[i] = infos[i].cluster;
- const int x_offset =
- SkScalarRoundToInt(SkFixedToScalar(hb_positions[i].x_offset));
- const int y_offset =
- SkScalarRoundToInt(SkFixedToScalar(hb_positions[i].y_offset));
+ const int x_offset = SkFixedToScalar(hb_positions[i].x_offset);
+ const int y_offset = SkFixedToScalar(hb_positions[i].y_offset);
run->positions[i].set(run->width + x_offset, -y_offset);
- run->width +=
- SkScalarRoundToInt(SkFixedToScalar(hb_positions[i].x_advance));
+ run->width += SkFixedToScalar(hb_positions[i].x_advance);
}
hb_buffer_destroy(buffer);
diff --git a/ui/gfx/render_text_harfbuzz.h b/ui/gfx/render_text_harfbuzz.h
index b028a37a..e84ca48 100644
--- a/ui/gfx/render_text_harfbuzz.h
+++ b/ui/gfx/render_text_harfbuzz.h
@@ -48,8 +48,8 @@ struct GFX_EXPORT TextRunHarfBuzz {
// Returns whether the given shaped run contains any missing glyphs.
bool HasMissingGlyphs() const;
- int width;
- int preceding_run_widths;
+ float width;
+ float preceding_run_widths;
Range range;
bool is_rtl;
UBiDiLevel level;
@@ -80,6 +80,7 @@ class GFX_EXPORT RenderTextHarfBuzz : public RenderText {
// Overridden from RenderText.
virtual Size GetStringSize() OVERRIDE;
+ virtual SizeF GetStringSizeF() OVERRIDE;
virtual SelectionModel FindCursorPosition(const Point& point) OVERRIDE;
virtual std::vector<FontSpan> GetFontSpansForTesting() OVERRIDE;
virtual Range GetGlyphBounds(size_t index) OVERRIDE;
diff --git a/ui/gfx/render_text_win.cc b/ui/gfx/render_text_win.cc
index c7cb934..e76e6db 100644
--- a/ui/gfx/render_text_win.cc
+++ b/ui/gfx/render_text_win.cc
@@ -17,6 +17,7 @@
#include "ui/gfx/canvas.h"
#include "ui/gfx/font_fallback_win.h"
#include "ui/gfx/font_render_params.h"
+#include "ui/gfx/geometry/size_conversions.h"
#include "ui/gfx/platform_font_win.h"
#include "ui/gfx/utf16_indexing.h"
@@ -389,8 +390,9 @@ class LineBreaker {
line->baseline = line_ascent_;
line->size.set_height(line_ascent_ + line_descent_);
line->preceding_heights = total_size_.height();
- total_size_.set_height(total_size_.height() + line->size.height());
- total_size_.set_width(std::max(total_size_.width(), line->size.width()));
+ const Size line_size(ToCeiledSize(line->size));
+ total_size_.set_height(total_size_.height() + line_size.height());
+ total_size_.set_width(std::max(total_size_.width(), line_size.width()));
}
line_x_ = 0;
line_ascent_ = 0;
@@ -762,7 +764,7 @@ void RenderTextWin::DrawVisualText(Canvas* canvas) {
// Skip painting empty lines or lines outside the display rect area.
if (!display_rect().Intersects(Rect(PointAtOffsetFromOrigin(line_offset),
- line.size)))
+ ToCeiledSize(line.size))))
continue;
const Vector2d text_offset = line_offset + Vector2d(0, line.baseline);
generated by cgit v1.1 at 2025-02-02 23:15:55 +0000