Revert of Divorce PaintInvalidationState from LayoutState (https://codereview.chromium.org/36083300…

Source/core/rendering/RenderListBox.cpp

Index: Source/core/rendering/RenderListBox.cpp
diff --git a/Source/core/rendering/RenderListBox.cpp b/Source/core/rendering/RenderListBox.cpp
index f2b1b38d5871e199c48c012fba10ab5d2cdbfae9..9eeace5b4a1747ffb2201bdbab836ce6f8187e44 100644
--- a/Source/core/rendering/RenderListBox.cpp
+++ b/Source/core/rendering/RenderListBox.cpp
@@ -199,14 +199,16 @@ void RenderListBox::layout()
         }
     }
 
-    if (m_scrollToRevealSelectionAfterLayout)
+    if (m_scrollToRevealSelectionAfterLayout) {
+        ForceHorriblySlowRectMapping slowRectMapping(*this);
         scrollToRevealSelection();
+    }
 }
 
-void RenderListBox::invalidateTreeAfterLayout(const PaintInvalidationState& paintInvalidationState)
+void RenderListBox::invalidateTreeAfterLayout(const RenderLayerModelObject& invalidationContainer)
 {
     repaintScrollbarIfNeeded();
-    RenderBox::invalidateTreeAfterLayout(paintInvalidationState);
+    RenderBox::invalidateTreeAfterLayout(invalidationContainer);
 }
 
 void RenderListBox::scrollToRevealSelection()