Minor cleanup to RenderLayerScrollableArea::setNeedsCompositedScrolling.

Source/core/rendering/RenderLayerScrollableArea.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  *
  * Portions are Copyright (C) 1998 Netscape Communications Corporation.
  *
  * Other contributors:
  *   Robert O'Callahan <roc+@cs.cmu.edu>
  *   David Baron <dbaron@fas.harvard.edu>
  *   Christian Biesinger <cbiesinger@web.de>
  *   Randall Jesup <rjesup@wgate.com>
@@ skipping 1436 matching lines @@
     bool needsCompositedScrolling = compositor->acceleratedCompositingForOverflowScrollEnabled();
     ASSERT(scrollsOverflow());
     if (compositor->legacyAcceleratedCompositingForOverflowScrollEnabled()) {
         layer()->stackingNode()->updateDescendantsAreContiguousInStackingOrder();
         layer()->updateDescendantDependentFlags();
         const bool needsToBeStackingContainer = layer()->stackingNode()->descendantsAreContiguousInStackingOrder() && !layer()->hasUnclippedDescendant();
         needsToBeStackingContainerDidChange = layer()->stackingNode()->setNeedsToBeStackingContainer(needsToBeStackingContainer);
         needsCompositedScrolling |= needsToBeStackingContainer;
     }
 
-    const bool needsCompositedScrollingDidChange = setNeedsCompositedScrolling(needsCompositedScrolling);
-    if (needsToBeStackingContainerDidChange || needsCompositedScrollingDidChange) {
+    if (needsToBeStackingContainerDidChange || this->needsCompositedScrolling() != needsCompositedScrolling) {
+        setNeedsCompositedScrolling(needsCompositedScrolling);
         // Note, the z-order lists may need to be rebuilt, but our code guarantees
         // that we have not affected stacking, so we will not dirty
         // m_descendantsAreContiguousInStackingOrder for either us or our stacking
         // context or container.
         layer()->didUpdateNeedsCompositedScrolling();
     }
 }
 
-bool RenderLayerScrollableArea::setNeedsCompositedScrolling(bool needsCompositedScrolling)
-{
-    if (this->needsCompositedScrolling() == needsCompositedScrolling)
-        return false;
-
-    m_needsCompositedScrolling = needsCompositedScrolling;
-    return true;
-}
-
 void RenderLayerScrollableArea::updateCompositingLayersAfterScroll()
 {
     RenderLayerCompositor* compositor = m_box->view()->compositor();
     if (compositor->inCompositingMode()) {
         // FIXME: Our stacking container is guaranteed to contain all of our descendants that may need
         // repositioning, so we should be able to enqueue a partial update compositing layers from there.
         // this feature was overridden for now by deferred compositing updates.
         if (usesCompositedScrolling())
             compositor->setNeedsCompositingUpdate(CompositingUpdateOnCompositedScroll);
         else
@@ skipping 34 matching lines @@
 void RenderLayerScrollableArea::setForceNeedsCompositedScrolling(ForceNeedsCompositedScrollingMode mode)
 {
     if (m_forceNeedsCompositedScrolling == mode)
         return;
 
     m_forceNeedsCompositedScrolling = mode;
     layer()->didUpdateNeedsCompositedScrolling();
 }
 
 } // Namespace WebCore