Move more methods from WebViewImpl to WebViewBase, and cut dependencies.

third_party/WebKit/Source/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 2012 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 1752 matching lines @@
 }
 
 LocalDOMWindow* WebViewImpl::PagePopupWindow() const {
   return page_popup_ ? page_popup_->Window() : nullptr;
 }
 
 Frame* WebViewImpl::FocusedCoreFrame() const {
   return page_ ? page_->GetFocusController().FocusedOrMainFrame() : nullptr;
 }
 
+WebViewBase* WebViewBase::FromPage(Page* page) {
+  return WebViewImpl::FromPage(page);
+}
+
 WebViewImpl* WebViewImpl::FromPage(Page* page) {
   return page ? static_cast<WebViewImpl*>(page->GetChromeClient().WebView())
               : nullptr;
 }
 
 // WebWidget ------------------------------------------------------------------
 
 void WebViewImpl::Close() {
   DCHECK(AllInstances().Contains(this));
   AllInstances().erase(this);
@@ skipping 1935 matching lines @@
   GetPageScaleConstraintsSet().SetNeedsReset(false);
   UpdateLayerTreeViewport();
   client_->PageScaleFactorChanged();
   dev_tools_emulator_->MainFrameScrollOrScaleChanged();
 }
 
 void WebViewImpl::MainFrameScrollOffsetChanged() {
   dev_tools_emulator_->MainFrameScrollOrScaleChanged();
 }
 
+bool WebViewBase::UseExternalPopupMenus() {
+  return WebViewImpl::UseExternalPopupMenus();
+}
+
 bool WebViewImpl::UseExternalPopupMenus() {
   return g_should_use_external_popup_menus;
 }
 
 void WebViewImpl::SetBackgroundColorOverride(WebColor color) {
   background_color_override_enabled_ = true;
   background_color_override_ = color;
   UpdateLayerTreeBackgroundColor();
 }
 
@@ skipping 434 matching lines @@
   if (focused_frame->LocalFrameRoot() != MainFrameImpl()->GetFrame())
     return nullptr;
   return focused_frame;
 }
 
 LocalFrame* WebViewImpl::FocusedLocalFrameAvailableForIme() const {
   return ime_accept_events_ ? FocusedLocalFrameInWidget() : nullptr;
 }
 
 }  // namespace blink