Change all test cases to use WebViewBase instead of WebViewImpl.

third_party/WebKit/Source/core/exported/WebViewBase.h

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.#ifndef WebViewBase_h
 
 #ifndef WebViewBase_h
 #define WebViewBase_h
 
+#include "core/page/EventWithHitTestResults.h"
 #include "platform/transforms/TransformationMatrix.h"
 #include "platform/wtf/RefCounted.h"
 #include "public/platform/WebDisplayMode.h"
 #include "public/platform/WebInputEventResult.h"
 #include "public/web/WebElement.h"
 #include "public/web/WebView.h"
 
 namespace blink {
 
 class AnimationWorkletProxyClient;
+class BrowserControls;
 class ChromeClient;
 class CompositorAnimationHost;
 class CompositorWorkerProxyClient;
 class CompositorAnimationTimeline;
 class ContextMenuProvider;
 class DevToolsEmulator;
 class Frame;
 class GraphicsLayer;
 class HitTestResult;
+class LinkHighlightImpl;
 class Page;
 class PaintLayerCompositor;
 class PagePopup;
 class PagePopupClient;
 class PageScaleConstraintsSet;
 class WebInputEvent;
 class WebInputMethodControllerImpl;
 class WebKeyboardEvent;
 class WebLayer;
 class WebLocalFrameImpl;
@@ skipping 19 matching lines @@
   virtual void SetBackgroundColorOverride(WebColor) = 0;
   virtual void ClearBackgroundColorOverride() = 0;
   virtual void SetZoomFactorOverride(float) = 0;
   virtual void SetCompositorDeviceScaleFactorOverride(float) = 0;
   virtual void SetDeviceEmulationTransform(const TransformationMatrix&) = 0;
   virtual void SetShowDebugBorders(bool) = 0;
 
   virtual Page* GetPage() const = 0;
   virtual Frame* FocusedCoreFrame() const = 0;
 
+  PLATFORM_EXPORT static WebViewBase* Create(WebViewClient*,

[sashab, 2017/05/03 04:05:22]

I think BLINK_EXPORT is better than PLATFORM_EXPORT, since this code isn't in
platform/. Check with someone else though

[slangley, 2017/05/03 21:43:08]

I think because of the layering, PLATFORM_EXPORT makes more sense (as it's in
platform rather than web/) but i don't feel strongly either way. I'll see what
haraken@ thinks.

[haraken, 2017/05/04 05:30:42]

This file is in core/, not platform/. Why can't we use CORE_EXPORT?

[slangley, 2017/05/04 09:15:34]

CORE_EXPORT has an additional compiler defined constant required to actually
export (BLINK_CORE_IMPLEMENTATION) - in some cases this is not defined and hence
the symbols to not end up being exported. BLINK_EXPORT and PLATFORM_EXPORT do
not have this issue. Once we finish the move we can remove the exporting of
these symbols.

[haraken, 2017/05/04 15:14:31]

Hmm. Maybe I'm a bit behind.

No one in core/ is using BLINK_EXPORT. They are using CORE_EXPORT and working.
Why can WebViewBase not follow the pattern?

+                                             WebPageVisibilityState);
+
   static WebViewBase* FromPage(Page*);
   static HashSet<WebViewBase*>& AllInstances();
 
   // Returns the main frame associated with this view. This may be null when
   // the page is shutting down, but will be valid at all other times.
   virtual WebLocalFrameImpl* MainFrameImpl() const = 0;
 
   virtual float DefaultMinimumPageScaleFactor() const = 0;
   virtual float DefaultMaximumPageScaleFactor() const = 0;
   virtual float MinimumPageScaleFactor() const = 0;
@@ skipping 96 matching lines @@
       const = 0;
   virtual void ScheduleAnimationForWidget() = 0;
   virtual CompositorWorkerProxyClient* CreateCompositorWorkerProxyClient() = 0;
   virtual AnimationWorkletProxyClient* CreateAnimationWorkletProxyClient() = 0;
   virtual void SetRootGraphicsLayer(GraphicsLayer*) = 0;
   virtual void SetRootLayer(WebLayer*) = 0;
   virtual CompositorAnimationHost* AnimationHost() const = 0;
   virtual HitTestResult CoreHitTestResultAt(const WebPoint&) = 0;
 
   virtual class ChromeClient& ChromeClient() const = 0;
+
+  // These methods are consumed by test code only.
+  virtual BrowserControls& GetBrowserControls() = 0;

[sashab, 2017/05/03 04:05:22]

Make them private? And add the test as a friend class

[slangley, 2017/05/03 21:43:08]

In general for these changes my idea is:

a) Move the code to it's new home so we can decouple classes in web/.
b) Come back and refactor where it makes sense. I plan to do this as part of
cleaning up the Client code that exists mainly to allow calls from core -> web
that will become redundant with these changes. In general I am trying not to
introduce any logic changes (where possible) while shuffling the code.

+  virtual Element* FocusedElement() const = 0;
+  virtual void EnableFakePageScaleAnimationForTesting(bool) = 0;
+  virtual bool FakeDoubleTapAnimationPendingForTesting() const = 0;
+  virtual void AnimateDoubleTapZoom(const IntPoint&) = 0;
+  virtual WebRect ComputeBlockBound(const WebPoint&, bool ignore_clipping) = 0;
+  virtual void ComputeScaleAndScrollForBlockRect(
+      const WebPoint& hit_point,
+      const WebRect& block_rect,
+      float padding,
+      float default_scale_when_already_legible,
+      float& scale,
+      WebPoint& scroll) = 0;
+  virtual float FakePageScaleAnimationPageScaleForTesting() const = 0;
+  virtual bool FakePageScaleAnimationUseAnchorForTesting() const = 0;
+  virtual IntPoint FakePageScaleAnimationTargetPositionForTesting() const = 0;
+  virtual void ComputeScaleAndScrollForFocusedNode(
+      Node* focused_node,
+      bool zoom_in_to_legible_scale,
+      float& scale,
+      IntPoint& scroll,
+      bool& need_animation) = 0;
+  virtual bool HasHorizontalScrollbar() = 0;
+  virtual bool HasVerticalScrollbar() = 0;
+  virtual TransformationMatrix GetDeviceEmulationTransformForTesting()
+      const = 0;
+  virtual bool MatchesHeuristicsForGpuRasterizationForTesting() const = 0;
+  virtual Node* BestTapNode(
+      const GestureEventWithHitTestResults& targeted_tap_event) = 0;
+  virtual void EnableTapHighlightAtPoint(
+      const GestureEventWithHitTestResults& targeted_tap_event) = 0;
+  virtual LinkHighlightImpl* GetLinkHighlight(int) = 0;
+  virtual unsigned NumLinkHighlights() = 0;
+  virtual void EnableTapHighlights(HeapVector<Member<Node>>&) = 0;
+  PLATFORM_EXPORT static void SetCurrentInputEventForTest(const WebInputEvent*);

[haraken, 2017/05/04 05:30:42]

Ditto.

 };
 }
 
 #endif