Support style invalidation for ::content.

Source/core/css/invalidation/StyleInvalidator.cpp

 
 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "core/css/invalidation/StyleInvalidator.h"
 
 #include "core/css/invalidation/DescendantInvalidationSet.h"
@@ skipping 65 matching lines @@
 
 StyleInvalidator::~StyleInvalidator()
 {
 }
 
 void StyleInvalidator::RecursionData::pushInvalidationSet(const DescendantInvalidationSet& invalidationSet)
 {
     ASSERT(!m_wholeSubtreeInvalid);
     if (invalidationSet.treeBoundaryCrossing())
         m_treeBoundaryCrossing = true;
+    if (invalidationSet.insertionPointCrossing())
+        m_insertionPointCrossing = true;
     if (invalidationSet.wholeSubtreeInvalid()) {
         m_wholeSubtreeInvalid = true;
         return;
     }
     m_invalidationSets.append(&invalidationSet);
     m_invalidateCustomPseudo = invalidationSet.customPseudoInvalid();
 }
 
 ALWAYS_INLINE bool StyleInvalidator::RecursionData::matchesCurrentInvalidationSets(Element& element)
 {
     ASSERT(!m_wholeSubtreeInvalid);
 
     if (m_invalidateCustomPseudo && element.shadowPseudoId() != nullAtom) {
         TRACE_STYLE_INVALIDATOR_INVALIDATION_IF_ENABLED(element, InvalidateCustomPseudo);
         return true;
     }
 
+    if (m_insertionPointCrossing && element.isInsertionPoint())
+        return true;
+
     for (const auto& invalidationSet : m_invalidationSets) {
         if (invalidationSet->invalidatesElement(element))
             return true;
     }
 
     return false;
 }
 
 ALWAYS_INLINE bool StyleInvalidator::checkInvalidationSetsAgainstElement(Element& element, StyleInvalidator::RecursionData& recursionData)
 {
@@ skipping 53 matching lines @@
     } else if (recursionData.hasInvalidationSets() && someChildrenNeedStyleRecalc) {
         // Clone the RenderStyle in order to preserve correct style sharing, if possible. Otherwise recalc style.
         if (RenderObject* renderer = element.renderer()) {
             renderer->setStyleInternal(RenderStyle::clone(renderer->style()));
         } else {
             TRACE_STYLE_INVALIDATOR_INVALIDATION_IF_ENABLED(element, PreventStyleSharingForParent);
             element.setNeedsStyleRecalc(LocalStyleChange, StyleChangeReasonForTracing::create(StyleChangeReason::StyleInvalidator));
         }
     }
 
+    if (recursionData.insertionPointCrossing() && element.isInsertionPoint()) {
+        const InsertionPoint& insertionPoint = toInsertionPoint(element);
+        for (size_t i = 0; i < insertionPoint.size(); ++i)

[esprehn, 2014/10/16 02:19:06]

Just set SubtreeStyleChange on the InsertionPoint itself.

[rune, 2014/10/16 12:18:36]

Done.

+            insertionPoint.at(i)->setNeedsStyleRecalc(SubtreeStyleChange, StyleChangeReasonForTracing::create(StyleChangeReason::StyleInvalidator));
+    }
+
     element.clearChildNeedsStyleInvalidation();
     element.clearNeedsStyleInvalidation();
 
     return thisElementNeedsStyleRecalc;
 }
 
 void StyleInvalidator::trace(Visitor* visitor)
 {
 #if ENABLE(OILPAN)
     visitor->trace(m_pendingInvalidationMap);
 #endif
 }
 
 } // namespace blink