diff options
Diffstat (limited to 'chromium/third_party/blink/renderer/core/layout/ng/inline/ng_inline_box_state.h')
-rw-r--r-- | chromium/third_party/blink/renderer/core/layout/ng/inline/ng_inline_box_state.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/chromium/third_party/blink/renderer/core/layout/ng/inline/ng_inline_box_state.h b/chromium/third_party/blink/renderer/core/layout/ng/inline/ng_inline_box_state.h index f6ea8e18c77..2c6d9afb49d 100644 --- a/chromium/third_party/blink/renderer/core/layout/ng/inline/ng_inline_box_state.h +++ b/chromium/third_party/blink/renderer/core/layout/ng/inline/ng_inline_box_state.h @@ -5,7 +5,7 @@ #ifndef NGInlineBoxState_h #define NGInlineBoxState_h -#include "third_party/blink/renderer/core/layout/ng/geometry/ng_logical_size.h" +#include "third_party/blink/renderer/core/layout/geometry/logical_size.h" #include "third_party/blink/renderer/core/layout/ng/inline/ng_line_box_fragment_builder.h" #include "third_party/blink/renderer/core/layout/ng/inline/ng_line_height_metrics.h" #include "third_party/blink/renderer/core/style/computed_style_constants.h" @@ -106,7 +106,7 @@ struct NGInlineBoxState { // 2) Performs layout when the positin/size of a box was computed. // 3) Cache common values for a box. class CORE_EXPORT NGInlineLayoutStateStack { - STACK_ALLOCATED(); + DISALLOW_NEW(); public: // The box state for the line box. @@ -204,7 +204,7 @@ class CORE_EXPORT NGInlineLayoutStateStack { BoxData(unsigned start, unsigned end, const NGInlineItem* item, - NGLogicalSize size) + LogicalSize size) : fragment_start(start), fragment_end(end), item(item), size(size) {} BoxData(const BoxData& other, unsigned start, unsigned end) @@ -214,12 +214,17 @@ class CORE_EXPORT NGInlineLayoutStateStack { size(other.size), offset(other.offset) {} + void SetFragmentRange(unsigned start_index, unsigned end_index) { + fragment_start = start_index; + fragment_end = end_index; + } + // The range of child fragments this box contains. unsigned fragment_start; unsigned fragment_end; const NGInlineItem* item; - NGLogicalSize size; + LogicalSize size; bool has_line_left_edge = false; bool has_line_right_edge = false; @@ -230,7 +235,7 @@ class CORE_EXPORT NGInlineLayoutStateStack { LayoutUnit margin_border_padding_line_left; LayoutUnit margin_border_padding_line_right; - NGLogicalOffset offset; + LogicalOffset offset; unsigned parent_box_data_index = 0; unsigned fragmented_box_data_index = 0; |