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

Unified Diff: components/scheduler/renderer/web_frame_scheduler_impl.cc

Issue 2053233002: Make sure FrameScheduler is cleared when LocalFrame::detach() finishes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: components/scheduler/renderer/web_frame_scheduler_impl.cc
diff --git a/components/scheduler/renderer/web_frame_scheduler_impl.cc b/components/scheduler/renderer/web_frame_scheduler_impl.cc
index fba6b691b5c96ded5f4c44566bfd3f9bd137b95e..67a0bce7afe31e626de44f4d01596e1494491556 100644
--- a/components/scheduler/renderer/web_frame_scheduler_impl.cc
+++ b/components/scheduler/renderer/web_frame_scheduler_impl.cc
@@ -22,7 +22,7 @@ WebFrameSchedulerImpl::WebFrameSchedulerImpl(
base::trace_event::BlameContext* blame_context)
: renderer_scheduler_(renderer_scheduler),
parent_web_view_scheduler_(parent_web_view_scheduler),
- blame_context_(blame_context),
+ blame_context_(blame_context ? blame_context->weak_ptr() : nullptr),
frame_visible_(true),
page_visible_(true) {}
@@ -55,7 +55,7 @@ blink::WebTaskRunner* WebFrameSchedulerImpl::loadingTaskRunner() {
if (!loading_web_task_runner_) {
loading_task_queue_ =
renderer_scheduler_->NewLoadingTaskRunner("frame_loading_tq");
- loading_task_queue_->SetBlameContext(blame_context_);
+ loading_task_queue_->SetBlameContext(blame_context_.get());
if (parent_web_view_scheduler_->virtual_time_domain()) {
loading_task_queue_->SetTimeDomain(
parent_web_view_scheduler_->virtual_time_domain());
@@ -70,7 +70,7 @@ blink::WebTaskRunner* WebFrameSchedulerImpl::timerTaskRunner() {
if (!timer_web_task_runner_) {
timer_task_queue_ =
renderer_scheduler_->NewTimerTaskRunner("frame_timer_tq");
- timer_task_queue_->SetBlameContext(blame_context_);
+ timer_task_queue_->SetBlameContext(blame_context_.get());
if (parent_web_view_scheduler_->virtual_time_domain()) {
timer_task_queue_->SetTimeDomain(
parent_web_view_scheduler_->virtual_time_domain());

Powered by Google App Engine
This is Rietveld 408576698