Move ::selection invalidation to applyPseudoStyleChanges.

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc.
  *               All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved.
  *               (http://www.torchmobile.com/)
@@ skipping 1715 matching lines @@
     else
       setNeedsLayoutAndPrefWidthsRecalc(LayoutInvalidationReason::StyleChange);
   }
 
   if (diff.needsPaintInvalidationSubtree() ||
       updatedDiff.needsPaintInvalidationSubtree())
     setShouldDoFullPaintInvalidationIncludingNonCompositingDescendants();
   else if (diff.needsPaintInvalidationObject() ||
            updatedDiff.needsPaintInvalidationObject())
     setShouldDoFullPaintInvalidation();
-  else if (diff.needsPaintInvalidationSelection())
-    invalidatePaintForSelection();
 
   // Text nodes share style with their parents but the paint properties don't
   // apply to them, hence the !isText() check.
   if (RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled() && !isText() &&
       (diff.transformChanged() || diff.opacityChanged() ||
        diff.zIndexChanged() || diff.filterChanged() ||
        diff.backdropFilterChanged() || diff.cssClipChanged())) {
     setNeedsPaintPropertyUpdate();
 
     // We don't need to invalidate paint of objects on SPv2 when only paint
@@ skipping 185 matching lines @@
 
   if (oldStyle && oldStyle->styleType() == PseudoIdNone)
     applyPseudoStyleChanges(*oldStyle);
 }
 
 void LayoutObject::applyPseudoStyleChanges(const ComputedStyle& oldStyle) {
   if (oldStyle.hasPseudoStyle(PseudoIdFirstLine) ||
       styleRef().hasPseudoStyle(PseudoIdFirstLine))
     applyFirstLineChanges(oldStyle);
 
-  // TODO(rune@opera.com): Move the invalidation for ::selection here.
-  // Instead of having a PaintInvalidationSelectionOnly PaintInvalidationType
-  // used for the element diff, we should use PaintInvalidationObject diff on
-  // the pseudo element style here instead.
+  if (oldStyle.hasPseudoStyle(PseudoIdSelection) ||
+      styleRef().hasPseudoStyle(PseudoIdSelection))
+    invalidatePaintForSelection();
 }
 
 void LayoutObject::applyFirstLineChanges(const ComputedStyle& oldStyle) {
   if (oldStyle.hasPseudoStyle(PseudoIdFirstLine)) {
     RefPtr<ComputedStyle> oldPseudoStyle =
         oldStyle.getCachedPseudoStyle(PseudoIdFirstLine);
     if (styleRef().hasPseudoStyle(PseudoIdFirstLine) && oldPseudoStyle) {
       RefPtr<ComputedStyle> newPseudoStyle =
           uncachedFirstLineStyle(mutableStyle());
       if (newPseudoStyle) {
@@ skipping 1642 matching lines @@
     const blink::LayoutObject* root = object1;
     while (root->parent())
       root = root->parent();
     root->showLayoutTreeAndMark(object1, "*", object2, "-", 0);
   } else {
     WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)");
   }
 }
 
 #endif