Commit 40b5972c authored by Dave Tapuska's avatar Dave Tapuska Committed by Commit Bot

Move DidCompletePageScaleAnimation into base.

Move the implementation of this method into the base class.

BUG=1097816

Change-Id: I87fefb34168331ea7225fb3a7a6e9b4040e804b3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2533029Reviewed-by: default avatardanakj <danakj@chromium.org>
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#826520}
parent d97db24f
...@@ -894,6 +894,15 @@ void WebFrameWidgetBase::WillBeginMainFrame() { ...@@ -894,6 +894,15 @@ void WebFrameWidgetBase::WillBeginMainFrame() {
Client()->WillBeginMainFrame(); Client()->WillBeginMainFrame();
} }
void WebFrameWidgetBase::DidCompletePageScaleAnimation() {
// Page scale animations only happen on the main frame.
DCHECK(ForMainFrame());
if (auto* focused_frame = View()->FocusedFrame()) {
if (focused_frame->AutofillClient())
focused_frame->AutofillClient()->DidCompleteFocusChangeInFrame();
}
}
void WebFrameWidgetBase::ScheduleAnimation() { void WebFrameWidgetBase::ScheduleAnimation() {
Client()->ScheduleAnimation(); Client()->ScheduleAnimation();
} }
......
...@@ -371,6 +371,7 @@ class CORE_EXPORT WebFrameWidgetBase ...@@ -371,6 +371,7 @@ class CORE_EXPORT WebFrameWidgetBase
base::TimeTicks first_scroll_timestamp) override; base::TimeTicks first_scroll_timestamp) override;
void DidBeginMainFrame() override; void DidBeginMainFrame() override;
void WillBeginMainFrame() override; void WillBeginMainFrame() override;
void DidCompletePageScaleAnimation() override;
void FocusChangeComplete() override; void FocusChangeComplete() override;
bool WillHandleGestureEvent(const WebGestureEvent& event) override; bool WillHandleGestureEvent(const WebGestureEvent& event) override;
void WillHandleMouseEvent(const WebMouseEvent& event) override; void WillHandleMouseEvent(const WebMouseEvent& event) override;
......
...@@ -776,10 +776,6 @@ gfx::Rect WebFrameWidgetImpl::ViewportVisibleRect() { ...@@ -776,10 +776,6 @@ gfx::Rect WebFrameWidgetImpl::ViewportVisibleRect() {
return compositor_visible_rect_; return compositor_visible_rect_;
} }
void WebFrameWidgetImpl::DidCompletePageScaleAnimation() {
// Page scale animations only happen on the main frame.
}
void WebFrameWidgetImpl::ApplyVisualPropertiesSizing( void WebFrameWidgetImpl::ApplyVisualPropertiesSizing(
const VisualProperties& visual_properties) { const VisualProperties& visual_properties) {
SetWindowSegments(visual_properties.root_widget_window_segments); SetWindowSegments(visual_properties.root_widget_window_segments);
......
...@@ -140,7 +140,6 @@ class WebFrameWidgetImpl final : public WebFrameWidgetBase { ...@@ -140,7 +140,6 @@ class WebFrameWidgetImpl final : public WebFrameWidgetBase {
// WidgetBaseClient overrides: // WidgetBaseClient overrides:
void FocusChanged(bool enable) override; void FocusChanged(bool enable) override;
gfx::Rect ViewportVisibleRect() override; gfx::Rect ViewportVisibleRect() override;
void DidCompletePageScaleAnimation() override;
// blink::mojom::FrameWidget // blink::mojom::FrameWidget
void EnableDeviceEmulation(const DeviceEmulationParams& parameters) override; void EnableDeviceEmulation(const DeviceEmulationParams& parameters) override;
......
...@@ -625,13 +625,6 @@ void WebViewFrameWidget::RunPaintBenchmark(int repeat_count, ...@@ -625,13 +625,6 @@ void WebViewFrameWidget::RunPaintBenchmark(int repeat_count,
web_view_->RunPaintBenchmark(repeat_count, result); web_view_->RunPaintBenchmark(repeat_count, result);
} }
void WebViewFrameWidget::DidCompletePageScaleAnimation() {
if (auto* focused_frame = View()->FocusedFrame()) {
if (focused_frame->AutofillClient())
focused_frame->AutofillClient()->DidCompleteFocusChangeInFrame();
}
}
const ScreenInfo& WebViewFrameWidget::GetOriginalScreenInfo() { const ScreenInfo& WebViewFrameWidget::GetOriginalScreenInfo() {
if (device_emulator_) if (device_emulator_)
return device_emulator_->original_screen_info(); return device_emulator_->original_screen_info();
......
...@@ -113,7 +113,6 @@ class CORE_EXPORT WebViewFrameWidget : public WebFrameWidgetBase { ...@@ -113,7 +113,6 @@ class CORE_EXPORT WebViewFrameWidget : public WebFrameWidgetBase {
const gfx::Rect& window_screen_rect) override; const gfx::Rect& window_screen_rect) override;
void RunPaintBenchmark(int repeat_count, void RunPaintBenchmark(int repeat_count,
cc::PaintBenchmarkResult& result) override; cc::PaintBenchmarkResult& result) override;
void DidCompletePageScaleAnimation() override;
void SetScreenMetricsEmulationParameters( void SetScreenMetricsEmulationParameters(
bool enabled, bool enabled,
......
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