blimp: Update page load status update indicator to use first paint.

blimp/engine/session/page_load_tracker.cc

Index: blimp/engine/session/page_load_tracker.cc
diff --git a/blimp/engine/session/page_load_tracker.cc b/blimp/engine/session/page_load_tracker.cc
new file mode 100644
index 0000000000000000000000000000000000000000..f014305eb1d2b643b13d71b7a2fd3af3cc4aa78b
--- /dev/null
+++ b/blimp/engine/session/page_load_tracker.cc
@@ -0,0 +1,93 @@
+// Copyright 2016 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 "blimp/engine/session/page_load_tracker.h"
+
+#include "content/public/browser/render_widget_host_view.h"
+
+namespace blimp {
+namespace engine {
+
+namespace {
+
+content::RenderWidgetHost* GetRenderWidgetHostIfMainFrame(
+    content::RenderFrameHost* render_frame_host) {
+  if (render_frame_host->GetParent() != nullptr)
+    return nullptr;
+
+  return render_frame_host->GetView()->GetRenderWidgetHost();
+}
+
+}  // namespace
+
+PageLoadTracker::PageLoadTracker(PageLoadTrackerClient* client)
+    : client_(client) {}
+
+PageLoadTracker::~PageLoadTracker() {}
+
+void PageLoadTracker::DidStartProvisionalLoadForFrame(
+    content::RenderFrameHost* render_frame_host) {
+  content::RenderWidgetHost* render_widget_host =
+      GetRenderWidgetHostIfMainFrame(render_frame_host);
+  if (!render_widget_host)
+    return;
+
+  render_widget_load_status_[render_widget_host] = LoadStatus();
+
+  // Notify the client that a navigation was initiated.
+  client_->SendPageLoadStatusUpdate(false);

[mdjones, 2016/05/18 20:30:00]

This call feels like you are switching the loading indicator off. Consider
inverting the boolean value for this function (load_status doesn't tell me
much).

[Khushal, 2016/05/18 21:16:58]

Hmmm, I guess I was looking at it as the engine communicating the load status
for a tab. And the client uses this information to drive the indicator. Added a
comment about it.

+}
+
+void PageLoadTracker::DidFinishLoad(
+    content::RenderFrameHost* render_frame_host) {
+  content::RenderWidgetHost* render_widget_host =
+      GetRenderWidgetHostIfMainFrame(render_frame_host);
+  if (!render_widget_host)
+    return;
+
+  RenderWidgetLoadStatusMap::iterator it =
+      render_widget_load_status_.find(render_widget_host);
+  DCHECK(it != render_widget_load_status_.end());
+
+  it->second.page_loaded = true;
+  if (it->second.Loaded()) {
+    client_->SendPageLoadStatusUpdate(true);
+    render_widget_load_status_.erase(it);
+  }
+}
+
+void PageLoadTracker::DidFailLoad(content::RenderFrameHost* render_frame_host) {
+  content::RenderWidgetHost* render_widget_host =
+      GetRenderWidgetHostIfMainFrame(render_frame_host);
+  if (!render_widget_host)
+    return;
+
+  RenderWidgetLoadStatusMap::iterator it =
+      render_widget_load_status_.find(render_widget_host);
+  DCHECK(it != render_widget_load_status_.end());
+
+  // If the navigation failed, the client should dismiss the load indicator.
+  client_->SendPageLoadStatusUpdate(true);
+  render_widget_load_status_.erase(it);
+}
+
+void PageLoadTracker::DidFirstPaintAfterLoad(
+    content::RenderWidgetHost* render_widget_host) {
+  RenderWidgetLoadStatusMap::iterator it =
+      render_widget_load_status_.find(render_widget_host);
+  DCHECK(it != render_widget_load_status_.end());
+
+  it->second.did_first_paint = true;
+  if (it->second.Loaded()) {
+    client_->SendPageLoadStatusUpdate(true);
+    render_widget_load_status_.erase(it);
+  }
+}
+
+bool PageLoadTracker::LoadStatus::Loaded() const {
+  return page_loaded && did_first_paint;
+}
+
+}  // namespace engine
+}  // namespace blimp