[cc] Adds source_id and sequence_number to BeginFrameArgs.

content/browser/renderer_host/render_widget_host_view_android.cc

 // Copyright (c) 2012 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 "content/browser/renderer_host/render_widget_host_view_android.h"
 
 #include <android/bitmap.h>
 
 #include <utility>
 
@@ skipping 1500 matching lines @@
   if (!using_browser_compositor_)
     SetBeginFrameSource(nullptr);
   // If the DFH has already been destroyed, it will have cleaned itself up.
   // This happens in some WebView cases.
   if (delegated_frame_host_)
     delegated_frame_host_->UnregisterFrameSinkHierarchy();
   DCHECK(!begin_frame_source_);
 }
 
 void RenderWidgetHostViewAndroid::SendBeginFrame(cc::BeginFrameArgs args) {
-  TRACE_EVENT1("cc", "RenderWidgetHostViewAndroid::SendBeginFrame",
-               "frame_time_us", args.frame_time.ToInternalValue());
+  TRACE_EVENT2("cc", "RenderWidgetHostViewAndroid::SendBeginFrame",
+               "frame_number", args.sequence_number, "frame_time_us",
+               args.frame_time.ToInternalValue());
 
   // Synchronous compositor does not use deadline-based scheduling.
   // TODO(brianderson): Replace this hardcoded deadline after Android
   // switches to Surfaces and the Browser's commit isn't in the critical path.
   args.deadline = sync_compositor_ ? base::TimeTicks()
   : args.frame_time + (args.interval * 0.6);
   host_->Send(new ViewMsg_BeginFrame(host_->GetRoutingID(), args));
   if (sync_compositor_)
     sync_compositor_->DidSendBeginFrame(view_.GetWindowAndroid());
 }
@@ skipping 385 matching lines @@
   TRACE_EVENT0("cc,benchmark", "RenderWidgetHostViewAndroid::OnBeginFrame");
   if (!host_)
     return;
 
   // In sync mode, we disregard missed frame args to ensure that
   // SynchronousCompositorBrowserFilter::SyncStateAfterVSync will be called
   // during WindowAndroid::WindowBeginFrameSource::OnVSync() observer iteration.
   if (sync_compositor_ && args.type == cc::BeginFrameArgs::MISSED)
     return;
 
-  // Update |last_begin_frame_args_| before handling
+  // crbug.com/675289: Update |last_begin_frame_args_| before handling

[nasko, 2016/12/21 17:31:45]

nit: https:// so code search can linkify it.

[Eric Seckler, 2016/12/22 09:20:27]

Uh, this must have snuck back during rebase. Shouldn't have been here at all.
Removed.

   // |outstanding_begin_frame_requests_| to prevent the BeginFrameSource from
   // sending the same MISSED args in infinite recursion. This may otherwise
   // happen if |host_->FlushInput()| causes a synchronous OnSetNeedsFlushInput()
   // which can lead to |begin_frame_source_->AddObserver()| and OnBeginFrame().
   // By setting |last_begin_frame_args_|, we indicate to the source not to send
   // the same args during |AddObserver()| again.
   last_begin_frame_args_ = args;
 
   if (outstanding_begin_frame_requests_ & FLUSH_INPUT) {
     ClearBeginFrameRequest(FLUSH_INPUT);
@@ skipping 131 matching lines @@
   if (!compositor)
     return;
 
   overscroll_controller_ = base::MakeUnique<OverscrollControllerAndroid>(
       overscroll_refresh_handler, compositor,
       ui::GetScaleFactorForNativeView(GetNativeView()));
   is_showing_overscroll_glow_ = true;
 }
 
 }  // namespace content