Bit-mask incorrectly removed first-line pseudo bit.

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)
  *
@@ skipping 1790 matching lines @@
   }
 
   if (context.clearInvalidation)
     document().styleEngine().styleInvalidator().clearInvalidation(*this);
 
   setNeedsResizeObserverUpdate();
 
   DCHECK(needsAttach());
 }
 
-bool Element::pseudoStyleCacheIsInvalid(const ComputedStyle* currentStyle,
+void Element::pseudoStyleCacheIsInvalid(const ComputedStyle* currentStyle,
                                         ComputedStyle* newStyle) {
+  // TODO(rune@opera.com): This method does not take into account pseudo style
+  // which is only present for the newStyle. Also the first-line part should
+  // probably be moved to where we handle visual invalidation diff for setStyle.
+  // setHasPseudoStyle() calls are probably unnecessary.
   DCHECK_EQ(currentStyle, computedStyle());
   DCHECK(layoutObject());
 
   if (!currentStyle)
-    return false;
+    return;
 
   const PseudoStyleCache* pseudoStyleCache = currentStyle->cachedPseudoStyles();
   if (!pseudoStyleCache)
-    return false;
+    return;
 
   size_t cacheSize = pseudoStyleCache->size();
   for (size_t i = 0; i < cacheSize; ++i) {
     RefPtr<ComputedStyle> newPseudoStyle;
     RefPtr<ComputedStyle> oldPseudoStyle = pseudoStyleCache->at(i);
     PseudoId pseudoId = oldPseudoStyle->styleType();
-    if (pseudoId == PseudoIdFirstLine || pseudoId == PseudoIdFirstLineInherited)
-      newPseudoStyle = layoutObject()->uncachedFirstLineStyle(newStyle);
-    else
-      newPseudoStyle = layoutObject()->getUncachedPseudoStyle(
-          PseudoStyleRequest(pseudoId), newStyle, newStyle);
+    if (pseudoId != PseudoIdFirstLine && pseudoId != PseudoIdFirstLineInherited)
+      continue;
+    newPseudoStyle = layoutObject()->uncachedFirstLineStyle(newStyle);
     if (!newPseudoStyle)
-      return true;
+      continue;
     if (*oldPseudoStyle != *newPseudoStyle ||
         oldPseudoStyle->font().loadingCustomFonts() !=
             newPseudoStyle->font().loadingCustomFonts()) {
       if (pseudoId < FirstInternalPseudoId)
         newStyle->setHasPseudoStyle(pseudoId);
       newStyle->addCachedPseudoStyle(newPseudoStyle);
       if (pseudoId == PseudoIdFirstLine ||
-          pseudoId == PseudoIdFirstLineInherited)
+          pseudoId == PseudoIdFirstLineInherited) {
         layoutObject()->firstLineStyleDidChange(*oldPseudoStyle,
                                                 *newPseudoStyle);
-      return true;
+      }
     }
   }
-  return false;
 }
 
 PassRefPtr<ComputedStyle> Element::styleForLayoutObject() {
   DCHECK(document().inStyleRecalc());
 
   RefPtr<ComputedStyle> style;
 
   // FIXME: Instead of clearing updates that may have been added from calls to
   // styleForElement outside recalcStyle, we should just never set them if we're
   // not inside recalcStyle.
@@ skipping 166 matching lines @@
     setNeedsReattachLayoutTree();
     return rebuildLayoutTree();
   }
 
   DCHECK(oldStyle);
 
   if (localChange != NoChange)
     updateCallbackSelectors(oldStyle.get(), newStyle.get());
 
   if (LayoutObject* layoutObject = this->layoutObject()) {
-    if (localChange != NoChange ||
-        pseudoStyleCacheIsInvalid(oldStyle.get(), newStyle.get())) {
+    if (localChange != NoChange) {
+      pseudoStyleCacheIsInvalid(oldStyle.get(), newStyle.get());
       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());
     }
   } else if (localChange != NoChange &&
@@ skipping 2154 matching lines @@
 }
 
 DEFINE_TRACE_WRAPPERS(Element) {
   if (hasRareData()) {
     visitor->traceWrappers(elementRareData());
   }
   ContainerNode::traceWrappers(visitor);
 }
 
 }  // namespace blink