Fix webkit_unit_tests to use the threaded parser and enable everywhere.

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 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * 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 "web/tests/FrameTestHelpers.h"
 
 #include "public/platform/Platform.h"
+#include "public/platform/WebData.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"
 #include "public/web/WebSettings.h"
 #include "public/web/WebViewClient.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/tests/URLTestHelpers.h"
 #include "wtf/StdLibExtras.h"
 
 namespace blink {
 namespace FrameTestHelpers {
 
 namespace {
 
+// The frame test helpers coordinate frame loads in a carefully choreographed
+// dance. Since the parser is threaded, simply spinning the run loop once is not
+// enough to ensure completion of a load. Instead, the following pattern is
+// used to ensure that tests see the final state:
+// 1. Post a task to trigger a load (LoadTask/LoadHTMLStringTask/ReloadTask).
+// 2. Enter the run loop.
+// 3. Posted task triggers the load, and starts pumping pending resource
+//    requests using ServeAsyncRequestsTask.
+// 4. TestWebFrameClient watches for didStartLoading/didStopLoading calls,
+//    keeping track of how many loads it thinks are in flight.
+// 5. While ServeAsyncRequestsTask observes TestWebFrameClient to still have
+//    loads in progress, it posts itself back to the run loop.
+// 6. When ServeAsyncRequestsTask notices there are no more loads in progress,
+//    it exits the run loop.
+// 7. At this point, all parsing, resource loads, and layout should be finished.
+TestWebFrameClient* testClientForFrame(WebFrame* frame)
+{
+    return static_cast<TestWebFrameClient*>(toWebLocalFrameImpl(frame)->client());
+}
+
 class QuitTask : public WebThread::Task {
 public:
     void PostThis(WebCore::Timer<QuitTask>*)
     {
         // We don't just quit here because the SharedTimer may be part-way
         // through the current queue of tasks when runPendingTasks was called,
         // and we can't miss the tasks that were behind it.
         // Takes ownership of |this|.
         Platform::current()->currentThread()->postTask(this);
     }
 
     virtual void run()
     {
         Platform::current()->currentThread()->exitRunLoop();
     }
 };
 
-WebFrameClient* defaultWebFrameClient()
+class ServeAsyncRequestsTask : public WebThread::Task {
+public:
+    explicit ServeAsyncRequestsTask(TestWebFrameClient* client) : m_client(client)

[abarth-chromium, 2014/05/09 03:00:53]

: m_client(client) goes on its own line.

[dcheng, 2014/05/09 06:00:00]

Done.

+    {
+    }
+
+    virtual void run() OVERRIDE
+    {
+        Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests();
+        if (m_client->isLoading())
+            Platform::current()->currentThread()->postTask(new ServeAsyncRequestsTask(m_client));
+        else
+            Platform::current()->currentThread()->exitRunLoop();
+    }
+
+private:
+    TestWebFrameClient* const m_client;
+};
+
+void pumpPendingRequests(WebFrame* frame)
+{
+    Platform::current()->currentThread()->postTask(new ServeAsyncRequestsTask(testClientForFrame(frame)));
+}
+
+class LoadTask : public WebThread::Task {
+public:
+    LoadTask(WebFrame* frame, const WebURLRequest& request)
+        : m_frame(frame)
+        , m_request(request)
+    {
+    }
+
+    virtual void run() OVERRIDE
+    {
+        m_frame->loadRequest(m_request);
+        pumpPendingRequests(m_frame);
+    }
+
+private:
+    WebFrame* const m_frame;
+    const WebURLRequest m_request;
+};
+
+class LoadHTMLStringTask : public WebThread::Task {
+public:
+    LoadHTMLStringTask(WebFrame* frame, const std::string& html, const WebURL& baseURL)
+        : m_frame(frame), m_html(html), m_baseURL(baseURL)
+    {
+    }
+
+    virtual void run() OVERRIDE
+    {
+        m_frame->loadHTMLString(WebData(m_html.data(), m_html.size()), m_baseURL);
+        pumpPendingRequests(m_frame);
+    }
+
+private:
+    WebFrame* const m_frame;
+    const std::string m_html;
+    const WebURL m_baseURL;
+};
+
+class ReloadTask : public WebThread::Task {
+public:
+    ReloadTask(WebFrame* frame, bool ignoreCache) : m_frame(frame), m_ignoreCache(ignoreCache)

[abarth-chromium, 2014/05/09 03:00:53]

This should be three lines.

[dcheng, 2014/05/09 06:00:00]

Done.

+    {
+    }
+
+    virtual void run() OVERRIDE
+    {
+        m_frame->reload(m_ignoreCache);
+        pumpPendingRequests(m_frame);
+    }
+
+private:
+    WebFrame* const m_frame;
+    const bool m_ignoreCache;
+};
+
+TestWebFrameClient* defaultWebFrameClient()
 {
     DEFINE_STATIC_LOCAL(TestWebFrameClient, client, ());
     return &client;
 }
 
 WebViewClient* defaultWebViewClient()
 {
     DEFINE_STATIC_LOCAL(TestWebViewClient,  client, ());
     return &client;
 }
 
 } // namespace
 
 void loadFrame(WebFrame* frame, const std::string& url)
 {
     WebURLRequest urlRequest;
     urlRequest.initialize();
     urlRequest.setURL(URLTestHelpers::toKURL(url));
-    frame->loadRequest(urlRequest);
+
+    Platform::current()->currentThread()->postTask(new LoadTask(frame, urlRequest));
+    Platform::current()->currentThread()->enterRunLoop();
 }
 
+void loadHTMLString(WebFrame* frame, const std::string& html, const WebURL& baseURL)
+{
+    Platform::current()->currentThread()->postTask(new LoadHTMLStringTask(frame, html, baseURL));
+    Platform::current()->currentThread()->enterRunLoop();
+}
+
+void reloadFrame(WebFrame* frame)
+{
+    Platform::current()->currentThread()->postTask(new ReloadTask(frame, false));
+    Platform::current()->currentThread()->enterRunLoop();
+}
+
+void reloadFrameIgnoringCache(WebFrame* frame)
+{
+    Platform::current()->currentThread()->postTask(new ReloadTask(frame, true));
+    Platform::current()->currentThread()->enterRunLoop();
+}
+
+void pumpPendingRequestsDoNotUse(WebFrame* frame)
+{
+    pumpPendingRequests(frame);
+}
+
+// FIXME: There's a duplicate implementation in UnitTestHelpers.cpp. Remove one.
 void runPendingTasks()
 {
     // Pending tasks include Timers that have been scheduled.
     WebCore::Timer<QuitTask> quitOnTimeout(new QuitTask, &QuitTask::PostThis);
     quitOnTimeout.startOneShot(0, FROM_HERE);
     Platform::current()->currentThread()->enterRunLoop();
 }
 
 WebViewHelper::WebViewHelper()
     : m_webView(0)
 {
 }
 
 WebViewHelper::~WebViewHelper()
 {
     reset();
 }
 
-WebViewImpl* WebViewHelper::initialize(bool enableJavascript, WebFrameClient* webFrameClient, WebViewClient* webViewClient, void (*updateSettingsFunc)(WebSettings*))
+WebViewImpl* WebViewHelper::initialize(bool enableJavascript, TestWebFrameClient* 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_webView->setMainFrame(WebLocalFrameImpl::create(webFrameClient));
 
     return m_webView;
 }
 
-WebViewImpl* WebViewHelper::initializeAndLoad(const std::string& url, bool enableJavascript, WebFrameClient* webFrameClient, WebViewClient* webViewClient, void (*updateSettingsFunc)(WebSettings*))
+WebViewImpl* WebViewHelper::initializeAndLoad(const std::string& url, bool enableJavascript, TestWebFrameClient* webFrameClient, WebViewClient* webViewClient, void (*updateSettingsFunc)(WebSettings*))
 {
     initialize(enableJavascript, webFrameClient, webViewClient, updateSettingsFunc);
 
     loadFrame(webView()->mainFrame(), url);
-    Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests();
 
     return webViewImpl();
 }
 
 void WebViewHelper::reset()
 {
     if (m_webView) {
+        ASSERT(!testClientForFrame(m_webView->mainFrame())->isLoading());
         m_webView->close();
         m_webView = 0;
     }
 }
 
+TestWebFrameClient::TestWebFrameClient() : m_loadsInProgress(0)
+{
+}
+
 WebFrame* TestWebFrameClient::createChildFrame(WebLocalFrame* parent, const WebString& frameName)
 {
     WebFrame* frame = WebLocalFrame::create(this);
     parent->appendChild(frame);
     return frame;
 }
 
 void TestWebFrameClient::frameDetached(WebFrame* frame)
 {
     if (frame->parent())
         frame->parent()->removeChild(frame);
     frame->close();
 }
 
+void TestWebFrameClient::didStartLoading(bool)
+{
+    ++m_loadsInProgress;
+}
+
+void TestWebFrameClient::didStopLoading()
+{
+    ASSERT(m_loadsInProgress > 0);
+    --m_loadsInProgress;
+}
+
 void TestWebViewClient::initializeLayerTreeView()
 {
     m_layerTreeView = adoptPtr(Platform::current()->unitTestSupport()->createLayerTreeViewForTesting(WebUnitTestSupport::TestViewTypeUnitTest));
     ASSERT(m_layerTreeView);
 }
 
 } // namespace FrameTestHelpers
 } // namespace blink