Cancel the next 10 updates if there's a timeout in jumplist updater

chrome/browser/win/jumplist.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 CHROME_BROWSER_WIN_JUMPLIST_H_
 #define CHROME_BROWSER_WIN_JUMPLIST_H_
 
 #include <stddef.h>
 
 #include <list>
@@ skipping 152 matching lines @@
 
   // Posts tasks to update the JumpList and delete any obsolete JumpList related
   // folders.
   void PostRunUpdate();
 
   // history::TopSitesObserver implementation.
   void TopSitesLoaded(history::TopSites* top_sites) override;
   void TopSitesChanged(history::TopSites* top_sites,
                        ChangeReason change_reason) override;
 
+  // Checks if the timeout flag |jumplist_updater_timeout_| is true and updates
+  // the flag and |cancelled_update_count_| accordingly.
+  // Returns true if |jumplist_updater_timeout_| is still true after being
+  // updated.
+  bool CheckAndUpdateTimeoutInfo();
+
   // Called on a timer to update the most visited URLs after requests storms
   // have subsided.
   void DeferredTopSitesChanged();
 
   // Called on a timer to update the "Recently Closed" category of JumpList
   // after requests storms have subsided.
   void DeferredTabRestoreServiceChanged();
 
   // Creates at most |max_items| icon files in |icon_dir| for the
   // asynchrounously loaded icons stored in |item_list|.
@@ skipping 42 matching lines @@
   base::string16 app_id_;
 
   // Timer for requesting delayed updates of the "Most Visited" category of
   // jumplist.
   base::OneShotTimer timer_most_visited_;
 
   // Timer for requesting delayed updates of the "Recently Closed" category of
   // jumplist.
   base::OneShotTimer timer_recently_closed_;
 
+  // The number of jumplist updates cancelled intentionally due to jumplist
+  // updater timeout.
+  int cancelled_update_count_;

[gab, 2017/05/12 17:58:47]

Initialize member inline here instead of in constructor initializer list (same
for bool)

[chengx, 2017/05/12 18:53:38]

Done.

+
+  // A boolean flag indicating if there's a timeout in jumplist updater. This
+  // flag will be cleared after the following |kCancelledUpdates| jumplist
+  // updates are cancelled intentionally.
+  bool jumplist_updater_timeout_;

[gab, 2017/05/12 17:58:47]

Actually you don't need the bool, you can do this with just one int variable.

// Number of updates to skip to alleviate the machine when a previous update was
too slow. Updates will be resumed when this reaches 0 again.
int updates_to_skip_ = 0;

I think this will simplify the logic as well.

[chengx, 2017/05/12 18:53:38]

Agreed. I've updated the logic in the new patch set.

+
   // Holds data that can be accessed from multiple threads.
   scoped_refptr<base::RefCountedData<JumpListData>> jumplist_data_;
 
   // Id of last favicon task. It's used to cancel current task if a new one
   // comes in before it finishes.
   base::CancelableTaskTracker::TaskId task_id_;
 
   // A task runner running tasks to update the JumpList.
   scoped_refptr<base::SingleThreadTaskRunner> update_jumplist_task_runner_;
 
   // A task runner running tasks to delete JumpListIcons directory and
   // JumpListIconsOld directory.
   scoped_refptr<base::SequencedTaskRunner> delete_jumplisticons_task_runner_;
 
   // For callbacks may be run after destruction.
   base::WeakPtrFactory<JumpList> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(JumpList);
 };
 
 #endif  // CHROME_BROWSER_WIN_JUMPLIST_H_