| Index: Source/core/layout/line/TrailingObjects.cpp
|
| diff --git a/Source/core/layout/line/TrailingObjects.cpp b/Source/core/layout/line/TrailingObjects.cpp
|
| index dc2e3d48104c9f15f43166b734eef2a822379141..b5e48588bc7bea2c7d917edbef83ddbcaff14b79 100644
|
| --- a/Source/core/layout/line/TrailingObjects.cpp
|
| +++ b/Source/core/layout/line/TrailingObjects.cpp
|
| @@ -24,6 +24,7 @@
|
| #include "config.h"
|
| #include "core/layout/line/TrailingObjects.h"
|
|
|
| +#include "core/layout/line/BreakingContextInlineHeaders.h"
|
| #include "core/layout/line/InlineIterator.h"
|
|
|
| namespace blink {
|
| @@ -49,7 +50,7 @@ void TrailingObjects::updateMidpointsForTrailingObjects(LineMidpointState& lineM
|
| for (size_t i = 0; i < m_objects.size(); ++i) {
|
| if (currentMidpoint >= lineMidpointState.numMidpoints()) {
|
| // We don't have a midpoint for this box yet.
|
| - lineMidpointState.ensureLineBoxInsideIgnoredSpaces(m_objects[i]);
|
| + ensureLineBoxInsideIgnoredSpaces(&lineMidpointState, m_objects[i]);
|
| } else {
|
| ASSERT(lineMidpointState.midpoints()[currentMidpoint].object() == m_objects[i]);
|
| ASSERT(lineMidpointState.midpoints()[currentMidpoint + 1].object() == m_objects[i]);
|
| @@ -61,10 +62,10 @@ void TrailingObjects::updateMidpointsForTrailingObjects(LineMidpointState& lineM
|
| // Add a new end midpoint that stops right at the very end.
|
| unsigned length = m_whitespace->textLength();
|
| unsigned pos = length >= 2 ? length - 2 : UINT_MAX;
|
| - InlineIterator endMid(0, m_whitespace, pos);
|
| + InlineIterator endMid(0, LineLayoutItem(m_whitespace), pos);
|
| lineMidpointState.startIgnoringSpaces(endMid);
|
| for (size_t i = 0; i < m_objects.size(); ++i) {
|
| - lineMidpointState.ensureLineBoxInsideIgnoredSpaces(m_objects[i]);
|
| + ensureLineBoxInsideIgnoredSpaces(&lineMidpointState, m_objects[i]);
|
| }
|
| }
|
| }
|
|
|