Make composited scrolling codepaths co-operate.

Source/core/rendering/RenderLayerCompositor.cpp

 /*
  * Copyright (C) 2009, 2010 Apple Inc. All rights reserved.
  *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 1977 matching lines @@
     return renderer->hasFilter();
 }
 
 bool RenderLayerCompositor::requiresCompositingForBlending(RenderObject* renderer) const
 {
     return renderer->hasBlendMode();
 }
 
 bool RenderLayerCompositor::requiresCompositingForOverflowScrollingParent(const RenderLayer* layer) const
 {
-    if (!layer->compositorDrivenAcceleratedScrollingEnabled())
+    if (!layer->useCompositorDrivenAcceleratedScrolling())
         return false;
 
     TRACE_EVENT0("comp-scroll", "RenderLayerCompositor::requiresCompositingForOverflowScrollingParent");
 
     // A layer scrolls with its containing block. So to find the overflow scrolling layer
     // that we scroll with respect to, we must ascend the layer tree until we reach the
     // first overflow scrolling div at or above our containing block. I will refer to this
     // layer as our 'scrolling ancestor'.
     //
     // Now, if we reside in a normal flow list, then we will naturally scroll with our scrolling
@@ skipping 729 matching lines @@
 
 Page* RenderLayerCompositor::page() const
 {
     if (Frame* frame = m_renderView->frameView()->frame())
         return frame->page();
 
     return 0;
 }
 
 } // namespace WebCore