Invalidate first line display item clients when first line style changes

third_party/WebKit/Source/core/dom/Element.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Peter Kelly (pmk@post.com)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
  *           (C) 2007 Eric Seidel (eric@webkit.org)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 1605 matching lines @@
     }
 
     document().styleEngine().styleInvalidator().clearInvalidation(*this);
 
     if (svgFilterNeedsLayerUpdate())
         document().unscheduleSVGFilterLayerUpdateHack(*this);
 
     ASSERT(needsAttach());
 }
 
-bool Element::pseudoStyleCacheIsInvalid(const ComputedStyle* currentStyle, ComputedStyle* newStyle)
+bool Element::updatePseudoStyleCache(const ComputedStyle* currentStyle, ComputedStyle* newStyle)
 {
     ASSERT(currentStyle == computedStyle());
     ASSERT(layoutObject());
 
     if (!currentStyle)
         return false;
 
     const PseudoStyleCache* pseudoStyleCache = currentStyle->cachedPseudoStyles();
     if (!pseudoStyleCache)
         return false;
 
     size_t cacheSize = pseudoStyleCache->size();
+    bool result = false;
     for (size_t i = 0; i < cacheSize; ++i) {
         RefPtr<ComputedStyle> newPseudoStyle;
         RefPtr<ComputedStyle> oldPseudoStyle = pseudoStyleCache->at(i);
         PseudoId pseudoId = oldPseudoStyle->styleType();
         if (pseudoId == FIRST_LINE || pseudoId == FIRST_LINE_INHERITED)
             newPseudoStyle = layoutObject()->uncachedFirstLineStyle(newStyle);
         else
             newPseudoStyle = layoutObject()->getUncachedPseudoStyle(PseudoStyleRequest(pseudoId), newStyle, newStyle);
-        if (!newPseudoStyle)
-            return true;
+        if (!newPseudoStyle) {
+            result = true;
+            continue;
+        }
         if (*oldPseudoStyle != *newPseudoStyle || oldPseudoStyle->font().loadingCustomFonts() != newPseudoStyle->font().loadingCustomFonts()) {
             if (pseudoId < FIRST_INTERNAL_PSEUDOID)
                 newStyle->setHasPseudoStyle(pseudoId);
             newStyle->addCachedPseudoStyle(newPseudoStyle);
             if (pseudoId == FIRST_LINE || pseudoId == FIRST_LINE_INHERITED)
                 layoutObject()->firstLineStyleDidChange(*oldPseudoStyle, *newPseudoStyle);
-            return true;
+            result = true;
         }
     }
     return false;
 }
 
 PassRefPtr<ComputedStyle> Element::styleForLayoutObject()
 {
     ASSERT(document().inStyleRecalc());
 
     RefPtr<ComputedStyle> style;
@@ skipping 118 matching lines @@
             return Reattach;
         return ReattachNoLayoutObject;
     }
 
     ASSERT(oldStyle);
 
     if (localChange != NoChange)
         updateCallbackSelectors(oldStyle.get(), newStyle.get());
 
     if (LayoutObject* layoutObject = this->layoutObject()) {
-        if (localChange != NoChange || pseudoStyleCacheIsInvalid(oldStyle.get(), newStyle.get()) || svgFilterNeedsLayerUpdate()) {
+        bool pseudoStyleCacheUpdated = updatePseudoStyleCache(oldStyle.get(), newStyle.get());
+        if (localChange != NoChange || pseudoStyleCacheUpdated || svgFilterNeedsLayerUpdate()) {
             layoutObject->setStyle(newStyle.get());
         } else {
             // Although no change occurred, we use the new style so that the cousin style sharing code won't get
             // fooled into believing this style is the same.
             // FIXME: We may be able to remove this hack, see discussion in
             // https://codereview.chromium.org/30453002/
             layoutObject->setStyleInternal(newStyle.get());
         }
     }
 
@@ skipping 1762 matching lines @@
 {
 #if ENABLE(OILPAN)
     if (hasRareData())
         visitor->trace(elementRareData());
     visitor->trace(m_elementData);
 #endif
     ContainerNode::trace(visitor);
 }
 
 } // namespace blink