Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(50)

Side by Side Diff: chrome/browser/history/top_sites_impl.cc

Issue 1005873011: Only record the execution time during startup. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/history/top_sites_impl.h" 5 #include "chrome/browser/history/top_sites_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <set> 8 #include <set>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 607 matching lines...) Expand 10 before | Expand all | Expand 10 after
618 new_url.redirects.push_back(url); 618 new_url.redirects.push_back(url);
619 } 619 }
620 new_url.last_forced_time = time; 620 new_url.last_forced_time = time;
621 // Add forced URLs and sort. Added to the end of the list of forced URLs 621 // Add forced URLs and sort. Added to the end of the list of forced URLs
622 // since this is almost always where it needs to go, unless the user's local 622 // since this is almost always where it needs to go, unless the user's local
623 // clock is fiddled with. 623 // clock is fiddled with.
624 MostVisitedURLList::iterator mid = new_list.begin() + num_forced; 624 MostVisitedURLList::iterator mid = new_list.begin() + num_forced;
625 new_list.insert(mid, new_url); 625 new_list.insert(mid, new_url);
626 mid = new_list.begin() + num_forced; // Mid was invalidated. 626 mid = new_list.begin() + num_forced; // Mid was invalidated.
627 std::inplace_merge(new_list.begin(), mid, mid + 1, ForcedURLComparator); 627 std::inplace_merge(new_list.begin(), mid, mid + 1, ForcedURLComparator);
628 SetTopSites(new_list); 628 SetTopSites(new_list, false);
629 return true; 629 return true;
630 } 630 }
631 631
632 bool TopSitesImpl::AddPrepopulatedPages(MostVisitedURLList* urls, 632 bool TopSitesImpl::AddPrepopulatedPages(MostVisitedURLList* urls,
633 size_t num_forced_urls) { 633 size_t num_forced_urls) {
634 bool added = false; 634 bool added = false;
635 for (const auto& prepopulated_page : prepopulated_pages_) { 635 for (const auto& prepopulated_page : prepopulated_pages_) {
636 if (urls->size() - num_forced_urls < kNonForcedTopSitesNumber && 636 if (urls->size() - num_forced_urls < kNonForcedTopSitesNumber &&
637 IndexOf(*urls, prepopulated_page.most_visited.url) == -1) { 637 IndexOf(*urls, prepopulated_page.most_visited.url) == -1) {
638 urls->push_back(prepopulated_page.most_visited); 638 urls->push_back(prepopulated_page.most_visited);
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
745 return; 745 return;
746 const GURL& url = load_details->entry->GetURL(); 746 const GURL& url = load_details->entry->GetURL();
747 if (!cache_->IsKnownURL(url) && CanAddURLToHistory(url)) { 747 if (!cache_->IsKnownURL(url) && CanAddURLToHistory(url)) {
748 // To avoid slamming history we throttle requests when the url updates. 748 // To avoid slamming history we throttle requests when the url updates.
749 // To do otherwise negatively impacts perf tests. 749 // To do otherwise negatively impacts perf tests.
750 RestartQueryForTopSitesTimer(GetUpdateDelay()); 750 RestartQueryForTopSitesTimer(GetUpdateDelay());
751 } 751 }
752 } 752 }
753 } 753 }
754 754
755 void TopSitesImpl::SetTopSites(const MostVisitedURLList& new_top_sites) { 755 void TopSitesImpl::SetTopSites(
756 const MostVisitedURLList& new_top_sites, bool startup) {
756 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 757 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
757 758
758 MostVisitedURLList top_sites(new_top_sites); 759 MostVisitedURLList top_sites(new_top_sites);
759 size_t num_forced_urls = MergeCachedForcedURLs(&top_sites); 760 size_t num_forced_urls = MergeCachedForcedURLs(&top_sites);
760 AddPrepopulatedPages(&top_sites, num_forced_urls); 761 AddPrepopulatedPages(&top_sites, num_forced_urls);
761 762
762 TopSitesDelta delta; 763 TopSitesDelta delta;
763 DiffMostVisited(cache_->top_sites(), top_sites, &delta); 764 DiffMostVisited(cache_->top_sites(), top_sites, &delta);
764 if (!delta.deleted.empty() || !delta.added.empty() || !delta.moved.empty()) { 765 if (!delta.deleted.empty() || !delta.added.empty() || !delta.moved.empty()) {
765 backend_->UpdateTopSites(delta); 766 backend_->UpdateTopSites(delta, startup);
766 } 767 }
767 768
768 last_num_urls_changed_ = delta.added.size() + delta.moved.size(); 769 last_num_urls_changed_ = delta.added.size() + delta.moved.size();
769 770
770 // We always do the following steps (setting top sites in cache, and resetting 771 // We always do the following steps (setting top sites in cache, and resetting
771 // thread safe cache ...) as this method is invoked during startup at which 772 // thread safe cache ...) as this method is invoked during startup at which
772 // point the caches haven't been updated yet. 773 // point the caches haven't been updated yet.
773 cache_->SetTopSites(top_sites); 774 cache_->SetTopSites(top_sites);
774 775
775 // See if we have any tmp thumbnails for the new sites. 776 // See if we have any tmp thumbnails for the new sites.
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
872 timer_.Start(FROM_HERE, delta, this, &TopSitesImpl::TimerFired); 873 timer_.Start(FROM_HERE, delta, this, &TopSitesImpl::TimerFired);
873 } 874 }
874 875
875 void TopSitesImpl::OnGotMostVisitedThumbnails( 876 void TopSitesImpl::OnGotMostVisitedThumbnails(
876 const scoped_refptr<MostVisitedThumbnails>& thumbnails) { 877 const scoped_refptr<MostVisitedThumbnails>& thumbnails) {
877 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 878 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
878 879
879 // Set the top sites directly in the cache so that SetTopSites diffs 880 // Set the top sites directly in the cache so that SetTopSites diffs
880 // correctly. 881 // correctly.
881 cache_->SetTopSites(thumbnails->most_visited); 882 cache_->SetTopSites(thumbnails->most_visited);
882 SetTopSites(thumbnails->most_visited); 883 SetTopSites(thumbnails->most_visited, true);
883 cache_->SetThumbnails(thumbnails->url_to_images_map); 884 cache_->SetThumbnails(thumbnails->url_to_images_map);
884 885
885 ResetThreadSafeImageCache(); 886 ResetThreadSafeImageCache();
886 887
887 MoveStateToLoaded(); 888 MoveStateToLoaded();
888 889
889 // Start a timer that refreshes top sites from history. 890 // Start a timer that refreshes top sites from history.
890 RestartQueryForTopSitesTimer( 891 RestartQueryForTopSitesTimer(
891 base::TimeDelta::FromSeconds(kUpdateIntervalSecs)); 892 base::TimeDelta::FromSeconds(kUpdateIntervalSecs));
892 } 893 }
893 894
894 void TopSitesImpl::OnTopSitesAvailableFromHistory( 895 void TopSitesImpl::OnTopSitesAvailableFromHistory(
895 const MostVisitedURLList* pages) { 896 const MostVisitedURLList* pages) {
896 DCHECK(pages); 897 DCHECK(pages);
897 SetTopSites(*pages); 898 SetTopSites(*pages, false);
898 } 899 }
899 900
900 void TopSitesImpl::OnURLsDeleted(HistoryService* history_service, 901 void TopSitesImpl::OnURLsDeleted(HistoryService* history_service,
901 bool all_history, 902 bool all_history,
902 bool expired, 903 bool expired,
903 const URLRows& deleted_rows, 904 const URLRows& deleted_rows,
904 const std::set<GURL>& favicon_urls) { 905 const std::set<GURL>& favicon_urls) {
905 if (!loaded_) 906 if (!loaded_)
906 return; 907 return;
907 908
908 if (all_history) { 909 if (all_history) {
909 SetTopSites(MostVisitedURLList()); 910 SetTopSites(MostVisitedURLList(), false);
910 backend_->ResetDatabase(); 911 backend_->ResetDatabase();
911 } else { 912 } else {
912 std::set<size_t> indices_to_delete; // Indices into top_sites_. 913 std::set<size_t> indices_to_delete; // Indices into top_sites_.
913 for (const auto& row : deleted_rows) { 914 for (const auto& row : deleted_rows) {
914 if (cache_->IsKnownURL(row.url())) 915 if (cache_->IsKnownURL(row.url()))
915 indices_to_delete.insert(cache_->GetURLIndex(row.url())); 916 indices_to_delete.insert(cache_->GetURLIndex(row.url()));
916 } 917 }
917 918
918 if (indices_to_delete.empty()) 919 if (indices_to_delete.empty())
919 return; 920 return;
920 921
921 MostVisitedURLList new_top_sites(cache_->top_sites()); 922 MostVisitedURLList new_top_sites(cache_->top_sites());
922 for (std::set<size_t>::reverse_iterator i = indices_to_delete.rbegin(); 923 for (std::set<size_t>::reverse_iterator i = indices_to_delete.rbegin();
923 i != indices_to_delete.rend(); i++) { 924 i != indices_to_delete.rend(); i++) {
924 new_top_sites.erase(new_top_sites.begin() + *i); 925 new_top_sites.erase(new_top_sites.begin() + *i);
925 } 926 }
926 SetTopSites(new_top_sites); 927 SetTopSites(new_top_sites, false);
927 } 928 }
928 StartQueryForMostVisited(); 929 StartQueryForMostVisited();
929 } 930 }
930 931
931 void TopSitesImpl::HistoryServiceBeingDeleted(HistoryService* history_service) { 932 void TopSitesImpl::HistoryServiceBeingDeleted(HistoryService* history_service) {
932 history_service_observer_.Remove(history_service); 933 history_service_observer_.Remove(history_service);
933 } 934 }
934 935
935 } // namespace history 936 } // namespace history
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698