Commit bdcb3891 authored by pilgrim@chromium.org's avatar pilgrim@chromium.org

[Line Layout API] Add needsLayout() to LineLayoutItem

This CL updates all callers in core/layout/line/ that call needsLayout()
on a LayoutObject.

BUG=499321

Review URL: https://codereview.chromium.org/1299273002

git-svn-id: svn://svn.chromium.org/blink/trunk@200838 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 49675a00
......@@ -40,6 +40,11 @@ public:
// https://crbug.com/499321
operator LayoutObject*() const { return m_layoutObject; }
bool needsLayout() const
{
return m_layoutObject->needsLayout();
}
Node* node() const
{
return m_layoutObject->node();
......
......@@ -87,7 +87,7 @@ void AbstractInlineTextBox::detach()
PassRefPtr<AbstractInlineTextBox> AbstractInlineTextBox::nextInlineTextBox() const
{
ASSERT(!m_inlineTextBox || !m_inlineTextBox->layoutObject().needsLayout());
ASSERT(!m_inlineTextBox || !m_inlineTextBox->lineLayoutItem().needsLayout());
if (!m_inlineTextBox)
return nullptr;
......@@ -172,19 +172,19 @@ String AbstractInlineTextBox::text() const
bool AbstractInlineTextBox::isFirst() const
{
ASSERT(!m_inlineTextBox || !m_inlineTextBox->layoutObject().needsLayout());
ASSERT(!m_inlineTextBox || !m_inlineTextBox->lineLayoutItem().needsLayout());
return !m_inlineTextBox || !m_inlineTextBox->prevTextBox();
}
bool AbstractInlineTextBox::isLast() const
{
ASSERT(!m_inlineTextBox || !m_inlineTextBox->layoutObject().needsLayout());
ASSERT(!m_inlineTextBox || !m_inlineTextBox->lineLayoutItem().needsLayout());
return !m_inlineTextBox || !m_inlineTextBox->nextTextBox();
}
PassRefPtr<AbstractInlineTextBox> AbstractInlineTextBox::nextOnLine() const
{
ASSERT(!m_inlineTextBox || !m_inlineTextBox->layoutObject().needsLayout());
ASSERT(!m_inlineTextBox || !m_inlineTextBox->lineLayoutItem().needsLayout());
if (!m_inlineTextBox)
return nullptr;
......@@ -197,7 +197,7 @@ PassRefPtr<AbstractInlineTextBox> AbstractInlineTextBox::nextOnLine() const
PassRefPtr<AbstractInlineTextBox> AbstractInlineTextBox::previousOnLine() const
{
ASSERT(!m_inlineTextBox || !m_inlineTextBox->layoutObject().needsLayout());
ASSERT(!m_inlineTextBox || !m_inlineTextBox->lineLayoutItem().needsLayout());
if (!m_inlineTextBox)
return nullptr;
......
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