Move didFocus from WebWidgetClient to WebViewClient.

This method is used to bring the window to focus, and only makes sense when called on the main frame. This is part of a refactor to split WebView/WebWidget. BUG=419087 Review-Url: https://codereview.chromium.org/2157113002 Cr-Commit-Position: refs/heads/master@{#406609}
Denger-Network · Jul 20, 2016 · 09e6b3b · 09e6b3b
1 parent 0f92cee
commit 09e6b3b
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 16 deletions.
diff --git a/components/test_runner/web_test_proxy.h b/components/test_runner/web_test_proxy.h
@@ -184,7 +184,7 @@ class WebTestProxy : public Base, public WebTestProxyBase {
     return widget_test_client()->isPointerLocked();
   }
   void didFocus() override {
-    widget_test_client()->didFocus();
+    view_test_client()->didFocus();
     Base::didFocus();
   }
   void setToolTipText(const blink::WebString& text,

diff --git a/components/test_runner/web_view_test_client.cc b/components/test_runner/web_view_test_client.cc
@@ -146,4 +146,8 @@ WebTestDelegate* WebViewTestClient::delegate() {
   return web_test_proxy_base_->delegate();
 }
 
+void WebViewTestClient::didFocus() {
+  test_runner_->SetFocus(web_test_proxy_base_->web_view(), true);
+}
+
 }  // namespace test_runner
diff --git a/components/test_runner/web_view_test_client.h b/components/test_runner/web_view_test_client.h
@@ -54,6 +54,7 @@ class WebViewTestClient : public blink::WebViewClient {
   void printPage(blink::WebLocalFrame* frame) override;
   blink::WebSpeechRecognizer* speechRecognizer() override;
   blink::WebString acceptLanguages() override;
+  void didFocus() override;
 
  private:
   WebTestDelegate* delegate();

diff --git a/components/test_runner/web_widget_test_client.cc b/components/test_runner/web_widget_test_client.cc
@@ -93,10 +93,6 @@ bool WebWidgetTestClient::isPointerLocked() {
   return web_test_proxy_base_->view_test_runner()->isPointerLocked();
 }
 
-void WebWidgetTestClient::didFocus() {
-  test_runner_->SetFocus(web_test_proxy_base_->web_view(), true);
-}
-
 void WebWidgetTestClient::setToolTipText(const blink::WebString& text,
                                          blink::WebTextDirection direction) {
   test_runner_->setToolTipText(text);

diff --git a/components/test_runner/web_widget_test_client.h b/components/test_runner/web_widget_test_client.h
@@ -38,7 +38,6 @@ class WebWidgetTestClient : public blink::WebWidgetClient {
   bool requestPointerLock() override;
   void requestPointerUnlock() override;
   bool isPointerLocked() override;
-  void didFocus() override;
   void setToolTipText(const blink::WebString& text,
                       blink::WebTextDirection direction) override;
   void resetInputMethod() override;

diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
@@ -288,7 +288,6 @@ class CONTENT_EXPORT RenderViewImpl
   // blink::WebWidgetClient implementation ------------------------------------
 
   // Most methods are handled by RenderWidget.
-  void didFocus() override;
   void show(blink::WebNavigationPolicy policy) override;
   void didHandleGestureEvent(const blink::WebGestureEvent& event,
                              bool event_cancelled) override;
@@ -384,6 +383,7 @@ class CONTENT_EXPORT RenderViewImpl
   void pageImportanceSignalsChanged() override;
   void didAutoResize(const blink::WebSize& newSize) override;
   blink::WebRect rootWindowRect() override;
+  void didFocus() override;
 
 #if defined(OS_ANDROID)
   void scheduleContentIntent(const blink::WebURL& intent,

diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
@@ -1220,9 +1220,6 @@ void RenderWidget::show(WebNavigationPolicy) {
   SetPendingWindowRect(initial_rect_);
 }
 
-void RenderWidget::didFocus() {
-}
-
 void RenderWidget::DoDeferredClose() {
   WillCloseLayerTreeView();
   Send(new ViewHostMsg_Close(routing_id_));

diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h
@@ -236,7 +236,6 @@ class CONTENT_EXPORT RenderWidget
   void initializeLayerTreeView() override;
   blink::WebLayerTreeView* layerTreeView() override;
   void didMeaningfulLayout(blink::WebMeaningfulLayout layout_type) override;
-  void didFocus() override;
   void didChangeCursor(const blink::WebCursorInfo&) override;
   void closeWidgetSoon() override;
   void show(blink::WebNavigationPolicy) override;

diff --git a/third_party/WebKit/public/web/WebViewClient.h b/third_party/WebKit/public/web/WebViewClient.h
@@ -194,6 +194,8 @@ class WebViewClient : protected WebWidgetClient {
     // Called when the View has changed size as a result of an auto-resize.
     virtual void didAutoResize(const WebSize& newSize) {}
 
+    // Called when the View acquires focus.
+    virtual void didFocus() {}
 
     // Session history -----------------------------------------------------
 
@@ -260,7 +262,6 @@ class WebViewClient : protected WebWidgetClient {
     void closeWidgetSoon() override {}
     void convertViewportToWindow(WebRect* rect) override {}
     void convertWindowToViewport(WebFloatRect* rect) override {}
-    void didFocus() override {}
     void didHandleGestureEvent(const WebGestureEvent& event, bool eventCancelled) override {}
     void didInvalidateRect(const WebRect&) override {}
     void didOverscroll(const WebFloatSize& overscrollDelta, const WebFloatSize& accumulatedOverscroll, const WebFloatPoint& positionInViewport, const WebFloatSize& velocityInViewport) override {}

diff --git a/third_party/WebKit/public/web/WebWidgetClient.h b/third_party/WebKit/public/web/WebWidgetClient.h
@@ -77,10 +77,6 @@ class WebWidgetClient {
 
     virtual void didFirstLayoutAfterFinishedParsing() { }
 
-    // Called when the widget acquires or loses focus, respectively.
-    virtual void didFocus() { }
-    virtual void didBlur() { }
-
     // Called when the cursor for the widget changes.
     virtual void didChangeCursor(const WebCursorInfo&) { }