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

blimp/engine/session/blimp_engine_session.cc

 // Copyright 2015 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/blimp_engine_session.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
@@ skipping 190 matching lines @@
     std::unique_ptr<BlimpBrowserContext> browser_context,
     net::NetLog* net_log,
     BlimpEngineConfig* engine_config,
     SettingsManager* settings_manager)
     : browser_context_(std::move(browser_context)),
       engine_config_(engine_config),
       screen_(new BlimpScreen),
       settings_manager_(settings_manager),
       settings_feature_(settings_manager_),
       render_widget_feature_(settings_manager_),
+      page_load_tracker_(this),
       net_components_(
           new EngineNetworkComponents(net_log,
                                       QuitCurrentMessageLoopClosure())) {
   DCHECK(engine_config_);
   DCHECK(settings_manager_);
   screen_->UpdateDisplayScaleAndSize(kDefaultScaleFactor,
                                      gfx::Size(kDefaultDisplayWidth,
                                                kDefaultDisplayHeight));
   render_widget_feature_.SetDelegate(kDummyTabId, this);
 }
@@ skipping 350 matching lines @@
   if (changed_flags & content::InvalidateTypes::INVALIDATE_TYPE_TITLE)
     details->set_title(base::UTF16ToUTF8(source->GetTitle()));
 
   if (changed_flags & content::InvalidateTypes::INVALIDATE_TYPE_LOAD)
     details->set_loading(source->IsLoading());
 
   navigation_message_sender_->ProcessMessage(std::move(message),
                                              net::CompletionCallback());
 }
 
-void BlimpEngineSession::LoadProgressChanged(
-    content::WebContents* source, double progress) {
-  if (source != web_contents_.get())
-    return;
-
-  bool page_load_completed = (progress == 1.0);
-
-  // If the client has been notified of a page load completed change, avoid
-  // sending another message. For the first navigation, the initial value used
-  // by the client is already false.
-  if (last_page_load_completed_value_ == page_load_completed)
-    return;
-
-  NavigationMessage* navigation_message = nullptr;
-  std::unique_ptr<BlimpMessage> message =
-      CreateBlimpMessage(&navigation_message, kDummyTabId);
-  navigation_message->set_type(NavigationMessage::NAVIGATION_STATE_CHANGED);
-  NavigationStateChangeMessage* details =
-      navigation_message->mutable_navigation_state_changed();
-  details->set_page_load_completed(page_load_completed);
-
-  navigation_message_sender_->ProcessMessage(std::move(message),
-                                             net::CompletionCallback());
-
-  last_page_load_completed_value_ = page_load_completed;
-}
-
 void BlimpEngineSession::RenderViewCreated(
     content::RenderViewHost* render_view_host) {
   render_widget_feature_.OnRenderWidgetCreated(kDummyTabId,
                                                render_view_host->GetWidget());
 }
 
 void BlimpEngineSession::RenderViewHostChanged(
     content::RenderViewHost* old_host,
     content::RenderViewHost* new_host) {
   // Informs client that WebContents swaps its visible RenderViewHost with
   // another one.
   render_widget_feature_.OnRenderWidgetInitialized(kDummyTabId,
                                                    new_host->GetWidget());
 }
 
 void BlimpEngineSession::RenderViewDeleted(
     content::RenderViewHost* render_view_host) {
   render_widget_feature_.OnRenderWidgetDeleted(kDummyTabId,
                                                render_view_host->GetWidget());
 }
 
+void BlimpEngineSession::DidStartProvisionalLoadForFrame(
+    content::RenderFrameHost* render_frame_host,
+    const GURL& validated_url,
+    bool is_error_page,
+    bool is_iframe_srcdoc) {
+  page_load_tracker_.DidStartProvisionalLoadForFrame(render_frame_host);
+}
+
+void BlimpEngineSession::DidFinishLoad(
+    content::RenderFrameHost* render_frame_host,
+    const GURL& validated_url) {
+  page_load_tracker_.DidFinishLoad(render_frame_host);
+}
+
+void BlimpEngineSession::DidFailLoad(
+    content::RenderFrameHost* render_frame_host,
+    const GURL& validated_url,
+    int error_code,
+    const base::string16& error_description,
+    bool was_ignored_by_handler) {
+  page_load_tracker_.DidFailLoad(render_frame_host);
+}
+
+void BlimpEngineSession::DidFirstPaintAfterLoad(
+    content::RenderWidgetHost* render_widget_host) {
+  page_load_tracker_.DidFirstPaintAfterLoad(render_widget_host);
+}
+
+void BlimpEngineSession::SendPageLoadStatusUpdate(bool load_status) {
+  NavigationMessage* navigation_message = nullptr;
+  std::unique_ptr<BlimpMessage> message =
+      CreateBlimpMessage(&navigation_message, kDummyTabId);
+  navigation_message->set_type(NavigationMessage::NAVIGATION_STATE_CHANGED);
+  NavigationStateChangeMessage* details =
+      navigation_message->mutable_navigation_state_changed();
+  details->set_page_load_completed(load_status);
+
+  navigation_message_sender_->ProcessMessage(std::move(message),
+                                             net::CompletionCallback());
+}
+
 void BlimpEngineSession::PlatformSetContents(
     std::unique_ptr<content::WebContents> new_contents) {
   new_contents->SetDelegate(this);
   Observe(new_contents.get());
   web_contents_ = std::move(new_contents);
 
   aura::Window* parent = window_tree_host_->window();
   aura::Window* content = web_contents_->GetNativeView();
   if (!parent->Contains(content))
     parent->AddChild(content);
   content->Show();
 }
 
 }  // namespace engine
 }  // namespace blimp