Remove LatencyInfo merge from software rendering path

Remove LatencyInfo merge from software rendering path

BUG=246034
TEST=unittests pass.

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=242404

[Yufeng Shen (Slow to review), 2013-12-16 21:27:11]

On 2013/12/12 23:42:58, Yufeng Shen wrote:

John, mind taking at this ? It is a pretty straightfoward change.

[jbauman, 2013-12-17 00:07:33]

lgtm

https://codereview.chromium.org/111483003/diff/40001/content/browser/renderer...
File content/browser/renderer_host/render_widget_host_view_aura.cc (right):

https://codereview.chromium.org/111483003/diff/40001/content/browser/renderer...
content/browser/renderer_host/render_widget_host_view_aura.cc:938:
software_latency_info_.push_back(latency_info[i]);
Maybe make this

software_latency_info_.insert(software_latency_info_.end(),
latency_info.begin(), latency_info.end());

though neither way is particularly clean, I guess.

[Yufeng Shen (Slow to review), 2013-12-17 00:22:31]

add OWNERS:

kbr@ for content/browser/renderer_host/

jln@ for content/common/view_messages.h

joi@ for content/port/

jamesr@ for content/renderer/

sky@ for content/test/test_render_view_host.h

[sky, 2013-12-17 00:25:44]

LGTM

[Ken Russell (switch to Gerrit), 2013-12-17 01:03:10]

LGTM

https://codereview.chromium.org/111483003/diff/40001/content/browser/renderer...
File content/browser/renderer_host/render_widget_host_view_aura.cc (right):

https://codereview.chromium.org/111483003/diff/40001/content/browser/renderer...
content/browser/renderer_host/render_widget_host_view_aura.cc:2533:
compositor->SetLatencyInfo(software_latency_info_[i]);
The naming convention seems strange now. I'd expect a method named
SetLatencyInfo to overwrite any internal state with the incoming argument,
rather than merging it in (assuming that's what's happening).

[Jói, 2013-12-17 12:51:10]

//content/port LGTM.

[jln (very slow on Chromium), 2013-12-17 18:44:41]

content/common/view_messages.h lgtm

[jamesr, 2013-12-19 20:12:07]

content/renderer lgtm

[commit-bot: I haz the power, 2013-12-19 20:16:17]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/111483003/40001

[commit-bot: I haz the power, 2013-12-19 20:16:24]

Failed to apply patch for
content/browser/renderer_host/render_widget_host_view_mac.mm:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file content/browser/renderer_host/render_widget_host_view_mac.mm
  Hunk #1 succeeded at 927 (offset -6 lines).
  Hunk #2 FAILED at 2003.
  1 out of 2 hunks FAILED -- saving rejects to file
content/browser/renderer_host/render_widget_host_view_mac.mm.rej

Patch:       content/browser/renderer_host/render_widget_host_view_mac.mm
Index: content/browser/renderer_host/render_widget_host_view_mac.mm
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm
b/content/browser/renderer_host/render_widget_host_view_mac.mm
index
9b5de7fdcff4e76d32b6f171612690730db4381e..4efcd2cb3b17c6b85ed3781062e8c08ea9002d16
100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -933,10 +933,11 @@ void RenderWidgetHostViewMac::DidUpdateBackingStore(
     const gfx::Rect& scroll_rect,
     const gfx::Vector2d& scroll_delta,
     const std::vector<gfx::Rect>& copy_rects,
-    const ui::LatencyInfo& latency_info) {
+    const std::vector<ui::LatencyInfo>& latency_info) {
   GotSoftwareFrame();
 
-  software_latency_info_.MergeWith(latency_info);
+  for (size_t i = 0; i < latency_info.size(); i++)
+    software_latency_info_.push_back(latency_info[i]);
 
   if (render_widget_host_->is_hidden())
     return;
@@ -2002,10 +2003,12 @@ gfx::Rect
RenderWidgetHostViewMac::GetScaledOpenGLPixelRect(
 }
 
 void RenderWidgetHostViewMac::FrameSwapped() {
-  software_latency_info_.AddLatencyNumber(
-      ui::INPUT_EVENT_LATENCY_TERMINATED_FRAME_SWAP_COMPONENT, 0, 0);
-  render_widget_host_->FrameSwapped(software_latency_info_);
-  software_latency_info_.Clear();
+  for (size_t i = 0; i < software_latency_info_.size(); i++) {
+    software_latency_info_[i].AddLatencyNumber(
+        ui::INPUT_EVENT_LATENCY_TERMINATED_FRAME_SWAP_COMPONENT, 0, 0);
+    render_widget_host_->FrameSwapped(software_latency_info_[i]);
+  }
+  software_latency_info_.clear();
 }
 
 }  // namespace content

[commit-bot: I haz the power, 2013-12-19 20:37:49]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/111483003/60001

[commit-bot: I haz the power, 2013-12-19 21:04:18]

Retried try job too often on mac_rel for step(s) base_unittests, browser_tests,
interactive_ui_tests, net_unittests, unit_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_rel&nu...

[commit-bot: I haz the power, 2013-12-19 21:04:31]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/111483003/80001

[commit-bot: I haz the power, 2013-12-20 02:19:13]

Retried try job too often on linux_aura for step(s) browser_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_aura...

[Ken Russell (switch to Gerrit), 2013-12-20 02:45:35]

On 2013/12/20 02:19:13, I haz the power (commit-bot) wrote:
> Retried try job too often on linux_aura for step(s) browser_tests
>
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_aura...

That failure looks potentially related to this patch. Some of the screenshot
code is built on the LatencyInfo structure -- not sure whether that's being
triggered here though.

[Yufeng Shen (Slow to review), 2013-12-20 03:15:14]

On 2013/12/20 02:45:35, Ken Russell wrote:
> On 2013/12/20 02:19:13, I haz the power (commit-bot) wrote:
> > Retried try job too often on linux_aura for step(s) browser_tests
> >
>
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_aura...
> 
> That failure looks potentially related to this patch. Some of the screenshot
> code is built on the LatencyInfo structure -- not sure whether that's being
> triggered here though.

hmmm, I think the linux_aura bot is failing all the patches now
http://build.chromium.org/p/tryserver.chromium/builders/linux_aura/

[commit-bot: I haz the power, 2013-12-20 13:19:53]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/111483003/80001

[commit-bot: I haz the power, 2013-12-20 17:03:30]

Failed to apply the patch.
Sending        content/browser/renderer_host/render_widget_host_view_android.cc
Sending        content/browser/renderer_host/render_widget_host_view_android.h
Sending        content/browser/renderer_host/render_widget_host_view_aura.cc
Sending        content/browser/renderer_host/render_widget_host_view_aura.h
Sending        content/browser/renderer_host/render_widget_host_view_gtk.cc
Sending        content/browser/renderer_host/render_widget_host_view_gtk.h
Sending        content/browser/renderer_host/render_widget_host_view_guest.cc
Sending        content/browser/renderer_host/render_widget_host_view_guest.h
Sending        content/browser/renderer_host/render_widget_host_view_mac.h
Sending        content/browser/renderer_host/render_widget_host_view_mac.mm
Sending        content/browser/renderer_host/render_widget_host_view_win.cc
Sending        content/browser/renderer_host/render_widget_host_view_win.h
Sending        content/common/view_messages.h
Sending        content/port/browser/render_widget_host_view_port.h
Sending        content/renderer/render_view_impl.cc
Sending        content/renderer/render_widget.cc
Sending        content/renderer/render_widget.h
Sending        content/test/test_render_view_host.h
Transmitting file data ..................svn: Commit failed (details follow):
svn: File '/trunk/src/content/common/view_messages.h' is out of date

[commit-bot: I haz the power, 2013-12-20 17:25:05]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/111483003/130001

[commit-bot: I haz the power, 2013-12-20 19:43:07]

Retried try job too often on win_rel for step(s) unit_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...

[commit-bot: I haz the power, 2013-12-20 19:54:09]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/111483003/130001

[commit-bot: I haz the power, 2013-12-20 23:28:03]

Retried try job too often on win_rel for step(s) unit_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...

[commit-bot: I haz the power, 2013-12-21 15:26:41]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/111483003/130001

[commit-bot: I haz the power, 2013-12-21 18:40:13]

Retried try job too often on win_rel for step(s) unit_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...

[commit-bot: I haz the power, 2013-12-23 17:11:09]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/111483003/130001

[commit-bot: I haz the power, 2013-12-23 19:14:16]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/111483003/130001

[commit-bot: I haz the power, 2013-12-23 20:42:55]

Change committed as 242404