Commit e1980a67 authored by Ian Kilpatrick's avatar Ian Kilpatrick Committed by Commit Bot

[cleanup] Remove NGLineBreaker::in_line_height_quirks_mode_

... and other related removals.

There should be no behaviour change.

Change-Id: I4dc82343233a8be2fe32d590cc44194ab372c8b1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2446171
Auto-Submit: Ian Kilpatrick <ikilpatrick@chromium.org>
Commit-Queue: Koji Ishii <kojii@chromium.org>
Reviewed-by: default avatarKoji Ishii <kojii@chromium.org>
Cr-Commit-Position: refs/heads/master@{#813556}
parent ff1b9110
...@@ -68,10 +68,8 @@ NGInlineLayoutAlgorithm::NGInlineLayoutAlgorithm( ...@@ -68,10 +68,8 @@ NGInlineLayoutAlgorithm::NGInlineLayoutAlgorithm(
box_states_(nullptr), box_states_(nullptr),
context_(context), context_(context),
baseline_type_(container_builder_.Style().GetFontBaseline()), baseline_type_(container_builder_.Style().GetFontBaseline()),
is_horizontal_writing_mode_( quirks_mode_(inline_node.GetDocument().InLineHeightQuirksMode()) {
blink::IsHorizontalWritingMode(space.GetWritingMode())) {
DCHECK(context); DCHECK(context);
quirks_mode_ = inline_node.InLineHeightQuirksMode();
} }
// Define the destructor here, so that we can forward-declare more in the // Define the destructor here, so that we can forward-declare more in the
......
...@@ -63,8 +63,6 @@ class CORE_EXPORT NGInlineLayoutAlgorithm final ...@@ -63,8 +63,6 @@ class CORE_EXPORT NGInlineLayoutAlgorithm final
LayoutObject* floating_object, LayoutObject* floating_object,
NGExclusionSpace*) const; NGExclusionSpace*) const;
bool IsHorizontalWritingMode() const { return is_horizontal_writing_mode_; }
void PrepareBoxStates(const NGLineInfo&, const NGInlineBreakToken*); void PrepareBoxStates(const NGLineInfo&, const NGInlineBreakToken*);
void RebuildBoxStates(const NGLineInfo&, void RebuildBoxStates(const NGLineInfo&,
const NGInlineBreakToken*, const NGInlineBreakToken*,
...@@ -126,7 +124,8 @@ class CORE_EXPORT NGInlineLayoutAlgorithm final ...@@ -126,7 +124,8 @@ class CORE_EXPORT NGInlineLayoutAlgorithm final
FontBaseline baseline_type_ = FontBaseline::kAlphabeticBaseline; FontBaseline baseline_type_ = FontBaseline::kAlphabeticBaseline;
unsigned is_horizontal_writing_mode_ : 1; // True if in quirks or limited-quirks mode, which require line-height quirks.
// https://quirks.spec.whatwg.org/#the-line-height-calculation-quirk
unsigned quirks_mode_ : 1; unsigned quirks_mode_ : 1;
#if DCHECK_IS_ON() #if DCHECK_IS_ON()
......
...@@ -35,13 +35,6 @@ class CORE_EXPORT NGInlineNode : public NGLayoutInputNode { ...@@ -35,13 +35,6 @@ class CORE_EXPORT NGInlineNode : public NGLayoutInputNode {
} }
NGLayoutInputNode NextSibling() const { return nullptr; } NGLayoutInputNode NextSibling() const { return nullptr; }
// True in quirks mode or limited-quirks mode, which require line-height
// quirks.
// https://quirks.spec.whatwg.org/#the-line-height-calculation-quirk
bool InLineHeightQuirksMode() const {
return GetDocument().InLineHeightQuirksMode();
}
scoped_refptr<const NGLayoutResult> Layout( scoped_refptr<const NGLayoutResult> Layout(
const NGConstraintSpace&, const NGConstraintSpace&,
const NGBreakToken*, const NGBreakToken*,
......
...@@ -180,7 +180,6 @@ NGLineBreaker::NGLineBreaker(NGInlineNode node, ...@@ -180,7 +180,6 @@ NGLineBreaker::NGLineBreaker(NGInlineNode node,
node.CanContainFirstFormattedLine()), node.CanContainFirstFormattedLine()),
use_first_line_style_(is_first_formatted_line_ && use_first_line_style_(is_first_formatted_line_ &&
node.UseFirstLineStyle()), node.UseFirstLineStyle()),
in_line_height_quirks_mode_(node.InLineHeightQuirksMode()),
sticky_images_quirk_(mode != NGLineBreakerMode::kContent && sticky_images_quirk_(mode != NGLineBreakerMode::kContent &&
node.IsStickyImagesQuirkForContentSize()), node.IsStickyImagesQuirkForContentSize()),
items_data_(node.ItemsData(use_first_line_style_)), items_data_(node.ItemsData(use_first_line_style_)),
......
...@@ -254,11 +254,6 @@ class CORE_EXPORT NGLineBreaker { ...@@ -254,11 +254,6 @@ class CORE_EXPORT NGLineBreaker {
// True when breaking at soft hyphens (U+00AD) is allowed. // True when breaking at soft hyphens (U+00AD) is allowed.
bool enable_soft_hyphen_ = true; bool enable_soft_hyphen_ = true;
// True in quirks mode or limited-quirks mode, which require line-height
// quirks.
// https://quirks.spec.whatwg.org/#the-line-height-calculation-quirk
bool in_line_height_quirks_mode_ = false;
// True when the line we are breaking has a list marker. // True when the line we are breaking has a list marker.
bool has_list_marker_ = false; bool has_list_marker_ = false;
......
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