Support plumbing LatencyInfo through the old software path.

content/browser/renderer_host/render_widget_host_view_win.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_win.h"
 
 #include <dwmapi.h>
 #include <InputScope.h>
 #include <wtsapi32.h>
 #pragma comment(lib, "wtsapi32.lib")
@@ skipping 731 matching lines @@
   // Send the invalid rect in screen coordinates.
   gfx::Rect invalid_screen_rect(damage_bounds);
   invalid_screen_rect.Offset(GetPixelBounds().OffsetFromOrigin());
 
   PaintPluginWindowsHelper(m_hWnd, invalid_screen_rect);
 }
 
 void RenderWidgetHostViewWin::DidUpdateBackingStore(
     const gfx::Rect& scroll_rect,
     const gfx::Vector2d& scroll_delta,
-    const std::vector<gfx::Rect>& copy_rects) {
+    const std::vector<gfx::Rect>& copy_rects,
+    const ui::LatencyInfo& latency_info) {
+  software_latency_info_.MergeWith(latency_info);
   if (is_hidden_)
     return;
 
   // Schedule invalidations first so that the ScrollWindowEx call is closer to
   // Redraw.  That minimizes chances of "flicker" resulting if the screen
   // refreshes before we have a chance to paint the exposed area.  Somewhat
   // surprisingly, this ordering matters.
 
   for (size_t i = 0; i < copy_rects.size(); ++i) {
     gfx::Rect pixel_rect = ui::win::DIPToScreenRect(copy_rects[i]);
@@ skipping 624 matching lines @@
     }
     if (!web_contents_switch_paint_time_.is_null()) {
       TimeDelta web_contents_switch_paint_duration = TimeTicks::Now() -
           web_contents_switch_paint_time_;
       UMA_HISTOGRAM_TIMES("MPArch.RWH_TabSwitchPaintDuration",
           web_contents_switch_paint_duration);
       // Reset contents_switch_paint_time_ to 0 so future tab selections are
       // recorded.
       web_contents_switch_paint_time_ = TimeTicks();
     }
+
+    software_latency_info_.swap_timestamp = TimeTicks::HighResNow();
+    render_widget_host_->FrameSwapped(software_latency_info_);
+    software_latency_info_.Clear();
   } else {
     DrawBackground(paint_dc.m_ps.rcPaint, &paint_dc);
     if (whiteout_start_time_.is_null())
       whiteout_start_time_ = TimeTicks::Now();
   }
 }
 
 void RenderWidgetHostViewWin::DrawBackground(const RECT& dirty_rect,
                                              CPaintDC* dc) {
   if (!background_.empty()) {
@@ skipping 1734 matching lines @@
   return new RenderWidgetHostViewWin(widget);
 }
 
 // static
 void RenderWidgetHostViewPort::GetDefaultScreenInfo(
       WebKit::WebScreenInfo* results) {
   GetScreenInfoForWindow(results, 0);
 }
 
 }  // namespace content