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

third_party/WebKit/Source/web/WebPagePopupImpl.h

 /*
  * Copyright (C) 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 30 matching lines @@
 
 namespace blink {
 
 class CompositorAnimationHost;
 class GraphicsLayer;
 class Page;
 class PagePopupChromeClient;
 class PagePopupClient;
 class WebLayerTreeView;
 class WebLayer;
-class WebViewImpl;
+class WebViewBase;
 class LocalDOMWindow;
 
 class WebPagePopupImpl final : public WebPagePopup,
                                public PageWidgetEventHandler,
                                public PagePopup,
                                public RefCounted<WebPagePopupImpl> {
   WTF_MAKE_NONCOPYABLE(WebPagePopupImpl);
   USING_FAST_MALLOC(WebPagePopupImpl);
 
  public:
   ~WebPagePopupImpl() override;
-  bool Initialize(WebViewImpl*, PagePopupClient*);
+  bool Initialize(WebViewBase*, PagePopupClient*);
   void ClosePopup();
   WebWidgetClient* WidgetClient() const { return widget_client_; }
   bool HasSamePopupClient(WebPagePopupImpl* other) {
     return other && popup_client_ == other->popup_client_;
   }
   LocalDOMWindow* Window();
   void LayoutAndPaintAsync(WebLayoutAndPaintAsyncCallback*) override;
   void CompositeAndReadbackAsync(
       WebCompositeAndReadbackAsyncCallback*) override;
   WebPoint PositionRelativeToOwner() override;
@@ skipping 34 matching lines @@
 
   explicit WebPagePopupImpl(WebWidgetClient*);
   bool InitializePage();
   void DestroyPage();
   void InitializeLayerTreeView();
   void SetRootGraphicsLayer(GraphicsLayer*);
 
   WebRect WindowRectInScreen() const;
 
   WebWidgetClient* widget_client_;
-  WebViewImpl* web_view_;
+  WebViewBase* web_view_;
   Persistent<Page> page_;
   Persistent<PagePopupChromeClient> chrome_client_;
   PagePopupClient* popup_client_;
   bool closing_;
 
   WebLayerTreeView* layer_tree_view_;
   WebLayer* root_layer_;
   GraphicsLayer* root_graphics_layer_;
   std::unique_ptr<CompositorAnimationHost> animation_host_;
   bool is_accelerated_compositing_active_;
 
   friend class WebPagePopup;
   friend class PagePopupChromeClient;
 };
 
 DEFINE_TYPE_CASTS(WebPagePopupImpl,
                   WebWidget,
                   widget,
                   widget->IsPagePopup(),
                   widget.IsPagePopup());
 // WebPagePopupImpl is the only implementation of PagePopup, so no
 // further checking required.
 DEFINE_TYPE_CASTS(WebPagePopupImpl, PagePopup, popup, true, true);
 
 }  // namespace blink
 #endif  // WebPagePopupImpl_h