Merge 94587 - [chromium] REGRESSION(94353): requestAnimationFrame not throttled in compositing path

Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.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 72 matching lines @@
 
 bool CCSingleThreadProxy::compositeAndReadback(void *pixels, const IntRect& rect)
 {
     ASSERT(isMainThread());
 
     if (!recreateContextIfNeeded())
         return false;
 
     commitIfNeeded();
 
-
     if (!doComposite())
         return false;
 
     m_layerTreeHostImpl->readback(pixels, rect);
 
     if (m_layerTreeHostImpl->isContextLost())
         return false;
 
     return true;
 }
@@ skipping 121 matching lines @@
 
     // We have tried too many times to recreate the context. Tell the host to fall
     // back to software rendering.
     m_layerTreeHost->didRecreateGraphicsContext(false);
     return false;
 }
 
 void CCSingleThreadProxy::commitIfNeeded()
 {
     // Update
-    double frameBeginTime = currentTime();
-    m_layerTreeHost->animateAndLayout(frameBeginTime);
     m_layerTreeHost->updateLayers();
 
     // Commit
     {
         ScopedSetImplThread impl;
         m_layerTreeHostImpl->beginCommit();
         m_layerTreeHost->commitTo(m_layerTreeHostImpl.get());
         m_layerTreeHostImpl->commitComplete();
     }
 }
@@ skipping 16 matching lines @@
           m_numFailedRecreateAttempts = 0;
           setNeedsCommitAndRedraw();
           return false;
       }
     }
 
     return true;
 }
 
 }