Divorce PaintInvalidationState from LayoutState

Source/core/frame/FrameView.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Dirk Mueller <mueller@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *           (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
@@ skipping 1002 matching lines @@
     // We should only invalidate paints for the outer most layout. This works as
     // we continue to track paint invalidation rects until this function is called.
     ASSERT(!m_nestedLayoutCount);
 
     TRACE_EVENT1("blink", "FrameView::invalidateTree", "root", root->debugName().ascii());
 
     // FIXME: really, we're in the paint invalidation phase here, and the compositing queries are legal.
     // Until those states are fully fledged, I'll just disable the ASSERTS.
     DisableCompositingQueryAsserts compositingQueryAssertsDisabler;
 
-    LayoutState rootLayoutState(*root);
+    InvalidationTreeWalkState invalidationTreeWalkState(*root);
 
-    root->invalidateTreeAfterLayout(*root->containerForPaintInvalidation());
+    root->invalidateTreeAfterLayout(invalidationTreeWalkState);
 
     // Invalidate the paint of the frameviews scrollbars if needed
     if (hasVerticalBarDamage())
         invalidateRect(verticalBarDamage());
     if (hasHorizontalBarDamage())
         invalidateRect(horizontalBarDamage());
     resetScrollbarDamage();
 }
 
 DocumentLifecycle& FrameView::lifecycle() const
@@ skipping 2223 matching lines @@
 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation orientation)
 {
     ScrollableArea::willRemoveScrollbar(scrollbar, orientation);
     if (AXObjectCache* cache = axObjectCache()) {
         cache->remove(scrollbar);
         cache->handleScrollbarUpdate(this);
     }
 }
 
 } // namespace WebCore