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

Source/core/rendering/RenderListBox.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  *               2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 181 matching lines @@
     if (m_vBar) {
         bool enabled = numVisibleItems() < numItems();
         m_vBar->setEnabled(enabled);
         m_vBar->setProportion(numVisibleItems(), numItems());
         if (!enabled) {
             scrollToOffsetWithoutAnimation(VerticalScrollbar, 0);
             m_indexOffset = 0;
         }
     }
 
-    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()
 {
     HTMLSelectElement* select = selectElement();
 
     m_scrollToRevealSelectionAfterLayout = false;
 
     int firstIndex = listIndexToRenderListBoxIndex(select->activeSelectionStartListIndex());
     int lastIndex = listIndexToRenderListBoxIndex(select->activeSelectionEndListIndex());
@@ skipping 796 matching lines @@
 {
     return itemBoundingBoxRectInternal(point, listIndexToRenderListBoxIndex(index));
 }
 
 bool RenderListBox::scrollToRevealElementAtListIndex(int index)
 {
     return scrollToRevealElementAtListIndexInternal(listIndexToRenderListBoxIndex(index));
 }
 
 } // namespace WebCore