Fixed the reporting of paint times in window.chrome.loadTimes()

content/renderer/render_view_impl.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_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/auto_reset.h"
@@ skipping 3308 matching lines @@
       (*i)->ViewFlushedPaint();
   }
 #endif
 
   // If the RenderWidget is closing down then early-exit, otherwise we'll crash.
   // See crbug.com/112921.
   if (!webview())
     return;
 
   WebFrame* main_frame = webview()->mainFrame();
   for (WebFrame* frame = main_frame; frame;

[Charlie Reis, 2014/10/21 23:40:20]

Yikes.  The premise behind this whole loop seems broken to me.  Sorry to have
missed it.

I think this is intended to be the same short-term hack to avoid an OOPIF crash
as in GetScrollOffset below.  Can you copy Nasko's TODO from line 3360 here as
well, so that we update both places in a follow-up CL?

[Pat Meenan, 2014/10/22 12:40:03]

Done.

        frame = frame->traverseNext(false)) {
-    if (frame->isWebLocalFrame())
+    if (frame->isWebLocalFrame() && !frame->parent()) {
       main_frame = frame;
+      break;
+    }
   }
 
   // If we have a provisional frame we are between the start and commit stages
   // of loading and we don't want to save stats.
   if (!main_frame->provisionalDataSource()) {
     WebDataSource* ds = main_frame->dataSource();
     DocumentState* document_state = DocumentState::FromDataSource(ds);
 
     // TODO(jar): The following code should all be inside a method, probably in
     // NavigatorState.
@@ skipping 856 matching lines @@
     std::vector<gfx::Size> sizes;
     ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
     if (!url.isEmpty())
       urls.push_back(
           FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
   }
   SendUpdateFaviconURL(urls);
 }
 
 }  // namespace content