OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/net/predictor.h" | 5 #include "chrome/browser/net/predictor.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <cmath> | 8 #include <cmath> |
9 #include <set> | 9 #include <set> |
10 #include <sstream> | 10 #include <sstream> |
(...skipping 570 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
581 DCHECK_CURRENTLY_ON(BrowserThread::IO); | 581 DCHECK_CURRENTLY_ON(BrowserThread::IO); |
582 // Just finish up work if an incremental trim is in progress. | 582 // Just finish up work if an incremental trim is in progress. |
583 if (urls_being_trimmed_.empty()) | 583 if (urls_being_trimmed_.empty()) |
584 LoadUrlsForTrimming(); | 584 LoadUrlsForTrimming(); |
585 IncrementalTrimReferrers(true); // Do everything now. | 585 IncrementalTrimReferrers(true); // Do everything now. |
586 } | 586 } |
587 | 587 |
588 void Predictor::SerializeReferrers(base::ListValue* referral_list) { | 588 void Predictor::SerializeReferrers(base::ListValue* referral_list) { |
589 DCHECK_CURRENTLY_ON(BrowserThread::IO); | 589 DCHECK_CURRENTLY_ON(BrowserThread::IO); |
590 referral_list->Clear(); | 590 referral_list->Clear(); |
591 referral_list->Append(new base::FundamentalValue(kPredictorReferrerVersion)); | 591 referral_list->AppendInteger(kPredictorReferrerVersion); |
592 for (Referrers::const_iterator it = referrers_.begin(); | 592 for (Referrers::const_iterator it = referrers_.begin(); |
593 it != referrers_.end(); ++it) { | 593 it != referrers_.end(); ++it) { |
594 // Serialize the list of subresource names. | 594 // Serialize the list of subresource names. |
595 base::Value* subresource_list(it->second.Serialize()); | 595 base::Value* subresource_list(it->second.Serialize()); |
596 | 596 |
597 // Create a list for each referer. | 597 // Create a list for each referer. |
598 base::ListValue* motivator(new base::ListValue); | 598 base::ListValue* motivator(new base::ListValue); |
599 motivator->Append(new base::StringValue(it->first.spec())); | 599 motivator->AppendString(it->first.spec()); |
600 motivator->Append(subresource_list); | 600 motivator->Append(subresource_list); |
601 | 601 |
602 referral_list->Append(motivator); | 602 referral_list->Append(motivator); |
603 } | 603 } |
604 } | 604 } |
605 | 605 |
606 void Predictor::DeserializeReferrers(const base::ListValue& referral_list) { | 606 void Predictor::DeserializeReferrers(const base::ListValue& referral_list) { |
607 DCHECK_CURRENTLY_ON(BrowserThread::IO); | 607 DCHECK_CURRENTLY_ON(BrowserThread::IO); |
608 int format_version = -1; | 608 int format_version = -1; |
609 if (referral_list.GetSize() > 0 && | 609 if (referral_list.GetSize() > 0 && |
(...skipping 631 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1241 if (first_navigations_.find(url) == first_navigations_.end()) | 1241 if (first_navigations_.find(url) == first_navigations_.end()) |
1242 first_navigations_[url] = base::TimeTicks::Now(); | 1242 first_navigations_[url] = base::TimeTicks::Now(); |
1243 } | 1243 } |
1244 | 1244 |
1245 void Predictor::InitialObserver::GetInitialDnsResolutionList( | 1245 void Predictor::InitialObserver::GetInitialDnsResolutionList( |
1246 base::ListValue* startup_list) { | 1246 base::ListValue* startup_list) { |
1247 DCHECK_CURRENTLY_ON(BrowserThread::IO); | 1247 DCHECK_CURRENTLY_ON(BrowserThread::IO); |
1248 DCHECK(startup_list); | 1248 DCHECK(startup_list); |
1249 startup_list->Clear(); | 1249 startup_list->Clear(); |
1250 DCHECK_EQ(0u, startup_list->GetSize()); | 1250 DCHECK_EQ(0u, startup_list->GetSize()); |
1251 startup_list->Append( | 1251 startup_list->AppendInteger(kPredictorStartupFormatVersion); |
1252 new base::FundamentalValue(kPredictorStartupFormatVersion)); | |
1253 for (FirstNavigations::iterator it = first_navigations_.begin(); | 1252 for (FirstNavigations::iterator it = first_navigations_.begin(); |
1254 it != first_navigations_.end(); | 1253 it != first_navigations_.end(); |
1255 ++it) { | 1254 ++it) { |
1256 DCHECK(it->first == Predictor::CanonicalizeUrl(it->first)); | 1255 DCHECK(it->first == Predictor::CanonicalizeUrl(it->first)); |
1257 startup_list->Append(new base::StringValue(it->first.spec())); | 1256 startup_list->AppendString(it->first.spec()); |
1258 } | 1257 } |
1259 } | 1258 } |
1260 | 1259 |
1261 void Predictor::InitialObserver::GetFirstResolutionsHtml( | 1260 void Predictor::InitialObserver::GetFirstResolutionsHtml( |
1262 std::string* output) { | 1261 std::string* output) { |
1263 DCHECK_CURRENTLY_ON(BrowserThread::IO); | 1262 DCHECK_CURRENTLY_ON(BrowserThread::IO); |
1264 | 1263 |
1265 UrlInfo::UrlInfoTable resolution_list; | 1264 UrlInfo::UrlInfoTable resolution_list; |
1266 { | 1265 { |
1267 for (FirstNavigations::iterator it(first_navigations_.begin()); | 1266 for (FirstNavigations::iterator it(first_navigations_.begin()); |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1314 } | 1313 } |
1315 | 1314 |
1316 void SimplePredictor::ShutdownOnUIThread() { | 1315 void SimplePredictor::ShutdownOnUIThread() { |
1317 SetShutdown(true); | 1316 SetShutdown(true); |
1318 } | 1317 } |
1319 | 1318 |
1320 bool SimplePredictor::CanPrefetchAndPrerender() const { return true; } | 1319 bool SimplePredictor::CanPrefetchAndPrerender() const { return true; } |
1321 bool SimplePredictor::CanPreresolveAndPreconnect() const { return true; } | 1320 bool SimplePredictor::CanPreresolveAndPreconnect() const { return true; } |
1322 | 1321 |
1323 } // namespace chrome_browser_net | 1322 } // namespace chrome_browser_net |
OLD | NEW |