Always use the WebFrameWidget when attaching the root graphics

third_party/WebKit/Source/web/tests/FrameTestHelpers.h

 /*
  * Copyright (C) 2011 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 41 matching lines @@
 class WebFrame;
 class WebFrameWidget;
 class WebLocalFrame;
 class WebRemoteFrame;
 class WebRemoteFrameImpl;
 enum class WebCachePolicy;
 
 namespace FrameTestHelpers {
 
 class TestWebFrameClient;
-using TestWebWidgetClient = WebWidgetClient;
+class TestWebWidgetClient;
+class TestWebViewClient;
 
 // Loads a url into the specified WebFrame for testing purposes. Pumps any
 // pending resource requests, as well as waiting for the threaded parser to
 // finish, before returning.
 void loadFrame(WebFrame*, const std::string& url);
 // Same as above, but for WebFrame::loadHTMLString().
 void loadHTMLString(WebFrame*, const std::string& html, const WebURL& baseURL);
 // Same as above, but for WebFrame::loadHistoryItem().
 void loadHistoryItem(WebFrame*, const WebHistoryItem&, WebHistoryLoadType, WebCachePolicy);
 // Same as above, but for WebFrame::reload().
 void reloadFrame(WebFrame*);
 void reloadFrameIgnoringCache(WebFrame*);
 
 // Pumps pending resource requests while waiting for a frame to load. Consider
 // using one of the above helper methods whenever possible.
 void pumpPendingRequestsForFrameToLoad(WebFrame*);
 
 WebMouseEvent createMouseEvent(WebInputEvent::Type, WebMouseEvent::Button, const IntPoint&, int modifiers);
 
 // Calls WebRemoteFrame::createLocalChild, but with some arguments prefilled
 // with default test values (i.e. with a default |client| or |properties| and/or
 // with a precalculated |uniqueName|).
-WebLocalFrame* createLocalChild(WebRemoteFrame* parent, const WebString& name = WebString(), WebFrameClient* = nullptr, WebFrame* previousSibling = nullptr, const WebFrameOwnerProperties& = WebFrameOwnerProperties());
+WebLocalFrame* createLocalChild(WebRemoteFrame* parent, const WebString& name = WebString(), WebFrameClient* = nullptr, WebWidgetClient* = nullptr, WebFrame* previousSibling = nullptr, const WebFrameOwnerProperties& = WebFrameOwnerProperties());
 WebRemoteFrame* createRemoteChild(WebRemoteFrame* parent, WebRemoteFrameClient*, const WebString& name = WebString());
 
 class SettingOverrider {
 public:
     virtual void overrideSettings(WebSettings*) = 0;
 };
 
 // Forces to use mocked overlay scrollbars instead of the default native theme scrollbars to avoid
 // crash in Chromium code when it tries to load UI resources that are not available when running
 // blink unit tests, and to ensure consistent layout regardless of differences between scrollbar themes.
@@ skipping 14 matching lines @@
     {
         Settings::setMockScrollbarsEnabled(m_originalMockScrollbarEnabled);
         RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(m_originalOverlayScrollbarsEnabled);
     }
 
 private:
     bool m_originalMockScrollbarEnabled;
     bool m_originalOverlayScrollbarsEnabled;
 };
 
+class TestWebWidgetClient : public WebWidgetClient {
+public:
+    virtual ~TestWebWidgetClient() {}
+    bool allowsBrokenNullLayerTreeView() const override { return true; }
+};
+
+class TestWebViewWidgetClient : public TestWebWidgetClient {
+public:
+    explicit TestWebViewWidgetClient(TestWebViewClient* testWebViewClient)
+        : m_testWebViewClient(testWebViewClient)
+    {
+    }
+    virtual ~TestWebViewWidgetClient() {}
+
+    void initializeLayerTreeView() override;
+    WebLayerTreeView* layerTreeView() override;
+    void scheduleAnimation() override;
+
+private:
+    TestWebViewClient* m_testWebViewClient;
+};
+
 class TestWebViewClient : public WebViewClient {
 public:
-    TestWebViewClient() : m_animationScheduled(false) { }
+    TestWebViewClient()
+        : m_testWebWidgetClient(this)
+        , m_animationScheduled(false)
+    {
+    }
     virtual ~TestWebViewClient() { }
     void initializeLayerTreeView() override;
     WebLayerTreeView* layerTreeView() override { return m_layerTreeView.get(); }
 
     void scheduleAnimation() override { m_animationScheduled = true; }
     bool animationScheduled() { return m_animationScheduled; }
     void clearAnimationScheduled() { m_animationScheduled = false; }
 
     // TODO(lfg): This is a temporary method to retrieve the WebWidgetClient,
     // while we refactor WebView to not inherit from Webwidget.
     // Returns the WebWidgetClient.
-    WebWidgetClient* widgetClient() { return this; }
+    TestWebWidgetClient* widgetClient() { return &m_testWebWidgetClient; }
 
 private:
+    TestWebViewWidgetClient m_testWebWidgetClient;
     std::unique_ptr<WebLayerTreeView> m_layerTreeView;
     bool m_animationScheduled;
 };
 
 // Convenience class for handling the lifetime of a WebView and its associated mainframe in tests.
 class WebViewHelper {
     WTF_MAKE_NONCOPYABLE(WebViewHelper);
 public:
     WebViewHelper(SettingOverrider* = 0);
     ~WebViewHelper();
@@ skipping 12 matching lines @@
 
     void resize(WebSize);
 
     void reset();
 
     WebView* webView() const { return m_webView; }
     WebViewImpl* webViewImpl() const { return m_webView; }
 
 private:
     WebViewImpl* m_webView;
-    WebFrameWidget* m_webViewWidget;
     SettingOverrider* m_settingOverrider;
     UseMockScrollbarSettings m_mockScrollbarSettings;
     TestWebViewClient* m_testWebViewClient;
 };
 
 // Minimal implementation of WebFrameClient needed for unit tests that load frames. Tests that load
 // frames and need further specialization of WebFrameClient behavior should subclass this.
 class TestWebFrameClient : public WebFrameClient {
 public:
     TestWebFrameClient();
 
     WebFrame* createChildFrame(WebLocalFrame* parent, WebTreeScopeType, const WebString& name, const WebString& uniqueName, WebSandboxFlags, const WebFrameOwnerProperties&) override;
-    void frameDetached(WebFrame*, DetachType) override;
+    void frameDetached(WebLocalFrame*, DetachType) override;
     void didStartLoading(bool) override;
     void didStopLoading() override;
 
     bool isLoading() { return m_loadsInProgress > 0; }
 
 private:
     int m_loadsInProgress = 0;
 };
 
 // Minimal implementation of WebRemoteFrameClient needed for unit tests that load remote frames. Tests that load
@@ skipping 13 matching lines @@
         WebDOMMessageEvent) override { }
 
 private:
     Persistent<WebRemoteFrameImpl> const m_frame;
 };
 
 } // namespace FrameTestHelpers
 } // namespace blink
 
 #endif // FrameTestHelpers_h