diff options
Diffstat (limited to 'chromium/third_party/blink/renderer/core/layout/line/line_box_list.cc')
-rw-r--r-- | chromium/third_party/blink/renderer/core/layout/line/line_box_list.cc | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/chromium/third_party/blink/renderer/core/layout/line/line_box_list.cc b/chromium/third_party/blink/renderer/core/layout/line/line_box_list.cc index c780319ef62..2b943ba9617 100644 --- a/chromium/third_party/blink/renderer/core/layout/line/line_box_list.cc +++ b/chromium/third_party/blink/renderer/core/layout/line/line_box_list.cc @@ -39,14 +39,27 @@ #include "third_party/blink/renderer/core/paint/paint_info.h" namespace blink { + #if DCHECK_IS_ON() template <typename InlineBoxType> -InlineBoxList<InlineBoxType>::~InlineBoxList() { +void InlineBoxList<InlineBoxType>::AssertIsEmpty() { DCHECK(!first_); DCHECK(!last_); } #endif +const LineBoxList& LineBoxList::Empty() { + // Need to use "static" because DISALLOW_NEW. + static LineBoxList empty; + return empty; +} + +const InlineTextBoxList& InlineTextBoxList::Empty() { + // Need to use "static" because DISALLOW_NEW. + static InlineTextBoxList empty; + return empty; +} + template <typename InlineBoxType> void InlineBoxList<InlineBoxType>::AppendLineBox(InlineBoxType* box) { if (!first_) { @@ -143,7 +156,7 @@ bool LineBoxList::RangeIntersectsRect(LineLayoutBoxModel layout_object, LayoutUnit physical_extent = AbsoluteValue(physical_end - physical_start); physical_start = std::min(physical_start, physical_end); - if (layout_object.Style()->IsHorizontalWritingMode()) { + if (layout_object.StyleRef().IsHorizontalWritingMode()) { physical_start += offset.Y(); return cull_rect.IntersectsVerticalRange(physical_start, physical_start + physical_extent); |