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

Unified Diff: third_party/WebKit/Source/core/layout/ng/inline/ng_inline_layout_algorithm.h

Issue 2930963002: [LayoutNG] Refactor of NGLineBreaker. (Closed)
Patch Set: rebase Created 3 years, 6 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
Index: third_party/WebKit/Source/core/layout/ng/inline/ng_inline_layout_algorithm.h
diff --git a/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_layout_algorithm.h b/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_layout_algorithm.h
index 338d9a7348509f0b0bfef7856adcf1d3a10c3ba8..42dd4c471798b7112f7d2f931e3b8fd334285c27 100644
--- a/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_layout_algorithm.h
+++ b/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_layout_algorithm.h
@@ -14,6 +14,7 @@
#include "core/layout/ng/ng_constraint_space_builder.h"
#include "core/layout/ng/ng_fragment_builder.h"
#include "core/layout/ng/ng_layout_algorithm.h"
+#include "core/layout/ng/ng_layout_opportunity_iterator.h"
#include "platform/fonts/FontBaseline.h"
#include "platform/heap/Handle.h"
#include "platform/wtf/Vector.h"
@@ -39,9 +40,6 @@ class CORE_EXPORT NGInlineLayoutAlgorithm final
NGConstraintSpace*,
NGInlineBreakToken* = nullptr);
- // The available width for the current line.
- LayoutUnit AvailableWidth() const;
-
// Create a line.
// @return false if the line does not fit in the constraint space in block
// direction.
@@ -49,18 +47,10 @@ class CORE_EXPORT NGInlineLayoutAlgorithm final
RefPtr<NGLayoutResult> Layout() override;
- // Lays out the inline float.
- // List of actions:
- // - tries to position the float right away if we have enough space.
- // - updates the current_opportunity if we actually place the float.
- // - if it's too wide then we add the float to the unpositioned list so it can
- // be positioned after we're done with the current line.
- void LayoutAndPositionFloat(LayoutUnit end_position, LayoutObject*);
-
private:
bool IsHorizontalWritingMode() const { return is_horizontal_writing_mode_; }
- LayoutUnit LogicalLeftOffset() const;
+ LayoutUnit LogicalLeftOffset(const NGLayoutOpportunity&) const;
void BidiReorder(NGInlineItemResults*);
@@ -78,8 +68,7 @@ class CORE_EXPORT NGInlineLayoutAlgorithm final
LayoutUnit inline_size,
LayoutUnit available_width);
- // Finds the next layout opportunity for the next text fragment.
- void FindNextLayoutOpportunity();
+ NGLayoutOpportunity FindLayoutOpportunityForLine();
NGInlineLayoutStateStack box_states_;
LayoutUnit content_size_;

Powered by Google App Engine
This is Rietveld 408576698