Remove the last references from production code to WebViewImpl.

third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp

 /*
  * Copyright (C) 2014 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 75 matching lines @@
                                        WebLocalFrame* local_root) {
   DCHECK(client) << "A valid WebWidgetClient must be supplied.";
   // Pass the WebFrameWidget's self-reference to the caller.
   return WebFrameWidgetImpl::Create(client, local_root);
 }
 
 WebFrameWidget* WebFrameWidget::Create(WebWidgetClient* client,
                                        WebView* web_view,
                                        WebLocalFrame* main_frame) {
   DCHECK(client) << "A valid WebWidgetClient must be supplied.";
-  return new WebViewFrameWidget(*client, ToWebViewImpl(*web_view),
+  return new WebViewFrameWidget(*client, static_cast<WebViewBase&>(*web_view),

[slangley, 2017/05/02 06:25:33]

The only concrete type inherits WebViewBase, so a straight cast here should be
OK.

                                 ToWebLocalFrameImpl(*main_frame));
 }
 
 WebFrameWidgetImpl* WebFrameWidgetImpl::Create(WebWidgetClient* client,
                                                WebLocalFrame* local_root) {
   DCHECK(client) << "A valid WebWidgetClient must be supplied.";
   // Pass the WebFrameWidgetImpl's self-reference to the caller.
   return new WebFrameWidgetImpl(
       client, local_root);  // SelfKeepAlive is set in constructor.
 }
@@ skipping 675 matching lines @@
                                           const WebMouseEvent& event) {
   // FIXME: WebWidget doesn't have the method below.
   // m_client->setMouseOverURL(WebURL());
   PageWidgetEventHandler::HandleMouseLeave(main_frame, event);
 }
 
 void WebFrameWidgetImpl::HandleMouseDown(LocalFrame& main_frame,
                                          const WebMouseEvent& event) {
   // TODO(slangley): Remove this downcast to WebViewImpl once we lift this
   // code into core.
-  WebViewImpl* view_impl = ToWebViewImpl(View());
+  WebViewBase* view_impl = View();
   // If there is a popup open, close it as the user is clicking on the page
   // (outside of the popup). We also save it so we can prevent a click on an
   // element from immediately reopening the same popup.
   RefPtr<WebPagePopupImpl> page_popup;
   if (event.button == WebMouseEvent::Button::kLeft) {
-    page_popup = view_impl->GetPagePopup();
+    page_popup = ToWebPagePopupImpl(view_impl->GetPagePopup());
     view_impl->HidePopups();
   }
 
   // Take capture on a mouse down on a plugin so we can send it mouse events.
   // If the hit node is a plugin but a scrollbar is over it don't start mouse
   // capture because it will interfere with the scrollbar receiving events.
   IntPoint point(event.PositionInWidget().x, event.PositionInWidget().y);
   if (event.button == WebMouseEvent::Button::kLeft) {
     point = local_root_->GetFrameView()->RootFrameToContents(point);
     HitTestResult result(
         local_root_->GetFrame()->GetEventHandler().HitTestResultAtPoint(point));
     result.SetToShadowHostIfInRestrictedShadowRoot();
     Node* hit_node = result.InnerNode();
 
     if (!result.GetScrollbar() && hit_node && hit_node->GetLayoutObject() &&
         hit_node->GetLayoutObject()->IsEmbeddedObject()) {
       mouse_capture_node_ = hit_node;
       TRACE_EVENT_ASYNC_BEGIN0("input", "capturing mouse", this);
     }
   }
 
   PageWidgetEventHandler::HandleMouseDown(main_frame, event);
 
   if (event.button == WebMouseEvent::Button::kLeft && mouse_capture_node_)
     mouse_capture_gesture_token_ =
         main_frame.GetEventHandler().TakeLastMouseDownGestureToken();
 
   if (view_impl->GetPagePopup() && page_popup &&
-      view_impl->GetPagePopup()->HasSamePopupClient(page_popup.Get())) {
+      ToWebPagePopupImpl(view_impl->GetPagePopup())
+          ->HasSamePopupClient(page_popup.Get())) {
     // That click triggered a page popup that is the same as the one we just
     // closed.  It needs to be closed.
     view_impl->HidePopups();
   }
 
   // Dispatch the contextmenu event regardless of if the click was swallowed.
   if (!GetPage()->GetSettings().GetShowContextMenuOnMouseUp()) {
 #if OS(MACOSX)
     if (event.button == WebMouseEvent::Button::kRight ||
         (event.button == WebMouseEvent::Button::kLeft &&
@@ skipping 57 matching lines @@
     const WebMouseWheelEvent& event) {
   View()->HidePopups();
   return PageWidgetEventHandler::HandleMouseWheel(main_frame, event);
 }
 
 WebInputEventResult WebFrameWidgetImpl::HandleGestureEvent(
     const WebGestureEvent& event) {
   DCHECK(client_);
   WebInputEventResult event_result = WebInputEventResult::kNotHandled;
   bool event_cancelled = false;
-  // TODO(slangley): Remove this downcast to WebViewImpl once we lift this
-  // code into core.
-  WebViewImpl* view_impl = ToWebViewImpl(View());
+
+  WebViewBase* view_impl = View();
   switch (event.GetType()) {
     case WebInputEvent::kGestureScrollBegin:
     case WebInputEvent::kGestureScrollEnd:
     case WebInputEvent::kGestureScrollUpdate:
     case WebInputEvent::kGestureTap:
     case WebInputEvent::kGestureTapUnconfirmed:
     case WebInputEvent::kGestureTapDown:
       // Touch pinch zoom and scroll on the page (outside of a popup) must hide
       // the popup. In case of a touch scroll or pinch zoom, this function is
       // called with GestureTapDown rather than a GSB/GSU/GSE or GPB/GPU/GPE.
       // When we close a popup because of a GestureTapDown, we also save it so
       // we can prevent the following GestureTap from immediately reopening the
       // same popup.
-      view_impl->SetLastHiddenPagePopup(view_impl->GetPagePopup());
+      view_impl->SetLastHiddenPagePopup(
+          ToWebPagePopupImpl(view_impl->GetPagePopup()));
       View()->HidePopups();
     case WebInputEvent::kGestureTapCancel:
       View()->SetLastHiddenPagePopup(nullptr);
     case WebInputEvent::kGestureShowPress:
     case WebInputEvent::kGestureDoubleTap:
     case WebInputEvent::kGestureTwoFingerTap:
     case WebInputEvent::kGestureLongPress:
     case WebInputEvent::kGestureLongTap:
       break;
     case WebInputEvent::kGestureFlingStart:
@@ skipping 287 matching lines @@
   return nullptr;
 }
 
 LocalFrame* WebFrameWidgetImpl::FocusedLocalFrameAvailableForIme() const {
   if (!ime_accept_events_)
     return nullptr;
   return FocusedLocalFrameInWidget();
 }
 
 }  // namespace blink