Make GPU benchmarking numAnimationFrames and totalPaintTime work in software mode.

content/renderer/render_widget.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/renderer/render_widget.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "content/common/swapped_out_messages.h"
 #include "content/common/view_messages.h"
 #include "content/public/common/content_switches.h"
 #include "content/renderer/render_process.h"
 #include "content/renderer/render_thread_impl.h"
 #include "content/renderer/renderer_webkitplatformsupport_impl.h"
 #include "ipc/ipc_sync_message.h"
 #include "skia/ext/platform_canvas.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebRenderingStats.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebHelperPlugin.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPagePopup.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupMenu.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupMenuInfo.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRange.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPoint.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h"
@@ skipping 65 matching lines @@
       is_swapped_out_(swapped_out),
       input_method_is_active_(false),
       text_input_type_(ui::TEXT_INPUT_TYPE_NONE),
       can_compose_inline_(true),
       popup_type_(popup_type),
       pending_window_rect_count_(0),
       suppress_next_char_events_(false),
       is_accelerated_compositing_active_(false),
       animation_update_pending_(false),
       invalidation_task_posted_(false),
+      total_do_deferred_update_count_(0),
       screen_info_(screen_info),
       device_scale_factor_(1) {
   if (!swapped_out)
     RenderProcess::current()->AddRefProcess();
   DCHECK(RenderThread::Get());
   has_disable_gpu_vsync_switch_ = CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kDisableGpuVsync);
 #if defined(OS_CHROMEOS) || defined(OS_MACOSX)
   device_scale_factor_ = screen_info.verticalDPI / kStandardDPI;
   // Unless an explicit scale factor was provided for testing, ensure the scale
@@ skipping 762 matching lines @@
                                  60);
     }
 
     // Calculate filtered time per frame:
     float frame_time_elapsed = static_cast<float>(delay.InSecondsF());
     filtered_time_per_frame_ =
         0.9f * filtered_time_per_frame_ + 0.1f * frame_time_elapsed;
   }
   last_do_deferred_update_time_ = frame_begin_ticks;
 
+  total_do_deferred_update_count_++;

[nduca, 2012/07/25 17:14:04]

name is a bit awkward. Look in the .h for things that count and copy the
convention? Barring that, do_deferred_update_count or num_do_deferred_updates.
Also, you should only increment this when we're !accelerated, since in
accelerated single thread mode, we go through DoDeferredUpdate.

Its important that if you did some frames in software, some frames in hardwaare,
we get a good result. I'm not sure how to make that happen though... maybe get
the webview's data and then add in the render widget data?

[dtu, 2012/07/27 01:40:48]

Just changed to deferred_update_count_. Hopefully sounds a little less awkward.
Other counters in this class are pending_window_rect_count_ and
num_swapbuffers_complete_pending_.

Done. Even if the current mode is software, it's going to plumb through and get
the frame counts from CCLayerTreeView if it's not null, then add the software
frame count to it in the RenderWidget. Other stats might not be accurate
though... (at this point in time)

+
   // OK, save the pending update to a local since painting may cause more
   // invalidation.  Some WebCore rendering objects only layout when painted.
   PaintAggregator::PendingUpdate update;
   paint_aggregator_.PopPendingUpdate(&update);
 
   gfx::Rect scroll_damage = update.GetScrollDamage();
   gfx::Rect bounds = update.GetPaintBounds().Union(scroll_damage);
 
   // Notify derived classes that we're about to initiate a paint.
   WillInitiatePaint();
@@ skipping 59 matching lines @@
     pending_update_params_->bitmap = current_paint_buf_->id();
     pending_update_params_->bitmap_rect = bounds;
 
     std::vector<gfx::Rect>& copy_rects = pending_update_params_->copy_rects;
     // The scroll damage is just another rectangle to paint and copy.
     copy_rects.swap(update.paint_rects);
     if (!scroll_damage.IsEmpty())
       copy_rects.push_back(scroll_damage);
 
     for (size_t i = 0; i < copy_rects.size(); ++i)
       PaintRect(copy_rects[i], pixel_bounds.origin(), canvas.get());

[nduca, 2012/07/25 17:14:04]

there is code in here that forces a software paint. That should contribute to
timeSpentPainting

[dtu, 2012/07/27 01:40:48]

Done this in WebViewImpl in http://wkbug.com/92325. There is already a histogram
there that records the software paint time, so just piggybacking off of that.

 
     // Software FPS tick for performance tests. The accelerated path traces the
     // frame events in didCommitAndDrawCompositorFrame. See throughput_tests.cc.
     // NOTE: Tests may break if this event is renamed or moved.
     UNSHIPPED_TRACE_EVENT_INSTANT0("test_fps", "TestFrameTickSW");
   } else {  // Accelerated compositing path
     // Begin painting.
     // If painting is done via the gpu process then we don't set any damage
     // rects to save the browser process from doing unecessary work.
     pending_update_params_->bitmap_rect = bounds;
@@ skipping 780 matching lines @@
 void RenderWidget::CleanupWindowInPluginMoves(gfx::PluginWindowHandle window) {
   for (WebPluginGeometryVector::iterator i = plugin_window_moves_.begin();
        i != plugin_window_moves_.end(); ++i) {
     if (i->window == window) {
       plugin_window_moves_.erase(i);
       break;
     }
   }
 }
 
+void RenderWidget::GetRenderingStats(WebKit::WebRenderingStats& stats) const {
+  if (is_accelerated_compositing_active_) {

[nduca, 2012/07/25 17:14:04]

if (is ...) {
  get
  return
}
... unindented software case.

[dtu, 2012/07/27 01:40:48]

Done. With the way the stats are calculated now, the if statement is
unnecessary.

+    webwidget()->renderingStats(stats);
+  } else {
+    stats.numAnimationFrames = total_do_deferred_update_count_;
+    stats.numFramesSentToScreen = total_do_deferred_update_count_;
+  }
+}
+
 void RenderWidget::BeginSmoothScroll(bool down, bool scroll_far) {
   Send(new ViewHostMsg_BeginSmoothScroll(routing_id_, down, scroll_far));
 }
 
 bool RenderWidget::WillHandleMouseEvent(const WebKit::WebMouseEvent& event) {
   return false;
 }
 
 bool RenderWidget::WebWidgetHandlesCompositorScheduling() const {
   return false;
 }