Commit 3768ceea authored by Dave Tapuska's avatar Dave Tapuska Committed by Commit Bot

Minor cleanup of RenderWidget.

Remove unused definitions and includes.
Remove AfterUpdateVisualProperties virtual since it can be solely
handled inside RenderWidgetFullscreenPepper and its
WebExternalWidgetClient itself.

BUG=1097816

Change-Id: I30f83f37ed770b1b7fa6a1c48c5042ef9e6b959a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2363837
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Reviewed-by: default avatarDaniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#802023}
parent 93b6d793
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
#include <limits> #include <limits>
#include <utility> #include <utility>
#include "base/auto_reset.h"
#include "base/base_switches.h" #include "base/base_switches.h"
#include "base/bind.h" #include "base/bind.h"
#include "base/bind_helpers.h" #include "base/bind_helpers.h"
...@@ -27,15 +26,11 @@ ...@@ -27,15 +26,11 @@
#include "base/threading/thread_task_runner_handle.h" #include "base/threading/thread_task_runner_handle.h"
#include "base/trace_event/trace_event.h" #include "base/trace_event/trace_event.h"
#include "build/build_config.h" #include "build/build_config.h"
#include "cc/animation/animation_host.h"
#include "cc/base/features.h" #include "cc/base/features.h"
#include "cc/base/switches.h" #include "cc/base/switches.h"
#include "cc/input/touch_action.h"
#include "cc/paint/paint_worklet_layer_painter.h"
#include "cc/trees/layer_tree_frame_sink.h" #include "cc/trees/layer_tree_frame_sink.h"
#include "cc/trees/layer_tree_host.h" #include "cc/trees/layer_tree_host.h"
#include "cc/trees/ukm_manager.h" #include "cc/trees/ukm_manager.h"
#include "components/viz/common/display/de_jelly.h"
#include "components/viz/common/features.h" #include "components/viz/common/features.h"
#include "components/viz/common/frame_sinks/begin_frame_source.h" #include "components/viz/common/frame_sinks/begin_frame_source.h"
#include "components/viz/common/frame_sinks/copy_output_request.h" #include "components/viz/common/frame_sinks/copy_output_request.h"
...@@ -70,11 +65,8 @@ ...@@ -70,11 +65,8 @@
#include "ppapi/buildflags/buildflags.h" #include "ppapi/buildflags/buildflags.h"
#include "skia/ext/platform_canvas.h" #include "skia/ext/platform_canvas.h"
#include "third_party/blink/public/common/features.h" #include "third_party/blink/public/common/features.h"
#include "third_party/blink/public/common/input/web_input_event_attribution.h"
#include "third_party/blink/public/common/input/web_mouse_event.h"
#include "third_party/blink/public/common/page/web_drag_operation.h" #include "third_party/blink/public/common/page/web_drag_operation.h"
#include "third_party/blink/public/common/switches.h" #include "third_party/blink/public/common/switches.h"
#include "third_party/blink/public/common/widget/device_emulation_params.h"
#include "third_party/blink/public/platform/file_path_conversion.h" #include "third_party/blink/public/platform/file_path_conversion.h"
#include "third_party/blink/public/platform/platform.h" #include "third_party/blink/public/platform/platform.h"
#include "third_party/blink/public/platform/scheduler/web_render_widget_scheduling_state.h" #include "third_party/blink/public/platform/scheduler/web_render_widget_scheduling_state.h"
...@@ -86,13 +78,10 @@ ...@@ -86,13 +78,10 @@
#include "third_party/blink/public/platform/web_string.h" #include "third_party/blink/public/platform/web_string.h"
#include "third_party/blink/public/web/web_autofill_client.h" #include "third_party/blink/public/web/web_autofill_client.h"
#include "third_party/blink/public/web/web_frame_widget.h" #include "third_party/blink/public/web/web_frame_widget.h"
#include "third_party/blink/public/web/web_input_method_controller.h"
#include "third_party/blink/public/web/web_local_frame.h" #include "third_party/blink/public/web/web_local_frame.h"
#include "third_party/blink/public/web/web_node.h" #include "third_party/blink/public/web/web_node.h"
#include "third_party/blink/public/web/web_page_popup.h" #include "third_party/blink/public/web/web_page_popup.h"
#include "third_party/blink/public/web/web_popup_menu_info.h" #include "third_party/blink/public/web/web_popup_menu_info.h"
#include "third_party/blink/public/web/web_range.h"
#include "third_party/blink/public/web/web_settings.h"
#include "third_party/blink/public/web/web_view.h" #include "third_party/blink/public/web/web_view.h"
#include "third_party/blink/public/web/web_widget.h" #include "third_party/blink/public/web/web_widget.h"
#include "third_party/skia/include/core/SkShader.h" #include "third_party/skia/include/core/SkShader.h"
...@@ -123,29 +112,14 @@ ...@@ -123,29 +112,14 @@
#include "third_party/skia/include/core/SkPixelRef.h" #include "third_party/skia/include/core/SkPixelRef.h"
#endif // defined(OS_POSIX) #endif // defined(OS_POSIX)
using blink::DeviceEmulationParams;
using blink::WebDragData; using blink::WebDragData;
using blink::WebDragOperation; using blink::WebDragOperation;
using blink::WebDragOperationsMask; using blink::WebDragOperationsMask;
using blink::WebFrameWidget; using blink::WebFrameWidget;
using blink::WebGestureEvent;
using blink::WebInputEvent;
using blink::WebInputEventResult;
using blink::WebInputMethodController;
using blink::WebLocalFrame; using blink::WebLocalFrame;
using blink::WebMouseEvent;
using blink::WebMouseWheelEvent;
using blink::WebNavigationPolicy; using blink::WebNavigationPolicy;
using blink::WebNode;
using blink::WebPagePopup;
using blink::WebRange;
using blink::WebRect; using blink::WebRect;
using blink::WebSize;
using blink::WebString; using blink::WebString;
using blink::WebTouchEvent;
using blink::WebTouchPoint;
using blink::WebVector;
using blink::WebWidget;
namespace content { namespace content {
...@@ -154,8 +128,6 @@ namespace { ...@@ -154,8 +128,6 @@ namespace {
RenderWidget::CreateRenderWidgetFunction g_create_render_widget_for_frame = RenderWidget::CreateRenderWidgetFunction g_create_render_widget_for_frame =
nullptr; nullptr;
typedef std::map<std::string, ui::TextInputMode> TextInputModeMap;
static const char* kOOPIF = "OOPIF"; static const char* kOOPIF = "OOPIF";
static const char* kRenderer = "Renderer"; static const char* kRenderer = "Renderer";
...@@ -372,7 +344,7 @@ void RenderWidget::CloseForFrame(std::unique_ptr<RenderWidget> widget) { ...@@ -372,7 +344,7 @@ void RenderWidget::CloseForFrame(std::unique_ptr<RenderWidget> widget) {
} }
void RenderWidget::Initialize(ShowCallback show_callback, void RenderWidget::Initialize(ShowCallback show_callback,
WebWidget* web_widget, blink::WebWidget* web_widget,
const blink::ScreenInfo& screen_info) { const blink::ScreenInfo& screen_info) {
DCHECK_NE(routing_id_, MSG_ROUTING_NONE); DCHECK_NE(routing_id_, MSG_ROUTING_NONE);
DCHECK(web_widget); DCHECK(web_widget);
...@@ -516,8 +488,6 @@ void RenderWidget::UpdateVisualProperties( ...@@ -516,8 +488,6 @@ void RenderWidget::UpdateVisualProperties(
} }
} }
} }
AfterUpdateVisualProperties();
} }
void RenderWidget::OnWasHidden() { void RenderWidget::OnWasHidden() {
......
...@@ -333,9 +333,6 @@ class CONTENT_EXPORT RenderWidget ...@@ -333,9 +333,6 @@ class CONTENT_EXPORT RenderWidget
bool emulator_enabled, bool emulator_enabled,
const blink::VisualProperties& properties) override; const blink::VisualProperties& properties) override;
// Notify subclasses that we handled OnUpdateVisualProperties.
virtual void AfterUpdateVisualProperties() {}
// Destroy the RenderWidget. The |widget| is the owning pointer of |this|. // Destroy the RenderWidget. The |widget| is the owning pointer of |this|.
virtual void Close(std::unique_ptr<RenderWidget> widget); virtual void Close(std::unique_ptr<RenderWidget> widget);
......
...@@ -167,6 +167,7 @@ class PepperExternalWidgetClient : public blink::WebExternalWidgetClient { ...@@ -167,6 +167,7 @@ class PepperExternalWidgetClient : public blink::WebExternalWidgetClient {
const blink::VisualProperties& visual_properties) override { const blink::VisualProperties& visual_properties) override {
widget_->UpdateVisualProperties(/*emulator_enabled=*/false, widget_->UpdateVisualProperties(/*emulator_enabled=*/false,
visual_properties); visual_properties);
widget_->UpdateLayerBounds();
} }
private: private:
...@@ -269,10 +270,6 @@ void RenderWidgetFullscreenPepper::Close(std::unique_ptr<RenderWidget> widget) { ...@@ -269,10 +270,6 @@ void RenderWidgetFullscreenPepper::Close(std::unique_ptr<RenderWidget> widget) {
RenderWidget::Close(std::move(widget)); RenderWidget::Close(std::move(widget));
} }
void RenderWidgetFullscreenPepper::AfterUpdateVisualProperties() {
UpdateLayerBounds();
}
void RenderWidgetFullscreenPepper::UpdateLayerBounds() { void RenderWidgetFullscreenPepper::UpdateLayerBounds() {
if (!layer_) if (!layer_)
return; return;
......
...@@ -70,7 +70,6 @@ class RenderWidgetFullscreenPepper : public RenderWidget, ...@@ -70,7 +70,6 @@ class RenderWidgetFullscreenPepper : public RenderWidget,
// RenderWidget API. // RenderWidget API.
void Close(std::unique_ptr<RenderWidget> widget) override; void Close(std::unique_ptr<RenderWidget> widget) override;
void AfterUpdateVisualProperties() override;
private: private:
friend class PepperExternalWidgetClient; friend class PepperExternalWidgetClient;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment