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

Unified Diff: third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl.cc

Issue 2118903002: scheduler: Move the Blink scheduler into Blink (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 4 years, 4 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: third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl.cc
diff --git a/components/scheduler/renderer/renderer_scheduler_impl.cc b/third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl.cc
similarity index 98%
rename from components/scheduler/renderer/renderer_scheduler_impl.cc
rename to third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl.cc
index 56e84f45ce23fba3dcd676c6a9f98fc236a72721..a9cebe831e6b65e390c4ed91c4534f1b3a68d215 100644
--- a/components/scheduler/renderer/renderer_scheduler_impl.cc
+++ b/third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "components/scheduler/renderer/renderer_scheduler_impl.h"
+#include "platform/scheduler/renderer/renderer_scheduler_impl.h"
#include "base/bind.h"
#include "base/debug/stack_trace.h"
@@ -12,14 +12,15 @@
#include "base/trace_event/trace_event.h"
#include "base/trace_event/trace_event_argument.h"
#include "cc/output/begin_frame_args.h"
-#include "components/scheduler/base/task_queue_impl.h"
-#include "components/scheduler/base/task_queue_selector.h"
-#include "components/scheduler/base/virtual_time_domain.h"
-#include "components/scheduler/child/scheduler_tqm_delegate.h"
-#include "components/scheduler/renderer/auto_advancing_virtual_time_domain.h"
-#include "components/scheduler/renderer/web_view_scheduler_impl.h"
-#include "components/scheduler/renderer/webthread_impl_for_renderer_scheduler.h"
-
+#include "platform/scheduler/base/task_queue_impl.h"
+#include "platform/scheduler/base/task_queue_selector.h"
+#include "platform/scheduler/base/virtual_time_domain.h"
+#include "platform/scheduler/child/scheduler_tqm_delegate.h"
+#include "platform/scheduler/renderer/auto_advancing_virtual_time_domain.h"
+#include "platform/scheduler/renderer/web_view_scheduler_impl.h"
+#include "platform/scheduler/renderer/webthread_impl_for_renderer_scheduler.h"
+
+namespace blink {
namespace scheduler {
namespace {
// The run time of loading tasks is strongly bimodal. The vast majority are
@@ -664,9 +665,8 @@ void RendererSchedulerImpl::RunIdleTasksForTesting(
const base::Closure& callback) {
MainThreadOnly().in_idle_period_for_testing = true;
IdleTaskRunner()->PostIdleTask(
- FROM_HERE,
- base::Bind(&RendererSchedulerImpl::EndIdlePeriodForTesting,
- weak_factory_.GetWeakPtr(), callback));
+ FROM_HERE, base::Bind(&RendererSchedulerImpl::EndIdlePeriodForTesting,
+ weak_factory_.GetWeakPtr(), callback));
idle_helper_.EnableLongIdlePeriod();
}
@@ -1104,7 +1104,7 @@ void RendererSchedulerImpl::SuspendTimerQueue() {
#ifndef NDEBUG
DCHECK(!default_timer_task_runner_->IsQueueEnabled());
for (const auto& runner : timer_task_runners_) {
- DCHECK(!runner->IsQueueEnabled());
+ DCHECK(!runner->IsQueueEnabled());
}
#endif
}
@@ -1255,7 +1255,7 @@ void RendererSchedulerImpl::OnIdlePeriodEnded() {
}
void RendererSchedulerImpl::AddPendingNavigation(
- blink::WebScheduler::NavigatingFrameType type) {
+ WebScheduler::NavigatingFrameType type) {
helper_.CheckOnValidThread();
if (type == blink::WebScheduler::NavigatingFrameType::kMainFrame) {
MainThreadOnly().navigation_task_expected_count++;
@@ -1264,7 +1264,7 @@ void RendererSchedulerImpl::AddPendingNavigation(
}
void RendererSchedulerImpl::RemovePendingNavigation(
- blink::WebScheduler::NavigatingFrameType type) {
+ WebScheduler::NavigatingFrameType type) {
helper_.CheckOnValidThread();
DCHECK_GT(MainThreadOnly().navigation_task_expected_count, 0);
if (type == blink::WebScheduler::NavigatingFrameType::kMainFrame &&
@@ -1370,11 +1370,10 @@ void RendererSchedulerImpl::RemoveWebViewScheduler(
MainThreadOnly().web_view_schedulers.erase(web_view_scheduler);
}
-void RendererSchedulerImpl::BroadcastConsoleWarning(
- const std::string& message) {
+void RendererSchedulerImpl::BroadcastIntervention(const std::string& message) {
helper_.CheckOnValidThread();
for (auto* web_view_scheduler : MainThreadOnly().web_view_schedulers)
- web_view_scheduler->AddConsoleWarning(message);
+ web_view_scheduler->ReportIntervention(message);
}
void RendererSchedulerImpl::OnTriedToExecuteBlockedTask(
@@ -1408,7 +1407,7 @@ void RendererSchedulerImpl::OnTriedToExecuteBlockedTask(
}
MainThreadOnly().have_reported_blocking_intervention_since_navigation =
true;
- BroadcastConsoleWarning(
+ BroadcastIntervention(
"Blink deferred a task in order to make scrolling smoother. "
"Your timer and network tasks should take less than 50ms to run "
"to avoid this. Please see "
@@ -1504,3 +1503,4 @@ const char* RendererSchedulerImpl::RAILModeToString(v8::RAILMode rail_mode) {
}
} // namespace scheduler
+} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698