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().
@@ skipping 37 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:
+    TestWebViewWidgetClient(TestWebViewClient* testWebViewClient)

[dcheng, 2016/06/08 00:10:17]

Nit: explicit

[lfg, 2016/06/08 21:09:47]

Done.

+        : 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;
     OwnPtr<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 59 matching lines @@
         WebDOMMessageEvent) override { }
 
 private:
     Persistent<WebRemoteFrameImpl> const m_frame;
 };
 
 } // namespace FrameTestHelpers
 } // namespace blink
 
 #endif // FrameTestHelpers_h