aw: rename *_web_view.h/cc to *_webview.h/cc

Rename *_web_view.h/cc to *_webview.h/cc to be consistent with other file
styles and some code cleanup.

Bug:None

Change-Id: I782ac7c4d20943e48fb98366b611675f8a6575ac
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2602972
Commit-Queue: HuiWang <wanghui210@huawei.com>
Reviewed-by: Bo <boliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#840606}

android_webview/browser/aw_contents.cc

@@ -23,7 +23,7 @@
 #include "android_webview/browser/gfx/aw_picture.h"
 #include "android_webview/browser/gfx/browser_view_renderer.h"
 #include "android_webview/browser/gfx/child_frame.h"
-#include "android_webview/browser/gfx/gpu_service_web_view.h"
+#include "android_webview/browser/gfx/gpu_service_webview.h"
 #include "android_webview/browser/gfx/java_browser_view_renderer_helper.h"
 #include "android_webview/browser/gfx/render_thread_manager.h"
 #include "android_webview/browser/gfx/scoped_app_gl_state_restore.h"

android_webview/browser/gfx/BUILD.gn

@@ -36,8 +36,8 @@ source_set("gfx") {
     "deferred_gpu_command_service.h",
     "display_scheduler_webview.cc",
     "display_scheduler_webview.h",
-    "gpu_service_web_view.cc",
-    "gpu_service_web_view.h",
+    "gpu_service_webview.cc",
+    "gpu_service_webview.h",
     "hardware_renderer.cc",
     "hardware_renderer.h",
     "hardware_renderer_single_thread.cc",
@@ -66,8 +66,8 @@ source_set("gfx") {
     "surfaces_instance.h",
     "task_forwarding_sequence.cc",
     "task_forwarding_sequence.h",
-    "task_queue_web_view.cc",
-    "task_queue_web_view.h",
+    "task_queue_webview.cc",
+    "task_queue_webview.h",
     "viz_compositor_thread_runner_webview.cc",
     "viz_compositor_thread_runner_webview.h",
     "vulkan_gl_interop.cc",

android_webview/browser/gfx/aw_gl_surface_external_stencil.h

@@ -16,8 +16,6 @@ class AwGLSurfaceExternalStencil : public AwGLSurface {
   AwGLSurfaceExternalStencil& operator=(const AwGLSurfaceExternalStencil&) =
       delete;
 
-  void SetClipRectangle(gfx::Rect clip_rect);
-
   unsigned int GetBackingFramebufferObject() override;
   gfx::SwapResult SwapBuffers(PresentationCallback callback) override;
   void RecalculateClipAndTransform(gfx::Size* viewport,

android_webview/browser/gfx/deferred_gpu_command_service.cc

@@ -4,9 +4,9 @@
 
 #include "android_webview/browser/gfx/deferred_gpu_command_service.h"
 
-#include "android_webview/browser/gfx/gpu_service_web_view.h"
+#include "android_webview/browser/gfx/gpu_service_webview.h"
 #include "android_webview/browser/gfx/task_forwarding_sequence.h"
-#include "android_webview/browser/gfx/task_queue_web_view.h"
+#include "android_webview/browser/gfx/task_queue_webview.h"
 #include "ui/gl/gl_share_group.h"
 
 namespace android_webview {

android_webview/browser/gfx/gpu_service_web_view.cc → android_webview/browser/gfx/gpu_service_webview.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 "android_webview/browser/gfx/gpu_service_web_view.h"
+#include "android_webview/browser/gfx/gpu_service_webview.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"

android_webview/browser/gfx/gpu_service_web_view.h → android_webview/browser/gfx/gpu_service_webview.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 ANDROID_WEBVIEW_BROWSER_GFX_GPU_SERVICE_WEB_VIEW_H_
-#define ANDROID_WEBVIEW_BROWSER_GFX_GPU_SERVICE_WEB_VIEW_H_
+#ifndef ANDROID_WEBVIEW_BROWSER_GFX_GPU_SERVICE_WEBVIEW_H_
+#define ANDROID_WEBVIEW_BROWSER_GFX_GPU_SERVICE_WEBVIEW_H_
 
 #include <stddef.h>
 
@@ -32,6 +32,10 @@ class GpuServiceWebView {
   static GpuServiceWebView* GetInstance();
   ~GpuServiceWebView();
 
+  // Disallow copy and assign.
+  GpuServiceWebView(const GpuServiceWebView&) = delete;
+  GpuServiceWebView& operator=(const GpuServiceWebView&) = delete;
+
   gpu::SyncPointManager* sync_point_manager() const {
     return sync_point_manager_.get();
   }
@@ -73,10 +77,8 @@ class GpuServiceWebView {
   gpu::GPUInfo gpu_info_;
   gpu::GpuPreferences gpu_preferences_;
   gpu::GpuFeatureInfo gpu_feature_info_;
-
-  DISALLOW_COPY_AND_ASSIGN(GpuServiceWebView);
 };
 
 }  // namespace android_webview
 
-#endif  // ANDROID_WEBVIEW_BROWSER_GFX_GPU_SERVICE_WEB_VIEW_H_
+#endif  // ANDROID_WEBVIEW_BROWSER_GFX_GPU_SERVICE_WEBVIEW_H_

android_webview/browser/gfx/hardware_renderer_viz.cc

@@ -12,13 +12,13 @@
 #include "android_webview/browser/gfx/aw_gl_surface.h"
 #include "android_webview/browser/gfx/aw_render_thread_context_provider.h"
 #include "android_webview/browser/gfx/display_scheduler_webview.h"
-#include "android_webview/browser/gfx/gpu_service_web_view.h"
+#include "android_webview/browser/gfx/gpu_service_webview.h"
 #include "android_webview/browser/gfx/parent_compositor_draw_constraints.h"
 #include "android_webview/browser/gfx/render_thread_manager.h"
 #include "android_webview/browser/gfx/root_frame_sink.h"
 #include "android_webview/browser/gfx/skia_output_surface_dependency_webview.h"
 #include "android_webview/browser/gfx/surfaces_instance.h"
-#include "android_webview/browser/gfx/task_queue_web_view.h"
+#include "android_webview/browser/gfx/task_queue_webview.h"
 #include "android_webview/browser/gfx/viz_compositor_thread_runner_webview.h"
 #include "android_webview/common/aw_switches.h"
 #include "base/command_line.h"
@@ -53,7 +53,7 @@ namespace android_webview {
 
 class HardwareRendererViz::OnViz : public viz::DisplayClient {
  public:
-  OnViz(OutputSurfaceProviderWebview* output_surface_provider,
+  OnViz(OutputSurfaceProviderWebView* output_surface_provider,
         const scoped_refptr<RootFrameSink>& root_frame_sink);
   ~OnViz() override;
 
@@ -104,7 +104,7 @@ class HardwareRendererViz::OnViz : public viz::DisplayClient {
 };
 
 HardwareRendererViz::OnViz::OnViz(
-    OutputSurfaceProviderWebview* output_surface_provider,
+    OutputSurfaceProviderWebView* output_surface_provider,
     const scoped_refptr<RootFrameSink>& root_frame_sink)
     : without_gpu_(root_frame_sink),
       frame_sink_id_(without_gpu_->root_frame_sink_id()),

android_webview/browser/gfx/hardware_renderer_viz.h

@@ -44,7 +44,7 @@ class HardwareRendererViz : public HardwareRenderer {
   viz::SurfaceId surface_id_;
 
   // Used to create viz::OutputSurface and gl::GLSurface
-  OutputSurfaceProviderWebview output_surface_provider_;
+  OutputSurfaceProviderWebView output_surface_provider_;
 
   // These are accessed on the viz thread.
   std::unique_ptr<OnViz> on_viz_;

android_webview/browser/gfx/output_surface_provider_webview.cc

@@ -8,10 +8,10 @@
 #include "android_webview/browser/gfx/aw_render_thread_context_provider.h"
 #include "android_webview/browser/gfx/aw_vulkan_context_provider.h"
 #include "android_webview/browser/gfx/deferred_gpu_command_service.h"
-#include "android_webview/browser/gfx/gpu_service_web_view.h"
+#include "android_webview/browser/gfx/gpu_service_webview.h"
 #include "android_webview/browser/gfx/parent_output_surface.h"
 #include "android_webview/browser/gfx/skia_output_surface_dependency_webview.h"
-#include "android_webview/browser/gfx/task_queue_web_view.h"
+#include "android_webview/browser/gfx/task_queue_webview.h"
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
 #include "base/feature_list.h"
@@ -41,7 +41,7 @@ void OnContextLost(bool synthetic_loss) {
 
 }  // namespace
 
-OutputSurfaceProviderWebview::OutputSurfaceProviderWebview(
+OutputSurfaceProviderWebView::OutputSurfaceProviderWebView(
     AwVulkanContextProvider* vulkan_context_provider)
     : vulkan_context_provider_(vulkan_context_provider) {
   // Should be kept in sync with compositor_impl_android.cc.
@@ -71,14 +71,14 @@ OutputSurfaceProviderWebview::OutputSurfaceProviderWebview(
 
   InitializeContext();
 }
-OutputSurfaceProviderWebview::~OutputSurfaceProviderWebview() {
+OutputSurfaceProviderWebView::~OutputSurfaceProviderWebView() {
   // We must to destroy |gl_surface_| before |shared_context_state_|, so we will
   // still have context. NOTE: |shared_context_state_| holds ref to surface, but
   // it loses it before context.
   gl_surface_.reset();
 }
 
-void OutputSurfaceProviderWebview::InitializeContext() {
+void OutputSurfaceProviderWebView::InitializeContext() {
   DCHECK(!gl_surface_) << "InitializeContext() called twice";
 
   if (renderer_settings_.use_skia_renderer && !enable_vulkan_) {
@@ -128,7 +128,7 @@ void OutputSurfaceProviderWebview::InitializeContext() {
 }
 
 std::unique_ptr<viz::DisplayCompositorMemoryAndTaskController>
-OutputSurfaceProviderWebview::CreateDisplayController() {
+OutputSurfaceProviderWebView::CreateDisplayController() {
   DCHECK(gl_surface_)
       << "InitializeContext() must be called before CreateOutputSurface()";
 
@@ -146,7 +146,7 @@ OutputSurfaceProviderWebview::CreateDisplayController() {
 }
 
 std::unique_ptr<viz::OutputSurface>
-OutputSurfaceProviderWebview::CreateOutputSurface(
+OutputSurfaceProviderWebView::CreateOutputSurface(
     viz::DisplayCompositorMemoryAndTaskController*
         display_compositor_controller) {
   DCHECK(gl_surface_)

android_webview/browser/gfx/output_surface_provider_webview.h

@@ -26,11 +26,11 @@ namespace android_webview {
 class AwVulkanContextProvider;
 
 // Effectively a data struct to pass pointers from render thread to viz thread.
-class OutputSurfaceProviderWebview {
+class OutputSurfaceProviderWebView {
  public:
-  explicit OutputSurfaceProviderWebview(
+  explicit OutputSurfaceProviderWebView(
       AwVulkanContextProvider* vulkan_context_provider);
-  ~OutputSurfaceProviderWebview();
+  ~OutputSurfaceProviderWebView();
 
   std::unique_ptr<viz::DisplayCompositorMemoryAndTaskController>
   CreateDisplayController();

android_webview/browser/gfx/render_thread_manager.cc

@@ -7,11 +7,11 @@
 #include <utility>
 
 #include "android_webview/browser/gfx/compositor_frame_producer.h"
-#include "android_webview/browser/gfx/gpu_service_web_view.h"
+#include "android_webview/browser/gfx/gpu_service_webview.h"
 #include "android_webview/browser/gfx/hardware_renderer_single_thread.h"
 #include "android_webview/browser/gfx/hardware_renderer_viz.h"
 #include "android_webview/browser/gfx/scoped_app_gl_state_restore.h"
-#include "android_webview/browser/gfx/task_queue_web_view.h"
+#include "android_webview/browser/gfx/task_queue_webview.h"
 #include "android_webview/common/aw_features.h"
 #include "android_webview/public/browser/draw_gl.h"
 #include "base/bind.h"

android_webview/browser/gfx/skia_output_surface_dependency_webview.cc

@@ -5,10 +5,10 @@
 #include "android_webview/browser/gfx/skia_output_surface_dependency_webview.h"
 
 #include "android_webview/browser/gfx/aw_vulkan_context_provider.h"
-#include "android_webview/browser/gfx/gpu_service_web_view.h"
+#include "android_webview/browser/gfx/gpu_service_webview.h"
 #include "android_webview/browser/gfx/parent_output_surface.h"
 #include "android_webview/browser/gfx/task_forwarding_sequence.h"
-#include "android_webview/browser/gfx/task_queue_web_view.h"
+#include "android_webview/browser/gfx/task_queue_webview.h"
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "gpu/ipc/gpu_task_scheduler_helper.h"

android_webview/browser/gfx/surfaces_instance.cc

@@ -8,13 +8,6 @@
 #include <memory>
 #include <utility>
 
-#include "android_webview/browser/gfx/aw_render_thread_context_provider.h"
-#include "android_webview/browser/gfx/deferred_gpu_command_service.h"
-#include "android_webview/browser/gfx/gpu_service_web_view.h"
-#include "android_webview/browser/gfx/output_surface_provider_webview.h"
-#include "android_webview/browser/gfx/parent_output_surface.h"
-#include "android_webview/browser/gfx/skia_output_surface_dependency_webview.h"
-#include "android_webview/browser/gfx/task_queue_web_view.h"
 #include "android_webview/common/aw_switches.h"
 #include "base/android/build_info.h"
 #include "base/command_line.h"
@@ -29,7 +22,6 @@
 #include "components/viz/service/display/display.h"
 #include "components/viz/service/display/display_scheduler.h"
 #include "components/viz/service/display/overlay_processor_stub.h"
-#include "components/viz/service/display_embedder/skia_output_surface_impl.h"
 #include "components/viz/service/frame_sinks/compositor_frame_sink_support.h"
 #include "components/viz/service/frame_sinks/frame_sink_manager_impl.h"
 #include "gpu/command_buffer/service/sequence_id.h"

android_webview/browser/gfx/surfaces_instance.h

@@ -97,7 +97,7 @@ class SurfacesInstance : public base::RefCounted<SurfacesInstance>,
   viz::FrameSinkId frame_sink_id_;
 
   // Used to create viz::OutputSurface and gl::GLSurface
-  OutputSurfaceProviderWebview output_surface_provider_;
+  OutputSurfaceProviderWebView output_surface_provider_;
 
   std::unique_ptr<viz::FrameSinkManagerImpl> frame_sink_manager_;
   std::unique_ptr<viz::BeginFrameSource> begin_frame_source_;

android_webview/browser/gfx/task_forwarding_sequence.cc

@@ -4,7 +4,7 @@
 
 #include "android_webview/browser/gfx/task_forwarding_sequence.h"
 
-#include "android_webview/browser/gfx/task_queue_web_view.h"
+#include "android_webview/browser/gfx/task_queue_webview.h"
 #include "base/bind.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/trace_event/trace_event.h"

android_webview/browser/gfx/task_forwarding_sequence.h

@@ -19,7 +19,7 @@ class SyncPointManager;
 namespace android_webview {
 class TaskQueueWebView;
 
-// TaskForwardingsequence provides a SingleTaskSequence implementation that
+// TaskForwardingSequence provides a SingleTaskSequence implementation that
 // satisfies WebView's threading requirements. It encapsulates a
 // SyncPointOrderData, and posts tasks to the WebView's global task queue:
 // TaskQueueWebView.

android_webview/browser/gfx/task_queue_web_view.cc → android_webview/browser/gfx/task_queue_webview.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 "android_webview/browser/gfx/task_queue_web_view.h"
+#include "android_webview/browser/gfx/task_queue_webview.h"
 
 #include <memory>
 #include <utility>

android_webview/browser/gfx/task_queue_web_view.h → android_webview/browser/gfx/task_queue_webview.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 ANDROID_WEBVIEW_BROWSER_GFX_TASK_QUEUE_WEB_VIEW_H_
-#define ANDROID_WEBVIEW_BROWSER_GFX_TASK_QUEUE_WEB_VIEW_H_
+#ifndef ANDROID_WEBVIEW_BROWSER_GFX_TASK_QUEUE_WEBVIEW_H_
+#define ANDROID_WEBVIEW_BROWSER_GFX_TASK_QUEUE_WEBVIEW_H_
 
 #include "base/callback.h"
 #include "base/macros.h"
@@ -18,8 +18,9 @@ class ScopedAllowGL {
   ScopedAllowGL();
   ~ScopedAllowGL();
 
- private:
-  DISALLOW_COPY_AND_ASSIGN(ScopedAllowGL);
+  // Disallow copy and assign.
+  ScopedAllowGL(const ScopedAllowGL&) = delete;
+  ScopedAllowGL& operator=(const ScopedAllowGL&) = delete;
 };
 
 // In WebView, there is a single task queue that runs all tasks instead of
@@ -65,4 +66,4 @@ class TaskQueueWebView {
 
 }  // namespace android_webview
 
-#endif  // ANDROID_WEBVIEW_BROWSER_GFX_TASK_QUEUE_WEB_VIEW_H_
+#endif  // ANDROID_WEBVIEW_BROWSER_GFX_TASK_QUEUE_WEBVIEW_H_

android_webview/browser/gfx/viz_compositor_thread_runner_webview.cc

@@ -6,7 +6,7 @@
 
 #include <utility>
 
-#include "android_webview/browser/gfx/task_queue_web_view.h"
+#include "android_webview/browser/gfx/task_queue_webview.h"
 #include "base/check_op.h"
 #include "base/location.h"
 #include "base/no_destructor.h"

android_webview/lib/aw_main_delegate.cc

@@ -10,7 +10,7 @@
 #include "android_webview/browser/aw_media_url_interceptor.h"
 #include "android_webview/browser/gfx/aw_draw_fn_impl.h"
 #include "android_webview/browser/gfx/browser_view_renderer.h"
-#include "android_webview/browser/gfx/gpu_service_web_view.h"
+#include "android_webview/browser/gfx/gpu_service_webview.h"
 #include "android_webview/browser/gfx/viz_compositor_thread_runner_webview.h"
 #include "android_webview/browser/scoped_add_feature_flags.h"
 #include "android_webview/browser/tracing/aw_trace_event_args_allowlist.h"

android_webview/lib/webview_tests.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 "android_webview/browser/gfx/gpu_service_web_view.h"
+#include "android_webview/browser/gfx/gpu_service_webview.h"
 #include "base/command_line.h"
 #include "base/test/test_suite.h"
 #include "content/public/common/content_switches.h"

android_webview/test/shell/src/draw_fn/DEPS

@@ -5,7 +5,7 @@ include_rules = [
   "+android_webview/test/shell/src/draw_fn",
 
   # For initializing GL bindings
-  "+android_webview/browser/gfx/gpu_service_web_view.h",
+  "+android_webview/browser/gfx/gpu_service_webview.h",
 
   # For EGL bindings
   "+ui/gl/gl_bindings.h",

android_webview/test/shell/src/draw_fn/context_manager.cc

@@ -6,7 +6,7 @@
 
 #include <android/native_window_jni.h>
 
-#include "android_webview/browser/gfx/gpu_service_web_view.h"
+#include "android_webview/browser/gfx/gpu_service_webview.h"
 #include "android_webview/public/browser/draw_fn.h"
 #include "android_webview/test/draw_fn_impl_jni_headers/ContextManager_jni.h"
 #include "android_webview/test/shell/src/draw_fn/allocator.h"