Prepend "Web" to RenderWidgetSchedulingState.

This class is Blink's public interface, so its name should start with
"Web".

This is a follow-up of crrev.com/c/986112.

Bug: 826203
Change-Id: I88933aa86fbe64c695cc10a76ce36edc1b981f7a
Reviewed-on: https://chromium-review.googlesource.com/989386Reviewed-by: Alexander Timin <altimin@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Commit-Queue: Yuta Kitamura <yutak@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548734}

content/renderer/render_widget.cc

@@ -81,8 +81,8 @@
 #include "third_party/WebKit/public/platform/WebRuntimeFeatures.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
 #include "third_party/WebKit/public/platform/WebString.h"
-#include "third_party/WebKit/public/platform/scheduler/render_widget_scheduling_state.h"
 #include "third_party/WebKit/public/platform/scheduler/web_main_thread_scheduler.h"
+#include "third_party/WebKit/public/platform/scheduler/web_render_widget_scheduling_state.h"
 #include "third_party/WebKit/public/web/WebAutofillClient.h"
 #include "third_party/WebKit/public/web/WebDeviceEmulationParams.h"
 #include "third_party/WebKit/public/web/WebFrameWidget.h"

content/renderer/render_widget.h

@@ -74,7 +74,7 @@ class SyncMessageFilter;
 
 namespace blink {
 namespace scheduler {
-class RenderWidgetSchedulingState;
+class WebRenderWidgetSchedulingState;
 }
 struct WebDeviceEmulationParams;
 class WebDragData;
@@ -857,7 +857,7 @@ class CONTENT_EXPORT RenderWidget
   bool has_host_context_menu_location_;
   gfx::Point host_context_menu_location_;
 
-  std::unique_ptr<blink::scheduler::RenderWidgetSchedulingState>
+  std::unique_ptr<blink::scheduler::WebRenderWidgetSchedulingState>
       render_widget_scheduling_state_;
 
   // Mouse Lock dispatcher attached to this view.

third_party/WebKit/Source/platform/scheduler/BUILD.gn

@@ -96,8 +96,8 @@ blink_platform_sources("scheduler") {
     "main_thread/main_thread_scheduler.h",
     "main_thread/page_scheduler_impl.cc",
     "main_thread/page_scheduler_impl.h",
-    "main_thread/render_widget_scheduling_state.cc",
     "main_thread/web_main_thread_scheduler.cc",
+    "main_thread/web_render_widget_scheduling_state.cc",
     "public/frame_scheduler.h",
     "public/non_main_thread_scheduler.h",
     "public/page_scheduler.h",

third_party/WebKit/Source/platform/scheduler/main_thread/main_thread_scheduler.cc

@@ -728,7 +728,7 @@ scoped_refptr<MainThreadTaskQueue> RendererSchedulerImpl::NewTimerTaskQueue(
                           .SetCanBeThrottled(true));
 }
 
-std::unique_ptr<RenderWidgetSchedulingState>
+std::unique_ptr<WebRenderWidgetSchedulingState>
 RendererSchedulerImpl::NewRenderWidgetSchedulingState() {
   return render_widget_scheduler_signals_.NewRenderWidgetSchedulingState();
 }

third_party/WebKit/Source/platform/scheduler/main_thread/main_thread_scheduler.h

@@ -49,9 +49,9 @@ class RendererSchedulerImplForTest;
 class RendererSchedulerImplTest;
 FORWARD_DECLARE_TEST(RendererSchedulerImplTest, Tracing);
 }  // namespace renderer_scheduler_impl_unittest
-class RenderWidgetSchedulingState;
 class PageSchedulerImpl;
 class TaskQueueThrottler;
+class WebRenderWidgetSchedulingState;
 
 // TODO(yutak): Rename this class to MainThreadScheduler.
 class PLATFORM_EXPORT RendererSchedulerImpl
@@ -98,8 +98,8 @@ class PLATFORM_EXPORT RendererSchedulerImpl
   std::unique_ptr<WebThread> CreateMainThread() override;
   scoped_refptr<SingleThreadIdleTaskRunner> IdleTaskRunner() override;
   scoped_refptr<base::SingleThreadTaskRunner> IPCTaskRunner() override;
-  std::unique_ptr<RenderWidgetSchedulingState> NewRenderWidgetSchedulingState()
-      override;
+  std::unique_ptr<WebRenderWidgetSchedulingState>
+  NewRenderWidgetSchedulingState() override;
   void WillBeginFrame(const viz::BeginFrameArgs& args) override;
   void BeginFrameNotExpectedSoon() override;
   void BeginMainFrameNotExpectedUntil(base::TimeTicks time) override;
@@ -297,7 +297,7 @@ class PLATFORM_EXPORT RendererSchedulerImpl
   }
 
  private:
-  friend class RenderWidgetSchedulingState;
+  friend class WebRenderWidgetSchedulingState;
   friend class RendererMetricsHelper;
 
   friend class RendererMetricsHelperTest;

third_party/WebKit/Source/platform/scheduler/main_thread/render_widget_scheduling_state.cc → third_party/WebKit/Source/platform/scheduler/main_thread/web_render_widget_scheduling_state.cc

@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "public/platform/scheduler/render_widget_scheduling_state.h"
+#include "public/platform/scheduler/web_render_widget_scheduling_state.h"
 
 #include "platform/scheduler/renderer/render_widget_signals.h"
 
 namespace blink {
 namespace scheduler {
 
-RenderWidgetSchedulingState::RenderWidgetSchedulingState(
+WebRenderWidgetSchedulingState::WebRenderWidgetSchedulingState(
     RenderWidgetSignals* render_widget_scheduling_signals)
     : render_widget_signals_(render_widget_scheduling_signals),
       hidden_(false),
@@ -17,7 +17,7 @@ RenderWidgetSchedulingState::RenderWidgetSchedulingState(
   render_widget_signals_->IncNumVisibleRenderWidgets();
 }
 
-RenderWidgetSchedulingState::~RenderWidgetSchedulingState() {
+WebRenderWidgetSchedulingState::~WebRenderWidgetSchedulingState() {
   if (hidden_)
     return;
 
@@ -28,7 +28,7 @@ RenderWidgetSchedulingState::~RenderWidgetSchedulingState() {
   }
 }
 
-void RenderWidgetSchedulingState::SetHidden(bool hidden) {
+void WebRenderWidgetSchedulingState::SetHidden(bool hidden) {
   if (hidden_ == hidden)
     return;
 
@@ -47,7 +47,8 @@ void RenderWidgetSchedulingState::SetHidden(bool hidden) {
   }
 }
 
-void RenderWidgetSchedulingState::SetHasTouchHandler(bool has_touch_handler) {
+void WebRenderWidgetSchedulingState::SetHasTouchHandler(
+    bool has_touch_handler) {
   if (has_touch_handler_ == has_touch_handler)
     return;
 

third_party/WebKit/Source/platform/scheduler/renderer/render_widget_signals.cc

@@ -6,7 +6,7 @@
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
-#include "public/platform/scheduler/render_widget_scheduling_state.h"
+#include "public/platform/scheduler/web_render_widget_scheduling_state.h"
 
 namespace blink {
 namespace scheduler {
@@ -16,9 +16,9 @@ RenderWidgetSignals::RenderWidgetSignals(Observer* observer)
       num_visible_render_widgets_(0),
       num_visible_render_widgets_with_touch_handlers_(0) {}
 
-std::unique_ptr<RenderWidgetSchedulingState>
+std::unique_ptr<WebRenderWidgetSchedulingState>
 RenderWidgetSignals::NewRenderWidgetSchedulingState() {
-  return base::WrapUnique(new RenderWidgetSchedulingState(this));
+  return base::WrapUnique(new WebRenderWidgetSchedulingState(this));
 }
 
 void RenderWidgetSignals::IncNumVisibleRenderWidgets() {

third_party/WebKit/Source/platform/scheduler/renderer/render_widget_signals.h

@@ -14,7 +14,7 @@
 namespace blink {
 namespace scheduler {
 
-class RenderWidgetSchedulingState;
+class WebRenderWidgetSchedulingState;
 
 class PLATFORM_EXPORT RenderWidgetSignals {
  public:
@@ -37,12 +37,13 @@ class PLATFORM_EXPORT RenderWidgetSignals {
 
   explicit RenderWidgetSignals(Observer* observer);
 
-  std::unique_ptr<RenderWidgetSchedulingState> NewRenderWidgetSchedulingState();
+  std::unique_ptr<WebRenderWidgetSchedulingState>
+  NewRenderWidgetSchedulingState();
 
   void AsValueInto(base::trace_event::TracedValue* state) const;
 
  private:
-  friend class RenderWidgetSchedulingState;
+  friend class WebRenderWidgetSchedulingState;
 
   void IncNumVisibleRenderWidgets();
   void DecNumVisibleRenderWidgets();

third_party/WebKit/Source/platform/scheduler/renderer/render_widget_signals_unittest.cc

@@ -5,7 +5,7 @@
 #include "platform/scheduler/renderer/render_widget_signals.h"
 
 #include "base/macros.h"
-#include "public/platform/scheduler/render_widget_scheduling_state.h"
+#include "public/platform/scheduler/web_render_widget_scheduling_state.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -57,7 +57,7 @@ class RenderWidgetSignalsTest : public testing::Test {
 
 TEST_F(RenderWidgetSignalsTest, RenderWidgetSchedulingStateLifeCycle) {
   EXPECT_CALL(*mock_observer_, SetAllRenderWidgetsHidden(false)).Times(1);
-  std::unique_ptr<RenderWidgetSchedulingState> widget1_state =
+  std::unique_ptr<WebRenderWidgetSchedulingState> widget1_state =
       render_widget_signals_->NewRenderWidgetSchedulingState();
   Mock::VerifyAndClearExpectations(mock_observer_.get());
 
@@ -66,7 +66,7 @@ TEST_F(RenderWidgetSignalsTest, RenderWidgetSchedulingStateLifeCycle) {
 
 TEST_F(RenderWidgetSignalsTest, RenderWidget_Hidden) {
   IgnoreWidgetCreationCallbacks();
-  std::unique_ptr<RenderWidgetSchedulingState> widget1_state =
+  std::unique_ptr<WebRenderWidgetSchedulingState> widget1_state =
       render_widget_signals_->NewRenderWidgetSchedulingState();
   Mock::VerifyAndClearExpectations(mock_observer_.get());
 
@@ -79,7 +79,7 @@ TEST_F(RenderWidgetSignalsTest, RenderWidget_Hidden) {
 
 TEST_F(RenderWidgetSignalsTest, RenderWidget_HiddenThreeTimesShownOnce) {
   IgnoreWidgetCreationCallbacks();
-  std::unique_ptr<RenderWidgetSchedulingState> widget1_state =
+  std::unique_ptr<WebRenderWidgetSchedulingState> widget1_state =
       render_widget_signals_->NewRenderWidgetSchedulingState();
   Mock::VerifyAndClearExpectations(mock_observer_.get());
 
@@ -98,11 +98,11 @@ TEST_F(RenderWidgetSignalsTest, RenderWidget_HiddenThreeTimesShownOnce) {
 
 TEST_F(RenderWidgetSignalsTest, MultipleRenderWidgetsBecomeHiddenThenVisible) {
   IgnoreWidgetCreationCallbacks();
-  std::unique_ptr<RenderWidgetSchedulingState> widget1_state =
+  std::unique_ptr<WebRenderWidgetSchedulingState> widget1_state =
       render_widget_signals_->NewRenderWidgetSchedulingState();
-  std::unique_ptr<RenderWidgetSchedulingState> widget2_state =
+  std::unique_ptr<WebRenderWidgetSchedulingState> widget2_state =
       render_widget_signals_->NewRenderWidgetSchedulingState();
-  std::unique_ptr<RenderWidgetSchedulingState> widget3_state =
+  std::unique_ptr<WebRenderWidgetSchedulingState> widget3_state =
       render_widget_signals_->NewRenderWidgetSchedulingState();
   Mock::VerifyAndClearExpectations(mock_observer_.get());
 
@@ -134,7 +134,7 @@ TEST_F(RenderWidgetSignalsTest, MultipleRenderWidgetsBecomeHiddenThenVisible) {
 TEST_F(RenderWidgetSignalsTest, TouchHandlerAddedAndRemoved_VisibleWidget) {
   IgnoreWidgetCreationCallbacks();
 
-  std::unique_ptr<RenderWidgetSchedulingState> widget_state =
+  std::unique_ptr<WebRenderWidgetSchedulingState> widget_state =
       render_widget_signals_->NewRenderWidgetSchedulingState();
   Mock::VerifyAndClearExpectations(mock_observer_.get());
 
@@ -155,7 +155,7 @@ TEST_F(RenderWidgetSignalsTest,
        TouchHandlerAddedThriceAndRemovedOnce_VisibleWidget) {
   IgnoreWidgetCreationCallbacks();
 
-  std::unique_ptr<RenderWidgetSchedulingState> widget_state =
+  std::unique_ptr<WebRenderWidgetSchedulingState> widget_state =
       render_widget_signals_->NewRenderWidgetSchedulingState();
   Mock::VerifyAndClearExpectations(mock_observer_.get());
 
@@ -177,7 +177,7 @@ TEST_F(RenderWidgetSignalsTest,
 TEST_F(RenderWidgetSignalsTest, TouchHandlerAddedAndRemoved_HiddenWidget) {
   IgnoreWidgetCreationCallbacks();
 
-  std::unique_ptr<RenderWidgetSchedulingState> widget_state =
+  std::unique_ptr<WebRenderWidgetSchedulingState> widget_state =
       render_widget_signals_->NewRenderWidgetSchedulingState();
   EXPECT_CALL(*mock_observer_, SetAllRenderWidgetsHidden(true)).Times(1);
   widget_state->SetHidden(true);
@@ -196,11 +196,11 @@ TEST_F(RenderWidgetSignalsTest,
        MultipleTouchHandlerAddedAndRemoved_VisibleWidgets) {
   IgnoreWidgetCreationCallbacks();
 
-  std::unique_ptr<RenderWidgetSchedulingState> widget1_state =
+  std::unique_ptr<WebRenderWidgetSchedulingState> widget1_state =
       render_widget_signals_->NewRenderWidgetSchedulingState();
-  std::unique_ptr<RenderWidgetSchedulingState> widget2_state =
+  std::unique_ptr<WebRenderWidgetSchedulingState> widget2_state =
       render_widget_signals_->NewRenderWidgetSchedulingState();
-  std::unique_ptr<RenderWidgetSchedulingState> widget3_state =
+  std::unique_ptr<WebRenderWidgetSchedulingState> widget3_state =
       render_widget_signals_->NewRenderWidgetSchedulingState();
   Mock::VerifyAndClearExpectations(mock_observer_.get());
 
@@ -235,7 +235,7 @@ TEST_F(RenderWidgetSignalsTest,
        TouchHandlerAddedThenWigetDeleted_VisibleWidget) {
   IgnoreWidgetCreationCallbacks();
 
-  std::unique_ptr<RenderWidgetSchedulingState> widget_state =
+  std::unique_ptr<WebRenderWidgetSchedulingState> widget_state =
       render_widget_signals_->NewRenderWidgetSchedulingState();
   Mock::VerifyAndClearExpectations(mock_observer_.get());
 
@@ -253,7 +253,7 @@ TEST_F(RenderWidgetSignalsTest,
        TouchHandlerAddedThenWigetDeleted_HiddenWidget) {
   IgnoreWidgetCreationCallbacks();
 
-  std::unique_ptr<RenderWidgetSchedulingState> widget_state =
+  std::unique_ptr<WebRenderWidgetSchedulingState> widget_state =
       render_widget_signals_->NewRenderWidgetSchedulingState();
   EXPECT_CALL(*mock_observer_, SetAllRenderWidgetsHidden(true)).Times(1);
   widget_state->SetHidden(true);

third_party/WebKit/Source/platform/scheduler/test/fake_renderer_scheduler.cc

@@ -46,7 +46,7 @@ FakeRendererScheduler::IPCTaskRunner() {
   return nullptr;
 }
 
-std::unique_ptr<RenderWidgetSchedulingState>
+std::unique_ptr<WebRenderWidgetSchedulingState>
 FakeRendererScheduler::NewRenderWidgetSchedulingState() {
   return nullptr;
 }

third_party/WebKit/public/BUILD.gn

@@ -441,10 +441,10 @@ source_set("blink_headers") {
     "platform/modules/webmidi/WebMIDIAccessor.h",
     "platform/modules/webmidi/WebMIDIAccessorClient.h",
     "platform/scheduler/child/webthread_base.h",
-    "platform/scheduler/render_widget_scheduling_state.h",
     "platform/scheduler/renderer_process_type.h",
     "platform/scheduler/single_thread_idle_task_runner.h",
     "platform/scheduler/web_main_thread_scheduler.h",
+    "platform/scheduler/web_render_widget_scheduling_state.h",
     "platform/scheduler/web_thread_scheduler.h",
     "web/WebAXEnums.h",
     "web/WebAXObject.h",

third_party/WebKit/public/platform/scheduler/test/fake_renderer_scheduler.h

@@ -26,8 +26,8 @@ class FakeRendererScheduler : public WebMainThreadScheduler {
   scoped_refptr<base::SingleThreadTaskRunner> InputTaskRunner() override;
   scoped_refptr<SingleThreadIdleTaskRunner> IdleTaskRunner() override;
   scoped_refptr<base::SingleThreadTaskRunner> IPCTaskRunner() override;
-  std::unique_ptr<RenderWidgetSchedulingState> NewRenderWidgetSchedulingState()
-      override;
+  std::unique_ptr<WebRenderWidgetSchedulingState>
+  NewRenderWidgetSchedulingState() override;
   void WillBeginFrame(const viz::BeginFrameArgs& args) override;
   void BeginFrameNotExpectedSoon() override;
   void BeginMainFrameNotExpectedUntil(base::TimeTicks time) override;

third_party/WebKit/public/platform/scheduler/test/mock_renderer_scheduler.h

@@ -34,7 +34,7 @@ class MockRendererScheduler : public WebMainThreadScheduler {
                scoped_refptr<blink::scheduler::SingleThreadIdleTaskRunner>());
   MOCK_METHOD0(IPCTaskRunner, scoped_refptr<base::SingleThreadTaskRunner>());
   MOCK_METHOD0(NewRenderWidgetSchedulingState,
-               std::unique_ptr<RenderWidgetSchedulingState>());
+               std::unique_ptr<WebRenderWidgetSchedulingState>());
   MOCK_METHOD1(WillBeginFrame, void(const viz::BeginFrameArgs&));
   MOCK_METHOD0(BeginFrameNotExpectedSoon, void());
   MOCK_METHOD1(BeginMainFrameNotExpectedUntil, void(base::TimeTicks));

third_party/WebKit/public/platform/scheduler/web_main_thread_scheduler.h

@@ -17,8 +17,8 @@
 #include "public/platform/WebCommon.h"
 #include "public/platform/WebInputEventResult.h"
 #include "public/platform/WebScopedVirtualTimePauser.h"
-#include "public/platform/scheduler/render_widget_scheduling_state.h"
 #include "public/platform/scheduler/single_thread_idle_task_runner.h"
+#include "public/platform/scheduler/web_render_widget_scheduling_state.h"
 #include "public/platform/scheduler/web_thread_scheduler.h"
 #include "v8/include/v8.h"
 
@@ -41,7 +41,7 @@ namespace blink {
 namespace scheduler {
 
 enum class RendererProcessType;
-class RenderWidgetSchedulingState;
+class WebRenderWidgetSchedulingState;
 
 class BLINK_PLATFORM_EXPORT WebMainThreadScheduler : public WebThreadScheduler {
  public:
@@ -69,9 +69,9 @@ class BLINK_PLATFORM_EXPORT WebMainThreadScheduler : public WebThreadScheduler {
   // Creates a WebThread implementation for the renderer main thread.
   virtual std::unique_ptr<WebThread> CreateMainThread() = 0;
 
-  // Returns a new RenderWidgetSchedulingState.  The signals from this will be
-  // used to make scheduling decisions.
-  virtual std::unique_ptr<RenderWidgetSchedulingState>
+  // Returns a new WebRenderWidgetSchedulingState.  The signals from this will
+  // be used to make scheduling decisions.
+  virtual std::unique_ptr<WebRenderWidgetSchedulingState>
   NewRenderWidgetSchedulingState() = 0;
 
   // Called to notify about the start of an extended period where no frames

third_party/WebKit/public/platform/scheduler/render_widget_scheduling_state.h → third_party/WebKit/public/platform/scheduler/web_render_widget_scheduling_state.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef THIRD_PARTY_WEBKIT_PUBLIC_PLATFORM_SCHEDULER_RENDER_WIDGET_SCHEDULING_STATE_H_
-#define THIRD_PARTY_WEBKIT_PUBLIC_PLATFORM_SCHEDULER_RENDER_WIDGET_SCHEDULING_STATE_H_
+#ifndef THIRD_PARTY_WEBKIT_PUBLIC_PLATFORM_SCHEDULER_WEB_RENDER_WIDGET_SCHEDULING_STATE_H_
+#define THIRD_PARTY_WEBKIT_PUBLIC_PLATFORM_SCHEDULER_WEB_RENDER_WIDGET_SCHEDULING_STATE_H_
 
 #include "public/platform/WebCommon.h"
 
@@ -12,18 +12,17 @@ namespace scheduler {
 
 class RenderWidgetSignals;
 
-// TODO(yutak): Does this class need to have "Web" prefix?
-class BLINK_PLATFORM_EXPORT RenderWidgetSchedulingState {
+class BLINK_PLATFORM_EXPORT WebRenderWidgetSchedulingState {
  public:
   void SetHidden(bool hidden);
   void SetHasTouchHandler(bool has_touch_handler);
 
-  ~RenderWidgetSchedulingState();
+  ~WebRenderWidgetSchedulingState();
 
  private:
   friend class RenderWidgetSignals;
 
-  explicit RenderWidgetSchedulingState(
+  explicit WebRenderWidgetSchedulingState(
       RenderWidgetSignals* render_widget_scheduling_signals);
 
   RenderWidgetSignals* render_widget_signals_;  // NOT OWNED
@@ -34,4 +33,4 @@ class BLINK_PLATFORM_EXPORT RenderWidgetSchedulingState {
 }  // namespace scheduler
 }  // namespace blink
 
-#endif  // THIRD_PARTY_WEBKIT_PUBLIC_PLATFORM_SCHEDULER_RENDER_WIDGET_SCHEDULING_STATE_H_
+#endif  // THIRD_PARTY_WEBKIT_PUBLIC_PLATFORM_SCHEDULER_WEB_RENDER_WIDGET_SCHEDULING_STATE_H_