Merge 112446 - [chromium] Scheduler should not tell FrameRateController to begin a frame when we do…

Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp

 /*
  * Copyright (C) 2011 Google 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 404 matching lines @@
 const LayerRendererCapabilities& CCLayerTreeHostImpl::layerRendererCapabilities() const
 {
     return m_layerRenderer->capabilities();
 }
 
 TextureAllocator* CCLayerTreeHostImpl::contentsTextureAllocator() const
 {
     return m_layerRenderer ? m_layerRenderer->contentsTextureAllocator() : 0;
 }
 
-void CCLayerTreeHostImpl::swapBuffers()
+bool CCLayerTreeHostImpl::swapBuffers()
 {
     ASSERT(m_layerRenderer);
-    m_layerRenderer->swapBuffers(enclosingIntRect(m_rootDamageRect));
+    return m_layerRenderer->swapBuffers(enclosingIntRect(m_rootDamageRect));
 }
 
 void CCLayerTreeHostImpl::didLoseContext()
 {
     m_client->didLoseContextOnImplThread();
 }
 
 void CCLayerTreeHostImpl::onSwapBuffersComplete()
 {
     m_client->onSwapBuffersCompleteOnImplThread();
@@ skipping 387 matching lines @@
         return;
 
     bool isContinuing = m_activeGestureAnimation->animate(monotonicTime);
     if (isContinuing)
         m_client->setNeedsRedrawOnImplThread();
     else
         m_activeGestureAnimation.clear();
 }
 
 } // namespace WebCore