Invalidate first line display item clients when first line style changes

third_party/WebKit/Source/core/layout/LayoutBlock.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 2872 matching lines @@
     }
 
     setLogicalHeight(computedValues.m_extent);
     setLogicalTop(computedValues.m_position);
     setMarginBefore(computedValues.m_margins.m_before);
     setMarginAfter(computedValues.m_margins.m_after);
 
     return true;
 }
 
+static void invalidteDisplayItemClientsOfInlineBoxRecursively(InlineBox& box)

[rune, 2015/12/02 09:00:49]

invalidte -> invalidate

[Xianzhu, 2015/12/02 17:41:57]

Done.

+{
+    box.layoutObject().invalidateDisplayItemClient(box);
+    if (!box.isInlineFlowBox())
+        return;
+    for (InlineBox* child = toInlineFlowBox(box).firstChild(); child; child = child->nextOnLine())
+        invalidteDisplayItemClientsOfInlineBoxRecursively(*child);
+}
+
+void LayoutBlock::invalidateDisplayItemClientsOfFirstLine()

[mstensho (USE GERRIT), 2015/12/02 10:09:31]

Lines are only interesting in block containers, i.e. LayoutBlockFlow, and
ideally we shouldn't be dealing with lines in LayoutBlock at all [1]. I realize
that LayoutBlock needs to do *something*, since we have to support ::first-line
on LayoutButton (which is a LayoutFlexibleBox).

Could you perhaps move the parts that deal with lines to LayoutBlockFlow, and
just do the child block thing here?

[1] http://crbug.com/302024

[Xianzhu, 2015/12/02 17:41:57]

Done. Separated this method into LayoutBlock::firstLineContainer() and
LayoutBlockFlow::invalidateDisplayItemClientsOfFirstLine().

BTW, merged https://codereview.chromium.org/1490013002/ and renamed
LayoutBlock::firstLineBlock() to firstLineStyleBlock() to avoid ambiguity and
conflict with this CL.

[mstensho (USE GERRIT), 2015/12/03 12:08:10]

Acknowledged.

+{
+    if (childrenInline()) {
+        // This block has the first line.
+        if (RootInlineBox* firstRootBox = this->firstRootBox())
+            invalidteDisplayItemClientsOfInlineBoxRecursively(*firstRootBox);
+        return;
+    }
+
+    // Let the first child flow find the first line.
+    if (LayoutObject* child = firstChild()) {
+        if (!child->isFloatingOrOutOfFlowPositioned() && child->isLayoutBlock())

[mstensho (USE GERRIT), 2015/12/02 10:09:31]

Should only allow LayoutBlockFlow here. It's okay to enter this machinery for
non-LayoutBlockFlow objects (because of LayoutButton), but children should be
true block containers.

[Xianzhu, 2015/12/02 17:41:57]

Done. Now this is in LayoutBlock::firstLineContainer().

+            toLayoutBlock(child)->invalidateDisplayItemClientsOfFirstLine();
+    }
+}
+
 #if ENABLE(ASSERT)
 void LayoutBlock::checkPositionedObjectsNeedLayout()
 {
     if (!gPositionedDescendantsMap)
         return;
 
     if (TrackedLayoutBoxListHashSet* positionedDescendantSet = positionedObjects()) {
         TrackedLayoutBoxListHashSet::const_iterator end = positionedDescendantSet->end();
         for (TrackedLayoutBoxListHashSet::const_iterator it = positionedDescendantSet->begin(); it != end; ++it) {
             LayoutBox* currBox = *it;
             ASSERT(!currBox->needsLayout());
         }
     }
 }
 
 #endif
 
 #ifndef NDEBUG
 
 void LayoutBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* markedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const LayoutObject* obj) const
 {
     showLayoutObject();
     for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRootBox())
         root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLabel2, obj, 1);
 }
 
 #endif
 
 } // namespace blink