| 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/ui/webui/predictors/predictors_handler.h" | 5 #include "chrome/browser/ui/webui/predictors/predictors_handler.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| 11 #include "base/bind.h" | 11 #include "base/bind.h" |
| 12 #include "base/memory/ptr_util.h" | 12 #include "base/memory/ptr_util.h" |
| 13 #include "base/values.h" | 13 #include "base/values.h" |
| 14 #include "chrome/browser/predictors/autocomplete_action_predictor.h" | 14 #include "chrome/browser/predictors/autocomplete_action_predictor.h" |
| 15 #include "chrome/browser/predictors/autocomplete_action_predictor_factory.h" | 15 #include "chrome/browser/predictors/autocomplete_action_predictor_factory.h" |
| 16 #include "chrome/browser/predictors/resource_prefetch_predictor.h" | 16 #include "chrome/browser/predictors/loading_predictor.h" |
| 17 #include "chrome/browser/predictors/resource_prefetch_predictor_factory.h" | 17 #include "chrome/browser/predictors/loading_predictor_factory.h" |
| 18 #include "chrome/browser/predictors/resource_prefetch_predictor_tables.h" | 18 #include "chrome/browser/predictors/resource_prefetch_predictor_tables.h" |
| 19 #include "chrome/browser/profiles/profile.h" | 19 #include "chrome/browser/profiles/profile.h" |
| 20 #include "content/public/browser/web_ui.h" | 20 #include "content/public/browser/web_ui.h" |
| 21 #include "content/public/common/resource_type.h" | 21 #include "content/public/common/resource_type.h" |
| 22 | 22 |
| 23 using predictors::AutocompleteActionPredictor; | 23 using predictors::AutocompleteActionPredictor; |
| 24 using predictors::ResourcePrefetchPredictor; | 24 using predictors::ResourcePrefetchPredictor; |
| 25 using predictors::ResourcePrefetchPredictorTables; | 25 using predictors::ResourcePrefetchPredictorTables; |
| 26 | 26 |
| 27 namespace { | 27 namespace { |
| (...skipping 13 matching lines...) Expand all Loading... |
| 41 default: | 41 default: |
| 42 return "Unknown"; | 42 return "Unknown"; |
| 43 } | 43 } |
| 44 } | 44 } |
| 45 | 45 |
| 46 } // namespace | 46 } // namespace |
| 47 | 47 |
| 48 PredictorsHandler::PredictorsHandler(Profile* profile) { | 48 PredictorsHandler::PredictorsHandler(Profile* profile) { |
| 49 autocomplete_action_predictor_ = | 49 autocomplete_action_predictor_ = |
| 50 predictors::AutocompleteActionPredictorFactory::GetForProfile(profile); | 50 predictors::AutocompleteActionPredictorFactory::GetForProfile(profile); |
| 51 resource_prefetch_predictor_ = | 51 loading_predictor_ = |
| 52 predictors::ResourcePrefetchPredictorFactory::GetForProfile(profile); | 52 predictors::LoadingPredictorFactory::GetForProfile(profile); |
| 53 } | 53 } |
| 54 | 54 |
| 55 PredictorsHandler::~PredictorsHandler() { } | 55 PredictorsHandler::~PredictorsHandler() { } |
| 56 | 56 |
| 57 void PredictorsHandler::RegisterMessages() { | 57 void PredictorsHandler::RegisterMessages() { |
| 58 web_ui()->RegisterMessageCallback("requestAutocompleteActionPredictorDb", | 58 web_ui()->RegisterMessageCallback("requestAutocompleteActionPredictorDb", |
| 59 base::Bind(&PredictorsHandler::RequestAutocompleteActionPredictorDb, | 59 base::Bind(&PredictorsHandler::RequestAutocompleteActionPredictorDb, |
| 60 base::Unretained(this))); | 60 base::Unretained(this))); |
| 61 web_ui()->RegisterMessageCallback("requestResourcePrefetchPredictorDb", | 61 web_ui()->RegisterMessageCallback("requestResourcePrefetchPredictorDb", |
| 62 base::Bind(&PredictorsHandler::RequestResourcePrefetchPredictorDb, | 62 base::Bind(&PredictorsHandler::RequestResourcePrefetchPredictorDb, |
| (...skipping 22 matching lines...) Expand all Loading... |
| 85 } | 85 } |
| 86 dict.Set("db", std::move(db)); | 86 dict.Set("db", std::move(db)); |
| 87 } | 87 } |
| 88 | 88 |
| 89 web_ui()->CallJavascriptFunctionUnsafe("updateAutocompleteActionPredictorDb", | 89 web_ui()->CallJavascriptFunctionUnsafe("updateAutocompleteActionPredictorDb", |
| 90 dict); | 90 dict); |
| 91 } | 91 } |
| 92 | 92 |
| 93 void PredictorsHandler::RequestResourcePrefetchPredictorDb( | 93 void PredictorsHandler::RequestResourcePrefetchPredictorDb( |
| 94 const base::ListValue* args) { | 94 const base::ListValue* args) { |
| 95 const bool enabled = (resource_prefetch_predictor_ != NULL); | 95 const bool enabled = (loading_predictor_ != nullptr); |
| 96 base::DictionaryValue dict; | 96 base::DictionaryValue dict; |
| 97 dict.SetBoolean("enabled", enabled); | 97 dict.SetBoolean("enabled", enabled); |
| 98 | 98 |
| 99 if (enabled) { | 99 if (enabled) { |
| 100 // Url Database cache. | 100 // Url Database cache. |
| 101 auto db = base::MakeUnique<base::ListValue>(); | 101 auto db = base::MakeUnique<base::ListValue>(); |
| 102 auto* resource_prefetch_predictor = |
| 103 loading_predictor_->resource_prefetch_predictor(); |
| 102 AddPrefetchDataMapToListValue( | 104 AddPrefetchDataMapToListValue( |
| 103 *resource_prefetch_predictor_->url_table_cache_, db.get()); | 105 *resource_prefetch_predictor->url_table_cache_, db.get()); |
| 104 dict.Set("url_db", std::move(db)); | 106 dict.Set("url_db", std::move(db)); |
| 105 | 107 |
| 106 db = base::MakeUnique<base::ListValue>(); | 108 db = base::MakeUnique<base::ListValue>(); |
| 107 AddPrefetchDataMapToListValue( | 109 AddPrefetchDataMapToListValue( |
| 108 *resource_prefetch_predictor_->host_table_cache_, db.get()); | 110 *resource_prefetch_predictor->host_table_cache_, db.get()); |
| 109 dict.Set("host_db", std::move(db)); | 111 dict.Set("host_db", std::move(db)); |
| 110 } | 112 } |
| 111 | 113 |
| 112 web_ui()->CallJavascriptFunctionUnsafe("updateResourcePrefetchPredictorDb", | 114 web_ui()->CallJavascriptFunctionUnsafe("updateResourcePrefetchPredictorDb", |
| 113 dict); | 115 dict); |
| 114 } | 116 } |
| 115 | 117 |
| 116 void PredictorsHandler::AddPrefetchDataMapToListValue( | 118 void PredictorsHandler::AddPrefetchDataMapToListValue( |
| 117 const ResourcePrefetchPredictor::PrefetchDataMap& data_map, | 119 const ResourcePrefetchPredictor::PrefetchDataMap& data_map, |
| 118 base::ListValue* db) const { | 120 base::ListValue* db) const { |
| 119 for (const auto& p : data_map) { | 121 for (const auto& p : data_map) { |
| 120 std::unique_ptr<base::DictionaryValue> main(new base::DictionaryValue()); | 122 std::unique_ptr<base::DictionaryValue> main(new base::DictionaryValue()); |
| 121 main->SetString("main_frame_url", p.first); | 123 main->SetString("main_frame_url", p.first); |
| 122 auto resources = base::MakeUnique<base::ListValue>(); | 124 auto resources = base::MakeUnique<base::ListValue>(); |
| 123 for (const predictors::ResourceData& r : p.second.resources()) { | 125 for (const predictors::ResourceData& r : p.second.resources()) { |
| 124 std::unique_ptr<base::DictionaryValue> resource( | 126 std::unique_ptr<base::DictionaryValue> resource( |
| 125 new base::DictionaryValue()); | 127 new base::DictionaryValue()); |
| 126 resource->SetString("resource_url", r.resource_url()); | 128 resource->SetString("resource_url", r.resource_url()); |
| 127 resource->SetString("resource_type", | 129 resource->SetString("resource_type", |
| 128 ConvertResourceType(r.resource_type())); | 130 ConvertResourceType(r.resource_type())); |
| 129 resource->SetInteger("number_of_hits", r.number_of_hits()); | 131 resource->SetInteger("number_of_hits", r.number_of_hits()); |
| 130 resource->SetInteger("number_of_misses", r.number_of_misses()); | 132 resource->SetInteger("number_of_misses", r.number_of_misses()); |
| 131 resource->SetInteger("consecutive_misses", r.consecutive_misses()); | 133 resource->SetInteger("consecutive_misses", r.consecutive_misses()); |
| 132 resource->SetDouble("position", r.average_position()); | 134 resource->SetDouble("position", r.average_position()); |
| 133 resource->SetDouble( | 135 resource->SetDouble( |
| 134 "score", ResourcePrefetchPredictorTables::ComputeResourceScore(r)); | 136 "score", ResourcePrefetchPredictorTables::ComputeResourceScore(r)); |
| 135 resource->SetBoolean("before_first_contentful_paint", | 137 resource->SetBoolean("before_first_contentful_paint", |
| 136 r.before_first_contentful_paint()); | 138 r.before_first_contentful_paint()); |
| 139 auto* resource_prefetch_predictor = |
| 140 loading_predictor_->resource_prefetch_predictor(); |
| 137 resource->SetBoolean( | 141 resource->SetBoolean( |
| 138 "is_prefetchable", | 142 "is_prefetchable", |
| 139 resource_prefetch_predictor_->IsResourcePrefetchable(r)); | 143 resource_prefetch_predictor->IsResourcePrefetchable(r)); |
| 140 resources->Append(std::move(resource)); | 144 resources->Append(std::move(resource)); |
| 141 } | 145 } |
| 142 main->Set("resources", std::move(resources)); | 146 main->Set("resources", std::move(resources)); |
| 143 db->Append(std::move(main)); | 147 db->Append(std::move(main)); |
| 144 } | 148 } |
| 145 } | 149 } |
| OLD | NEW |