Refactor the loading tracking logic in WebContentsImpl.

content/browser/web_contents/web_contents_impl.h

 // 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.
 
 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 948 matching lines @@
   typedef std::vector<int64> PlayerList;
   typedef std::map<uintptr_t, PlayerList> ActiveMediaPlayerMap;
   void AddMediaPlayerEntry(int64 player_cookie,
                            ActiveMediaPlayerMap* player_map);
   void RemoveMediaPlayerEntry(int64 player_cookie,
                               ActiveMediaPlayerMap* player_map);
   // Removes all entries from |player_map| for |render_frame_host|.
   void RemoveAllMediaPlayerEntries(RenderFrameHost* render_frame_host,
                                    ActiveMediaPlayerMap* player_map);
 
+  // Returns true if one of the nodes in the frame_tree_ is loading,

[nasko, 2015/02/13 00:16:29]

nit: "at least one of", |frame_tree_|

[Fabrice (no longer in Chrome), 2015/02/13 18:04:25]

Done.

+  // false otherwise.

[carlosk, 2015/02/13 15:05:41]

nit: the otherwise case here seems redundant.

[Fabrice (no longer in Chrome), 2015/02/24 13:14:46]

Not sure about the style, but there are some others like it in the codebase:
https://code.google.com/p/chromium/codesearch#search/&q=%22false%20otherwise%...

[carlosk, 2015/03/02 14:17:28]

Acknowledged.

+  bool IsTreeLoading();

[Charlie Reis, 2015/02/13 01:01:51]

nit: IsLoading might be clearer.

[Fabrice (no longer in Chrome), 2015/02/13 18:04:25]

There already is an IsLoading in WebContents implementation.
I renamed it to IsFrameTreeLoading instead.

+
   // Data for core operation ---------------------------------------------------
 
   // Delegate for notifying our owner about stuff. Not owned by us.
   WebContentsDelegate* delegate_;
 
   // Handles the back/forward list and loading.
   NavigationControllerImpl controller_;
 
   // The corresponding view.
   scoped_ptr<WebContentsView> view_;
@@ skipping 68 matching lines @@
 
   // Map of SiteInstance ID to max page ID for this tab. A page ID is specific
   // to a given tab and SiteInstance, and must be valid for the lifetime of the
   // WebContentsImpl.
   std::map<int32, int32> max_page_ids_;
 
   // The current load state and the URL associated with it.
   net::LoadStateWithParam load_state_;
   base::string16 load_state_host_;
 
-  // LoadingProgressMap maps FrameTreeNode IDs to a double representing that
-  // frame's completion (from 0 to 1).
-  typedef base::hash_map<int64, double> LoadingProgressMap;
-  LoadingProgressMap loading_progresses_;
   double loading_total_progress_;
 
   base::TimeTicks loading_last_progress_update_;
 
-  // Counter to track how many frames have sent start notifications but not
-  // stop notifications.
-  int loading_frames_in_progress_;
-
   // Upload progress, for displaying in the status bar.
   // Set to zero when there is no significant upload happening.
   uint64 upload_size_;
   uint64 upload_position_;
 
   // Data for current page -----------------------------------------------------
 
   // When a title cannot be taken from any entry, this title will be used.
   base::string16 page_title_when_no_navigation_entry_;
 
@@ skipping 187 matching lines @@
   // Adds/removes a callback called on creation of each new WebContents.
   static void AddCreatedCallbackForTesting(const CreatedCallback& callback);
   static void RemoveCreatedCallbackForTesting(const CreatedCallback& callback);
 
   DISALLOW_COPY_AND_ASSIGN(FriendZone);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_