Rework composited scrolling updates.

Source/WebCore/page/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 697 matching lines @@
 {
     RenderView* renderView = this->renderView();
     if (!renderView)
         return;
 
     // If we expect to update compositing after an incipient layout, don't do so here.
     if (m_doingPreLayoutStyleUpdate || layoutPending() || renderView->needsLayout())
         return;
 
     // This call will make sure the cached hasAcceleratedCompositing is updated from the pref
+    renderView->compositor()->updateLayoutDependentState();
     renderView->compositor()->cacheAcceleratedCompositingFlags();
     renderView->compositor()->updateCompositingLayers(CompositingUpdateAfterStyleChange);
 }
 
-void FrameView::updateCompositingLayersAfterLayout()
+void FrameView::updateCompositingLayersAfterLayoutAndPositioning()
 {
     RenderView* renderView = this->renderView();
     if (!renderView)
         return;
 
     // This call will make sure the cached hasAcceleratedCompositing is updated from the pref
     renderView->compositor()->cacheAcceleratedCompositingFlags();
     renderView->compositor()->updateCompositingLayers(CompositingUpdateAfterLayout);
 }
 
+void FrameView::updateCompositingLayersAfterLayout()
+{
+    RenderView* renderView = this->renderView();
+    if (!renderView)
+        return;
+
+    renderView->compositor()->updateLayoutDependentState();
+}
+
 bool FrameView::usesCompositedScrolling() const
 {
     RenderView* renderView = this->renderView();
     if (!renderView)
         return false;
     if (m_frame->settings() && m_frame->settings()->compositedScrollingForFramesEnabled())
         return renderView->compositor()->inForcedCompositingMode();
     return false;
 }
 
@@ skipping 394 matching lines @@
         adjustViewSize();
 
     m_doFullRepaint = neededFullRepaint;
 
     // Now update the positions of all layers.
     beginDeferredRepaints();
     if (m_doFullRepaint)
         root->view()->repaint(); // FIXME: This isn't really right, since the RenderView doesn't fully encompass the visibleContentRect(). It just happens
                                  // to work out most of the time, since first layouts and printing don't have you scrolled anywhere.
 
+    updateCompositingLayersAfterLayout();
+
     layer->updateLayerPositionsAfterLayout(renderView()->layer(), updateLayerPositionFlags(layer, subtree, m_doFullRepaint));
 
     endDeferredRepaints();
 
-    updateCompositingLayersAfterLayout();
+    updateCompositingLayersAfterLayoutAndPositioning();
 
     m_layoutCount++;
 
     if (AXObjectCache* cache = root->document()->existingAXObjectCache())
         cache->postNotification(root, AXObjectCache::AXLayoutComplete, true);
     updateAnnotatedRegions();
 
     ASSERT(!root->needsLayout());
 
     updateCanBlitOnScrollRecursively();
@@ skipping 2431 matching lines @@
 }
     
 AXObjectCache* FrameView::axObjectCache() const
 {
     if (frame() && frame()->document())
         return frame()->document()->existingAXObjectCache();
     return 0;
 }
     
 } // namespace WebCore