Make sure FrameScheduler is cleared when LocalFrame::detach() finishes

components/scheduler/renderer/web_frame_scheduler_impl.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/scheduler/renderer/web_frame_scheduler_impl.h"
 
 #include "base/trace_event/blame_context.h"
 #include "components/scheduler/base/real_time_domain.h"
 #include "components/scheduler/base/virtual_time_domain.h"
 #include "components/scheduler/child/web_task_runner_impl.h"
 #include "components/scheduler/renderer/auto_advancing_virtual_time_domain.h"
 #include "components/scheduler/renderer/renderer_scheduler_impl.h"
 #include "components/scheduler/renderer/web_view_scheduler_impl.h"
 #include "third_party/WebKit/public/platform/BlameContext.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 
 namespace scheduler {
 
 WebFrameSchedulerImpl::WebFrameSchedulerImpl(
     RendererSchedulerImpl* renderer_scheduler,
     WebViewSchedulerImpl* parent_web_view_scheduler,
     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) {}
 
 WebFrameSchedulerImpl::~WebFrameSchedulerImpl() {
   if (loading_task_queue_.get()) {
     loading_task_queue_->UnregisterTaskQueue();
     loading_task_queue_->SetBlameContext(nullptr);
   }
 
   if (timer_task_queue_.get()) {
@@ skipping 12 matching lines @@
 void WebFrameSchedulerImpl::setFrameVisible(bool frame_visible) {
   frame_visible_ = frame_visible;
   // TODO(alexclarke): Do something with this flag.
 }
 
 blink::WebTaskRunner* WebFrameSchedulerImpl::loadingTaskRunner() {
   DCHECK(parent_web_view_scheduler_);
   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());
     }
     loading_web_task_runner_.reset(new WebTaskRunnerImpl(loading_task_queue_));
   }
   return loading_web_task_runner_.get();
 }
 
 blink::WebTaskRunner* WebFrameSchedulerImpl::timerTaskRunner() {
   DCHECK(parent_web_view_scheduler_);
   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());
     } else if (!page_visible_) {
       renderer_scheduler_->throttling_helper()->IncreaseThrottleRefCount(
           timer_task_queue_.get());
     }
     timer_web_task_runner_.reset(new WebTaskRunnerImpl(timer_task_queue_));
   }
   return timer_web_task_runner_.get();
@@ skipping 31 matching lines @@
         parent_web_view_scheduler_->virtual_time_domain());
   }
 
   if (loading_task_queue_) {
     loading_task_queue_->SetTimeDomain(
         parent_web_view_scheduler_->virtual_time_domain());
   }
 }
 
 }  // namespace scheduler