Commit 802a9335 authored by Dave Tapuska's avatar Dave Tapuska Committed by Chromium LUCI CQ

Remove DidChangeCursor callback on WebWidgetClient.

The callback is unnecessary because the WebViewPlugin can use
the SetCursor callback on the simulated mojo interface it has.

BUG=1097816

Change-Id: I60854e362a1ada7a4060c6226d2e56e448ca1f0b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2577003
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Reviewed-by: default avatarTommy Li <tommycli@chromium.org>
Cr-Commit-Position: refs/heads/master@{#835261}
parent 437b3e1a
......@@ -326,7 +326,7 @@ void WebViewPlugin::WebViewHelper::DidInvalidateRect(const WebRect& rect) {
plugin_->container_->InvalidateRect(rect);
}
void WebViewPlugin::WebViewHelper::DidChangeCursor(const ui::Cursor& cursor) {
void WebViewPlugin::WebViewHelper::SetCursor(const ui::Cursor& cursor) {
plugin_->current_cursor_ = cursor;
}
......
......@@ -182,7 +182,6 @@ class WebViewPlugin : public blink::WebPlugin,
blink::DragOperationsMask,
const SkBitmap&,
const gfx::Point&) override;
void DidChangeCursor(const ui::Cursor& cursor) override;
void ScheduleNonCompositedAnimation() override;
// WebLocalFrameClient methods:
......@@ -193,7 +192,7 @@ class WebViewPlugin : public blink::WebPlugin,
override;
// blink::mojom::WidgetHost implementation.
void SetCursor(const ui::Cursor& cursor) override {}
void SetCursor(const ui::Cursor& cursor) override;
void SetToolTipText(const base::string16& tooltip_text,
base::i18n::TextDirection hint) override;
void TextInputStateChanged(ui::mojom::TextInputStatePtr state) override {}
......
......@@ -59,10 +59,6 @@ namespace gfx {
class Point;
}
namespace ui {
class Cursor;
}
namespace blink {
class WebDragData;
......@@ -74,9 +70,6 @@ class WebWidgetClient {
// called for widget's WebView's that do not composite.
virtual void ScheduleNonCompositedAnimation() {}
// Called when the cursor for the widget changes.
virtual void DidChangeCursor(const ui::Cursor&) {}
// Called when a drag-and-drop operation should begin. Returns whether the
// call has been handled.
virtual bool InterceptStartDragging(const WebDragData&,
......
......@@ -3180,7 +3180,6 @@ void WebFrameWidgetImpl::InjectGestureScrollEvent(
void WebFrameWidgetImpl::DidChangeCursor(const ui::Cursor& cursor) {
widget_base_->SetCursor(cursor);
Client()->DidChangeCursor(cursor);
}
bool WebFrameWidgetImpl::SetComposition(
......
......@@ -24,6 +24,10 @@ class LayerTreeSettings;
class PaintImage;
} // namespace cc
namespace ui {
class Cursor;
} // namespace ui
namespace blink {
// In interface exposed within Blink from local root frames that provides
......
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