cc: Save correct frame begin time to FrameRateCounter

cc/single_thread_proxy.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/single_thread_proxy.h"
 
 #include "base/auto_reset.h"
 #include "base/debug/trace_event.h"
 #include "cc/context_provider.h"
 #include "cc/draw_quad.h"
@@ skipping 37 matching lines @@
   TRACE_EVENT0("cc", "SingleThreadProxy::~SingleThreadProxy");
   DCHECK(Proxy::IsMainThread());
   DCHECK(!layer_tree_host_impl_.get() &&
          !layer_tree_host_);  // make sure Stop() got called.
 }
 
 bool SingleThreadProxy::CompositeAndReadback(void* pixels, gfx::Rect rect) {
   TRACE_EVENT0("cc", "SingleThreadProxy::compositeAndReadback");
   DCHECK(Proxy::IsMainThread());
 
-  if (!CommitAndComposite())
+  if (!CommitAndComposite(base::TimeTicks::Now()))
     return false;
 
   {
     DebugScopedSetImplThread impl(this);
     layer_tree_host_impl_->readback(pixels, rect);
 
     if (layer_tree_host_impl_->isContextLost())
       return false;
 
     layer_tree_host_impl_->swapBuffers();
@@ skipping 259 matching lines @@
 
 bool SingleThreadProxy::isInsideDraw() { return inside_draw_; }
 
 void SingleThreadProxy::didLoseOutputSurfaceOnImplThread() {
   // Cause a commit so we can notice the lost context.
   setNeedsCommitOnImplThread();
 }
 
 // Called by the legacy scheduling path (e.g. where render_widget does the
 // scheduling)
-void SingleThreadProxy::CompositeImmediately() {
-  if (CommitAndComposite()) {
+void SingleThreadProxy::CompositeImmediately(base::TimeTicks frame_begin_time) {
+  if (CommitAndComposite(frame_begin_time)) {
     layer_tree_host_impl_->swapBuffers();
     DidSwapFrame();
   }
 }
 
 scoped_ptr<base::Value> SingleThreadProxy::AsValue() const {
   scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue());
   {
     // The following line casts away const modifiers because it is just
     // setting debug state. We still want the AsValue() function and its
     // call chain to be const throughout.
     DebugScopedSetImplThread impl(const_cast<SingleThreadProxy*>(this));
 
     state->Set("layer_tree_host_impl",
                layer_tree_host_impl_->asValue().release());
   }
   return state.PassAs<base::Value>();
 }
 
 void SingleThreadProxy::ForceSerializeOnSwapBuffers() {
   {
     DebugScopedSetImplThread impl(this);
     if (renderer_initialized_)
       layer_tree_host_impl_->renderer()->DoNoOp();
   }
 }
 
 void SingleThreadProxy::onSwapBuffersCompleteOnImplThread() { NOTREACHED(); }
 
-bool SingleThreadProxy::CommitAndComposite() {
+bool SingleThreadProxy::CommitAndComposite(base::TimeTicks frame_begin_time) {
   DCHECK(Proxy::IsMainThread());
 
   if (!layer_tree_host_->initializeRendererIfNeeded())
     return false;
 
   scoped_refptr<cc::ContextProvider> offscreen_context_provider;
   if (renderer_capabilities_for_main_thread_.usingOffscreenContext3d &&
       layer_tree_host_->needsOffscreenContext()) {
     offscreen_context_provider =
         layer_tree_host_->client()->OffscreenContextProviderForMainThread();
     if (offscreen_context_provider->InitializeOnMainThread())
       created_offscreen_context_provider = true;
     else
       offscreen_context_provider = NULL;
   }
 
   layer_tree_host_->contentsTextureManager()->unlinkAndClearEvictedBackings();
 
   scoped_ptr<ResourceUpdateQueue> queue =
       make_scoped_ptr(new ResourceUpdateQueue);
   layer_tree_host_->updateLayers(
       *(queue.get()), layer_tree_host_impl_->memoryAllocationLimitBytes());
 
   layer_tree_host_->willCommit();
   DoCommit(queue.Pass());
-  bool result = DoComposite(offscreen_context_provider);
+  bool result = DoComposite(offscreen_context_provider, frame_begin_time);
   layer_tree_host_->didBeginFrame();
   return result;
 }
 
 bool SingleThreadProxy::DoComposite(
-    scoped_refptr<cc::ContextProvider> offscreen_context_provider) {
+    scoped_refptr<cc::ContextProvider> offscreen_context_provider,
+    base::TimeTicks frame_begin_time) {
   DCHECK(!output_surface_lost_);
   {
     DebugScopedSetImplThread impl(this);
     base::AutoReset<bool> mark_inside(&inside_draw_, true);
 
     layer_tree_host_impl_->resourceProvider()->
         SetOffscreenContextProvider(offscreen_context_provider);
 
     if (!layer_tree_host_impl_->visible())
       return false;
 
     layer_tree_host_impl_->animate(base::TimeTicks::Now(), base::Time::Now());
 
     // We guard prepareToDraw() with canDraw() because it always returns a valid
     // frame, so can only be used when such a frame is possible. Since
     // drawLayers() depends on the result of prepareToDraw(), it is guarded on
     // canDraw() as well.
     if (!layer_tree_host_impl_->canDraw())
       return false;
 
     LayerTreeHostImpl::FrameData frame;
     layer_tree_host_impl_->prepareToDraw(frame);
-    layer_tree_host_impl_->drawLayers(frame);
+    layer_tree_host_impl_->drawLayers(frame, frame_begin_time);
     layer_tree_host_impl_->didDrawAllLayers(frame);
     output_surface_lost_ = layer_tree_host_impl_->isContextLost();
 
     layer_tree_host_impl_->beginNextFrame();
   }
 
   if (output_surface_lost_) {
     cc::ContextProvider* offscreen_contexts = layer_tree_host_impl_->
         resourceProvider()->offscreen_context_provider();
     if (offscreen_contexts)
@@ skipping 14 matching lines @@
 
 bool SingleThreadProxy::CommitPendingForTesting() { return false; }
 
 skia::RefPtr<SkPicture> SingleThreadProxy::CapturePicture() {
   // Impl-side painting only.
   NOTREACHED();
   return skia::RefPtr<SkPicture>();
 }
 
 }  // namespace cc