Move ::selection invalidation to applyPseudoStyleChanges.

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

Index: third_party/WebKit/Source/core/layout/LayoutObject.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutObject.cpp b/third_party/WebKit/Source/core/layout/LayoutObject.cpp
index f9660903f4b0737c6183822d5baf5c0f4d9d1f0c..d62eab76425595a0e172f6c538666b4162abbc8c 100644
--- a/third_party/WebKit/Source/core/layout/LayoutObject.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutObject.cpp
@@ -1733,8 +1733,6 @@ void LayoutObject::setStyle(PassRefPtr<ComputedStyle> style) {
   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.
@@ -1940,10 +1938,9 @@ void LayoutObject::applyPseudoStyleChanges(const ComputedStyle& oldStyle) {
       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) {