Always use the WebFrameWidget when attaching the root graphics

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

 /*
  * 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 74 matching lines @@
     else
         testing::exitRunLoop();
 }
 
 TestWebFrameClient* defaultWebFrameClient()
 {
     DEFINE_STATIC_LOCAL(TestWebFrameClient, client, ());
     return &client;
 }
 
+TestWebWidgetClient* defaultWebWidgetClient()
+{
+    DEFINE_STATIC_LOCAL(TestWebWidgetClient, client, ());
+    return &client;
+}
+
 TestWebViewClient* defaultWebViewClient()
 {
     DEFINE_STATIC_LOCAL(TestWebViewClient,  client, ());
     return &client;
 }
 
 // |uniqueName| is normally calculated in a somewhat complicated way by the
 // FrameTree class, but for test purposes the approximation below should be
 // close enough.
 String nameToUniqueName(const String& name)
@@ skipping 53 matching lines @@
     WebMouseEvent result;
     result.type = type;
     result.x = result.windowX = result.globalX = point.x();
     result.y = result.windowX = result.globalX = point.y();
     result.modifiers = modifiers;
     result.button = button;
     result.clickCount = 1;
     return result;
 }
 
-WebLocalFrame* createLocalChild(WebRemoteFrame* parent, const WebString& name, WebFrameClient* client, WebFrame* previousSibling, const WebFrameOwnerProperties& properties)
+WebLocalFrame* createLocalChild(WebRemoteFrame* parent, const WebString& name, WebFrameClient* client, WebWidgetClient* widgetClient, WebFrame* previousSibling, const WebFrameOwnerProperties& properties)
 {
     if (!client)
         client = defaultWebFrameClient();
 
-    return parent->createLocalChild(WebTreeScopeType::Document, name, nameToUniqueName(name), WebSandboxFlags::None, client, previousSibling, properties, nullptr);
+    WebLocalFrame* frame = parent->createLocalChild(WebTreeScopeType::Document, name, nameToUniqueName(name), WebSandboxFlags::None, client, previousSibling, properties, nullptr);
+
+    if (!widgetClient)
+        widgetClient = defaultWebWidgetClient();
+    WebFrameWidget::create(widgetClient, frame);
+
+    return frame;
 }
 
 WebRemoteFrame* createRemoteChild(WebRemoteFrame* parent, WebRemoteFrameClient* client, const WebString& name)
 {
     return parent->createRemoteChild(WebTreeScopeType::Document, name, nameToUniqueName(name), WebSandboxFlags::None, client, nullptr);
 }
 
 WebViewHelper::WebViewHelper(SettingOverrider* settingOverrider)
     : m_webView(nullptr)
-    , m_webViewWidget(nullptr)
     , m_settingOverrider(settingOverrider)
 {
 }
 
 WebViewHelper::~WebViewHelper()
 {
     reset();
 }
 
 WebViewImpl* WebViewHelper::initializeWithOpener(WebFrame* opener, bool enableJavascript, TestWebFrameClient* webFrameClient, TestWebViewClient* webViewClient, TestWebWidgetClient* webWidgetClient, void (*updateSettingsFunc)(WebSettings*))
@@ skipping 20 matching lines @@
     else
         m_webView->settings()->setDeviceSupportsMouse(false);
     if (m_settingOverrider)
         m_settingOverrider->overrideSettings(m_webView->settings());
     m_webView->setDeviceScaleFactor(webViewClient->screenInfo().deviceScaleFactor);
     m_webView->setDefaultPageScaleLimits(1, 4);
     WebLocalFrame* frame = WebLocalFrameImpl::create(WebTreeScopeType::Document, webFrameClient, opener);
     m_webView->setMainFrame(frame);
     // TODO(dcheng): The main frame widget currently has a special case.
     // Eliminate this once WebView is no longer a WebWidget.
-    m_webViewWidget = blink::WebFrameWidget::create(webWidgetClient, m_webView, frame);
+    blink::WebFrameWidget::create(webWidgetClient, m_webView, frame);
 
     m_testWebViewClient = webViewClient;
 
     return m_webView;
 }
 
 WebViewImpl* WebViewHelper::initialize(bool enableJavascript, TestWebFrameClient* webFrameClient, TestWebViewClient* webViewClient, TestWebWidgetClient* webWidgetClient, void (*updateSettingsFunc)(WebSettings*))
 {
     return initializeWithOpener(nullptr, enableJavascript, webFrameClient, webViewClient, webWidgetClient, updateSettingsFunc);
 }
 
 WebViewImpl* WebViewHelper::initializeAndLoad(const std::string& url, bool enableJavascript, TestWebFrameClient* webFrameClient, TestWebViewClient* webViewClient, TestWebWidgetClient* webWidgetClient, void (*updateSettingsFunc)(WebSettings*))
 {
     initialize(enableJavascript, webFrameClient, webViewClient, webWidgetClient, updateSettingsFunc);
 
     loadFrame(webView()->mainFrame(), url);
 
     return webViewImpl();
 }
 
 void WebViewHelper::reset()
 {
-    if (m_webViewWidget) {
-        m_webViewWidget->close();
-        m_webViewWidget = nullptr;
-    }
     if (m_webView) {
         DCHECK(m_webView->mainFrame()->isWebRemoteFrame() || !testClientForFrame(m_webView->mainFrame())->isLoading());
         m_webView->willCloseLayerTreeView();
         m_webView->close();
         m_webView = nullptr;
     }
 }
 
 void WebViewHelper::resize(WebSize size)
 {
     m_testWebViewClient->clearAnimationScheduled();
     webViewImpl()->resize(size);
     EXPECT_FALSE(m_testWebViewClient->animationScheduled());
     m_testWebViewClient->clearAnimationScheduled();
 }
 
 TestWebFrameClient::TestWebFrameClient()
 {
 }
 
 WebFrame* TestWebFrameClient::createChildFrame(WebLocalFrame* parent, WebTreeScopeType scope, const WebString& name, const WebString& uniqueName, WebSandboxFlags sandboxFlags, const WebFrameOwnerProperties& frameOwnerProperties)
 {
     WebFrame* frame = WebLocalFrame::create(scope, this);
     parent->appendChild(frame);
     return frame;
 }
 
-void TestWebFrameClient::frameDetached(WebFrame* frame, DetachType type)
+void TestWebFrameClient::frameDetached(WebLocalFrame* frame, DetachType type)
 {
     if (type == DetachType::Remove && frame->parent())
         frame->parent()->removeChild(frame);
+
+    if (frame->frameWidget())
+        frame->frameWidget()->close();
+
     frame->close();
 }
 
 void TestWebFrameClient::didStartLoading(bool)
 {
     ++m_loadsInProgress;
 }
 
 void TestWebFrameClient::didStopLoading()
 {
@@ skipping 11 matching lines @@
     if (type == DetachType::Remove && m_frame->parent())
         m_frame->parent()->removeChild(m_frame);
     m_frame->close();
 }
 
 void TestWebViewClient::initializeLayerTreeView()
 {
     m_layerTreeView = wrapUnique(new WebLayerTreeViewImplForTesting);
 }
 
+void TestWebViewWidgetClient::initializeLayerTreeView()
+{
+    m_testWebViewClient->initializeLayerTreeView();
+}
+
+WebLayerTreeView* TestWebViewWidgetClient::layerTreeView()
+{
+    return m_testWebViewClient->layerTreeView();
+}
+
+void TestWebViewWidgetClient::scheduleAnimation()
+{
+    m_testWebViewClient->scheduleAnimation();
+}
+
 } // namespace FrameTestHelpers
 } // namespace blink