Skip to content

GitLab

T
tangled
Commit 8ecd46b9 authored by Yoshifumi Inoue's avatar Yoshifumi Inoue Committed by Commit Bot
Browse files
Options

Make NGInlineNode::ShapeText() not to reuse ShapeResult for letter-spacing 

This patch changes |NGInlineNode::ShapeText()| not to reuse
|ShapeResult| for text with CSS property "letter-spacing" because we
modify |ShapeResult| directly to apply letter spacing. Thus, letter-
spacing is applied more than once on reused portion of |ShapeResult|.

Bug: 1124446
Change-Id: I8f0f45f613c872649e46fe96e031e9532a05bbe9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2390927
Commit-Queue: Yoshifumi Inoue <yosin@chromium.org>
Auto-Submit: Yoshifumi Inoue <yosin@chromium.org>
Reviewed-by: default avatarKent Tamura <tkent@chromium.org>
Cr-Commit-Position: refs/heads/master@{#804147}
parent 5adb6b54
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 1 deletion
third_party/blink/renderer/core/layout/ng/inline/ng_inline_node.cc
View file @ 8ecd46b9
......@@ -231,6 +231,8 @@ class ReusingTextShaper final {
continue;
if (!item->TextShapeResult() || item->Direction() != direction)
continue;
if (item->TextShapeResult()->IsAppliedSpacing())
continue;
shape_results.push_back(item->TextShapeResult());
}
return shape_results;
......
third_party/blink/renderer/platform/fonts/shaping/shape_result.cc
View file @ 8ecd46b9
......@@ -370,7 +370,8 @@ ShapeResult::ShapeResult(scoped_refptr<const SimpleFontData> font_data,
num_characters_(num_characters),
num_glyphs_(0),
direction_(static_cast<unsigned>(direction)),
has_vertical_offsets_(0) {}
has_vertical_offsets_(false),
is_applied_spacing_(false) {}
ShapeResult::ShapeResult(const Font* font,
unsigned start_index,
......@@ -892,6 +893,7 @@ void ShapeResult::ApplySpacingImpl(
void ShapeResult::ApplySpacing(ShapeResultSpacing<String>& spacing,
int text_start_offset) {
is_applied_spacing_ = true;
ApplySpacingImpl(spacing, text_start_offset);
}
......
third_party/blink/renderer/platform/fonts/shaping/shape_result.h
View file @ 8ecd46b9
......@@ -185,6 +185,9 @@ class PLATFORM_EXPORT ShapeResult : public RefCounted<ShapeResult> {
// have vertical offsets.
bool HasVerticalOffsets() const { return has_vertical_offsets_; }
// Note: We should not reuse |ShapeResult| if we call |ApplySpacing()|.
bool IsAppliedSpacing() const { return is_applied_spacing_; }
// For memory reporting.
size_t ByteSize() const;
......@@ -500,6 +503,9 @@ class PLATFORM_EXPORT ShapeResult : public RefCounted<ShapeResult> {
// Tracks whether any runs contain glyphs with a y-offset != 0.
unsigned has_vertical_offsets_ : 1;
// True once called |ApplySpacing()|.
unsigned is_applied_spacing_ : 1;
private:
friend class HarfBuzzShaper;
friend class ShapeResultBuffer;
......
third_party/blink/web_tests/editing/inserting/typing_letter_spacing-expected.html 0 → 100644
View file @ 8ecd46b9
<!doctype html>
<script src="../../resources/ahem.js"></script>
<style>
#target {
font: 10px/15px Ahem;
letter-spacing: 20px;
}
</style>
<div id="target">abcx</div>
third_party/blink/web_tests/editing/inserting/typing_letter_spacing.html 0 → 100644
View file @ 8ecd46b9
<!doctype html>
<script src="../../resources/ahem.js"></script>
<style>
#target {
font: 10px/15px Ahem;
letter-spacing: 20px;
}
</style>
<div id="target">x</div>
<script>
const text = target.firstChild;
function typing(character) {
text.replaceData(0, 0, character);
document.body.offsetHeight;
}
typing('a');
typing('b');
typing('c');
</script>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment