Make the embedder responsible for creating the WebFrame

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 15 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "FrameTestHelpers.h"
 
 #include "URLTestHelpers.h"
 #include "wtf/StdLibExtras.h"
-#include "WebFrame.h"
 #include "WebFrameClient.h"
+#include "WebFrameImpl.h"
 #include "WebSettings.h"
-#include "WebView.h"
 #include "WebViewClient.h"
+#include "WebViewImpl.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebString.h"
 #include "public/platform/WebThread.h"
 #include "public/platform/WebURLRequest.h"
 #include "public/platform/WebURLResponse.h"
 #include "public/platform/WebUnitTestSupport.h"
 
 namespace WebKit {
 namespace FrameTestHelpers {
 
+namespace {
+
+class QuitTask : public WebThread::Task {
+public:
+    virtual void run()
+    {
+        Platform::current()->currentThread()->exitRunLoop();
+    }
+};
+
+class TestWebFrameClient : public WebFrameClient {
+};
+
+WebFrameClient* defaultWebFrameClient()
+{
+    DEFINE_STATIC_LOCAL(TestWebFrameClient, client, ());
+    return &client;
+}
+
+class WebViewHelperClient : public WebViewClient {
+};
+
+WebViewClient* defaultWebViewClient()
+{
+    DEFINE_STATIC_LOCAL(WebViewHelperClient,  client, ());
+    return &client;
+}
+
+} // namespace
+
 void loadFrame(WebFrame* frame, const std::string& url)
 {
     WebURLRequest urlRequest;
     urlRequest.initialize();
     urlRequest.setURL(URLTestHelpers::toKURL(url));
     frame->loadRequest(urlRequest);
 }
 
-class TestWebFrameClient : public WebFrameClient {
-};
-
-static WebFrameClient* defaultWebFrameClient()
-{
-    DEFINE_STATIC_LOCAL(TestWebFrameClient, client, ());
-    return &client;
-}
-
-class TestWebViewClient : public WebViewClient {
-};
-
-static WebViewClient* defaultWebViewClient()
-{
-    DEFINE_STATIC_LOCAL(TestWebViewClient,  client, ());
-    return &client;
-}
-
-WebView* createWebView(bool enableJavascript, WebFrameClient* webFrameClient, WebViewClient* webViewClient)
-{
-    if (!webFrameClient)
-        webFrameClient = defaultWebFrameClient();
-    if (!webViewClient)
-        webViewClient = defaultWebViewClient();
-    WebView* webView = WebView::create(webViewClient);
-    webView->settings()->setJavaScriptEnabled(enableJavascript);
-    webView->settings()->setDeviceSupportsMouse(false);
-    webView->settings()->setForceCompositingMode(true);
-    webView->initializeMainFrame(webFrameClient);
-
-    return webView;
-}
-
-WebView* createWebViewAndLoad(const std::string& url, bool enableJavascript, WebFrameClient* webFrameClient, WebViewClient* webViewClient)
-{
-    WebView* webView = createWebView(enableJavascript, webFrameClient, webViewClient);
-
-    loadFrame(webView->mainFrame(), url);
-    Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests();
-
-    return webView;
-}
-
-class QuitTask : public WebThread::Task {
-public:
-    virtual void run()
-    {
-        Platform::current()->currentThread()->exitRunLoop();
-    }
-};
-
 void runPendingTasks()
 {
     Platform::current()->currentThread()->postTask(new QuitTask);
     Platform::current()->currentThread()->enterRunLoop();
 }
 
+WebViewHelper::WebViewHelper()
+    : m_mainFrame(0)
+    , m_webView(0)
+{
+}
+
+WebViewHelper::~WebViewHelper()
+{
+    reset();
+}
+
+WebViewImpl* WebViewHelper::initialize(bool enableJavascript, WebFrameClient* webFrameClient, WebViewClient* webViewClient, void (*updateSettingsFunc)(WebSettings*))
+{
+    reset();
+
+    if (!webFrameClient)
+        webFrameClient = defaultWebFrameClient();
+    if (!webViewClient)
+        webViewClient = defaultWebViewClient();
+    m_webView = WebViewImpl::create(webViewClient);
+    m_webView->settings()->setJavaScriptEnabled(enableJavascript);
+    if (updateSettingsFunc) {
+        updateSettingsFunc(m_webView->settings());
+    } else {
+        m_webView->settings()->setDeviceSupportsMouse(false);
+        m_webView->settings()->setForceCompositingMode(true);
+    }
+
+    m_mainFrame = WebFrameImpl::create(webFrameClient);
+    m_webView->setMainFrame(m_mainFrame);
+
+    return m_webView;
+}
+
+WebViewImpl* WebViewHelper::initializeAndLoad(const std::string& url, bool enableJavascript, WebFrameClient* webFrameClient, WebViewClient* webViewClient, void (*updateSettingsFunc)(WebSettings*))
+{
+    reset();

[nasko, 2013/09/19 22:54:12]

Unneeded reset? The subsequent call to initialize will reset it as the first
order of business.

[awong, 2013/09/20 00:36:24]

Done.

+
+    initialize(enableJavascript, webFrameClient, webViewClient, updateSettingsFunc);
+
+    loadFrame(webView()->mainFrame(), url);
+    Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests();
+
+    return webViewImpl();
+}
+
+void WebViewHelper::reset()
+{
+    if (m_webView) {
+        m_webView->close();
+        m_webView = 0;
+    }
+    if (m_mainFrame) {

[nasko, 2013/09/19 22:54:12]

Shouldn't you close the main frame before destroying the WebView?

[awong, 2013/09/20 00:36:24]

Nope...the webview expects the mainframe to be alive until it singles its own
destruction.

+        m_mainFrame->close();
+        m_mainFrame = 0;
+    }
+}
+
 } // namespace FrameTestHelpers
 } // namespace WebKit