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 f5b86bdcb5b22db9386ac36a560125e5dca7fbcf..5a1c02dfae915dfe7e0700bc3456951c0752a0c2 100644 |
--- a/components/scheduler/renderer/web_frame_scheduler_impl.cc |
+++ b/components/scheduler/renderer/web_frame_scheduler_impl.cc |
@@ -4,23 +4,42 @@ |
#include "components/scheduler/renderer/web_frame_scheduler_impl.h" |
+#include "base/debug/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/WebBlameContext.h" |
#include "third_party/WebKit/public/platform/WebString.h" |
namespace scheduler { |
+class FrameBlameContext : public base::debug::BlameContextBase { |
+ public: |
+ FrameBlameContext(blink::WebBlameContext* blame_context) |
+ : blame_context_(blame_context) {} |
+ |
+ void Enter() override { blame_context_->enter(); } |
+ |
+ void Leave() override { blame_context_->leave(); } |
+ |
+ private: |
+ blink::WebBlameContext* blame_context_; // Not owned. |
+}; |
+ |
WebFrameSchedulerImpl::WebFrameSchedulerImpl( |
RendererSchedulerImpl* renderer_scheduler, |
- WebViewSchedulerImpl* parent_web_view_scheduler) |
+ WebViewSchedulerImpl* parent_web_view_scheduler, |
+ blink::WebBlameContext* blame_context) |
: renderer_scheduler_(renderer_scheduler), |
parent_web_view_scheduler_(parent_web_view_scheduler), |
frame_visible_(true), |
- page_visible_(true) {} |
+ page_visible_(true) { |
+ if (blame_context) |
+ blame_context_ = make_scoped_ptr(new FrameBlameContext(blame_context)); |
+} |
WebFrameSchedulerImpl::~WebFrameSchedulerImpl() { |
if (loading_task_queue_.get()) |
@@ -47,6 +66,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_.get()); |
if (parent_web_view_scheduler_->virtual_time_domain()) { |
loading_task_queue_->SetTimeDomain( |
parent_web_view_scheduler_->virtual_time_domain()); |
@@ -61,6 +81,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_.get()); |
if (parent_web_view_scheduler_->virtual_time_domain()) { |
timer_task_queue_->SetTimeDomain( |
parent_web_view_scheduler_->virtual_time_domain()); |
@@ -76,7 +97,7 @@ blink::WebTaskRunner* WebFrameSchedulerImpl::timerTaskRunner() { |
void WebFrameSchedulerImpl::setFrameOrigin( |
const blink::WebSecurityOrigin& origin) { |
origin_ = origin; |
- // TODO(skyostil): Associate the task queues with this origin. |
+ // TODO(skyostil): Remove this notification. |
} |
void WebFrameSchedulerImpl::setPageVisible(bool page_visible) { |
@@ -117,5 +138,4 @@ void WebFrameSchedulerImpl::OnVirtualTimeDomainChanged() { |
} |
} |
- |
} // namespace scheduler |