Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix formatting for perf predictor tab helper #6337

Merged
merged 2 commits into from
Aug 11, 2020
Merged

Fix formatting for perf predictor tab helper #6337

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffea72c
Fix formatting
deeppandya Aug 4, 2020
65aef29
fix lint error
deeppandya Aug 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 28 additions & 30 deletions components/brave_perf_predictor/browser/perf_predictor_tab_helper.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ content::WebContents* GetWebContents(int render_process_id,
int render_frame_id,
int frame_tree_node_id) {
content::WebContents* web_contents =
content::WebContents::FromFrameTreeNodeId(frame_tree_node_id);
content::WebContents::FromFrameTreeNodeId(frame_tree_node_id);
if (!web_contents) {
content::RenderFrameHost* rfh =
content::RenderFrameHost::FromID(render_process_id, render_frame_id);
content::RenderFrameHost::FromID(render_process_id, render_frame_id);
if (!rfh) {
return nullptr;
}
Expand All @@ -42,48 +42,47 @@ content::WebContents* GetWebContents(int render_process_id,
} // namespace

PerfPredictorTabHelper::PerfPredictorTabHelper(
content::WebContents* web_contents)
: WebContentsObserver(web_contents),
bandwidth_predictor_(std::make_unique<BandwidthSavingsPredictor>(
NamedThirdPartyRegistryFactory::GetForBrowserContext(
web_contents->GetBrowserContext()))) {
content::WebContents* web_contents)
: WebContentsObserver(web_contents),
bandwidth_predictor_(std::make_unique<BandwidthSavingsPredictor>(
NamedThirdPartyRegistryFactory::GetForBrowserContext(
web_contents->GetBrowserContext()))) {
if (web_contents->GetBrowserContext()->IsOffTheRecord())
return;

bandwidth_tracker_ = std::make_unique<P3ABandwidthSavingsTracker>(
user_prefs::UserPrefs::Get(
web_contents->GetBrowserContext()));
user_prefs::UserPrefs::Get(web_contents->GetBrowserContext()));
}

PerfPredictorTabHelper::~PerfPredictorTabHelper() = default;

void PerfPredictorTabHelper::OnPageLoadTimingUpdated(
const page_load_metrics::mojom::PageLoadTiming& timing) {
const page_load_metrics::mojom::PageLoadTiming& timing) {
bandwidth_predictor_->OnPageLoadTimingUpdated(timing);
}

// static
void PerfPredictorTabHelper::RegisterProfilePrefs(
PrefRegistrySimple* registry) {
PrefRegistrySimple* registry) {
registry->RegisterUint64Pref(prefs::kBandwidthSavedBytes, 0);
}

// static
void PerfPredictorTabHelper::DispatchBlockedEvent(
const std::string& subresource,
int render_process_id,
int render_frame_id,
int frame_tree_node_id) {
const std::string& subresource,
int render_process_id,
int render_frame_id,
int frame_tree_node_id) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);

content::WebContents* web_contents =
GetWebContents(render_process_id, render_frame_id, frame_tree_node_id);
GetWebContents(render_process_id, render_frame_id, frame_tree_node_id);
if (!web_contents)
return;

PerfPredictorTabHelper* blocking_observer =
brave_perf_predictor::PerfPredictorTabHelper::FromWebContents(
web_contents);
brave_perf_predictor::PerfPredictorTabHelper::FromWebContents(
web_contents);
if (blocking_observer) {
blocking_observer->OnBlockedSubresource(subresource);
}
Expand All @@ -92,7 +91,7 @@ void PerfPredictorTabHelper::DispatchBlockedEvent(
void PerfPredictorTabHelper::RecordSavings() {
if (web_contents()) {
const uint64_t savings =
static_cast<uint64_t>(bandwidth_predictor_->PredictSavingsBytes());
static_cast<uint64_t>(bandwidth_predictor_->PredictSavingsBytes());
bandwidth_predictor_->Reset();
VLOG(3) << "Saving computed bw saving = " << savings;
if (savings > 0) {
Expand All @@ -104,27 +103,26 @@ void PerfPredictorTabHelper::RecordSavings() {
PrefService* prefs = user_prefs::UserPrefs::Get(browser_context);
if (prefs)
prefs->SetUint64(
prefs::kBandwidthSavedBytes,
prefs->GetUint64(prefs::kBandwidthSavedBytes) + savings);
prefs::kBandwidthSavedBytes,
prefs->GetUint64(prefs::kBandwidthSavedBytes) + savings);

if (bandwidth_tracker_) {
if (bandwidth_tracker_)
bandwidth_tracker_->RecordSavings(savings);
#if defined(OS_ANDROID)
chrome::android::BraveShieldsContentSettings::DispatchSavedBandwidth(
savings);
#endif
}
}
}
}

void PerfPredictorTabHelper::OnBlockedSubresource(
const std::string& subresource) {
const std::string& subresource) {
bandwidth_predictor_->OnSubresourceBlocked(subresource);
}

void PerfPredictorTabHelper::DidStartNavigation(
content::NavigationHandle* handle) {
content::NavigationHandle* handle) {
if (!handle || !handle->IsInMainFrame() || handle->IsDownload())
return;
// Gather prediction of the _previous_ navigation
Expand All @@ -133,7 +131,7 @@ void PerfPredictorTabHelper::DidStartNavigation(
}

void PerfPredictorTabHelper::DidFinishNavigation(
content::NavigationHandle* handle) {
content::NavigationHandle* handle) {
if (!handle || !handle->IsInMainFrame() || !handle->HasCommitted() ||
handle->IsDownload())
return;
Expand All @@ -144,12 +142,12 @@ void PerfPredictorTabHelper::DidFinishNavigation(
}

void PerfPredictorTabHelper::ResourceLoadComplete(
content::RenderFrameHost* render_frame_host,
const content::GlobalRequestID& request_id,
const blink::mojom::ResourceLoadInfo& resource_load_info) {
content::RenderFrameHost* render_frame_host,
const content::GlobalRequestID& request_id,
const blink::mojom::ResourceLoadInfo& resource_load_info) {
if (render_frame_host)
bandwidth_predictor_->OnResourceLoadComplete(web_contents()->GetURL(),
resource_load_info);
resource_load_info);
}

void PerfPredictorTabHelper::WebContentsDestroyed() {
Expand Down