The layoutTestController had its queueScript method broken into two:...

webkit/tools/test_shell/layout_test_controller.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file contains the definition for LayoutTestController.
 
 #include <vector>
 
 #include "webkit/tools/test_shell/layout_test_controller.h"
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebScriptSource.h"
 #include "webkit/glue/dom_operations.h"
 #include "webkit/glue/webframe.h"
 #include "webkit/glue/webpreferences.h"
 #include "webkit/glue/webview.h"
 #include "webkit/tools/test_shell/test_navigation_controller.h"
 #include "webkit/tools/test_shell/test_shell.h"
 
 using std::string;
 using std::wstring;
 
+using WebKit::WebScriptSource;
+using WebKit::WebString;
+
 #if defined(OS_WIN)
 namespace {
 
 // Stops the test from running and prints a brief warning to stdout.  Called
 // when the timer for loading a layout test expires.
 VOID CALLBACK TestTimeout(HWND hwnd, UINT msg, UINT_PTR timer_id, DWORD ms) {
   puts("#TEST_TIMED_OUT\n");
   reinterpret_cast<TestShell*>(timer_id)->TestFinished();
   // Print a warning to be caught by the layout-test script.
 }
@@ skipping 40 matching lines @@
   BindMethod("dumpEditingCallbacks", &LayoutTestController::dumpEditingCallbacks);
   BindMethod("dumpBackForwardList", &LayoutTestController::dumpBackForwardList);
   BindMethod("dumpFrameLoadCallbacks", &LayoutTestController::dumpFrameLoadCallbacks);
   BindMethod("dumpResourceLoadCallbacks", &LayoutTestController::dumpResourceLoadCallbacks);
   BindMethod("dumpStatusCallbacks", &LayoutTestController::dumpWindowStatusChanges);
   BindMethod("dumpTitleChanges", &LayoutTestController::dumpTitleChanges);
   BindMethod("setAcceptsEditing", &LayoutTestController::setAcceptsEditing);
   BindMethod("waitUntilDone", &LayoutTestController::waitUntilDone);
   BindMethod("notifyDone", &LayoutTestController::notifyDone);
   BindMethod("queueReload", &LayoutTestController::queueReload);
-  BindMethod("queueScript", &LayoutTestController::queueScript);
+  BindMethod("queueLoadingScript", &LayoutTestController::queueLoadingScript);
+  BindMethod("queueNonLoadingScript", &LayoutTestController::queueNonLoadingScript);
   BindMethod("queueLoad", &LayoutTestController::queueLoad);
   BindMethod("queueBackNavigation", &LayoutTestController::queueBackNavigation);
   BindMethod("queueForwardNavigation", &LayoutTestController::queueForwardNavigation);
   BindMethod("windowCount", &LayoutTestController::windowCount);
   BindMethod("setCanOpenWindows", &LayoutTestController::setCanOpenWindows);
   BindMethod("setCloseRemainingWindowsWhenComplete", &LayoutTestController::setCloseRemainingWindowsWhenComplete);
   BindMethod("objCIdentityIsEqual", &LayoutTestController::objCIdentityIsEqual);
   BindMethod("setWindowIsKey", &LayoutTestController::setWindowIsKey);
   BindMethod("setTabKeyCyclesThroughElements", &LayoutTestController::setTabKeyCyclesThroughElements);
   BindMethod("setUserStyleSheetLocation", &LayoutTestController::setUserStyleSheetLocation);
@@ skipping 56 matching lines @@
   if (!queue_.empty()) {
     // We delay processing queued work to avoid recursion problems.
     timer_.Start(base::TimeDelta(), this, &WorkQueue::ProcessWork);
   } else if (!wait_until_done_) {
     shell_->TestFinished();
   }
 }
 
 void LayoutTestController::WorkQueue::ProcessWork() {
   // Quit doing work once a load is in progress.
-  while (!queue_.empty() && !shell_->delegate()->top_loading_frame()) {
-    queue_.front()->Run(shell_);
+  while (!queue_.empty()) {
+    bool started_load = queue_.front()->Run(shell_);
     delete queue_.front();
     queue_.pop();
+
+    if (started_load)
+      return;
   }
 
-  if (!shell_->delegate()->top_loading_frame() && !wait_until_done_) {
+  if (!wait_until_done_)
     shell_->TestFinished();
-  }
 }
 
 void LayoutTestController::WorkQueue::Reset() {
   frozen_ = false;
   while (!queue_.empty()) {
     delete queue_.front();
     queue_.pop();
   }
 }
 
@@ skipping 90 matching lines @@
       !shell_->delegate()->top_loading_frame() && work_queue_.empty()) {
     shell_->TestFinished();
   }
   wait_until_done_ = false;
   result->SetNull();
 }
 
 class WorkItemBackForward : public LayoutTestController::WorkItem {
  public:
   WorkItemBackForward(int distance) : distance_(distance) {}
-  void Run(TestShell* shell) {
+  bool Run(TestShell* shell) {
     shell->GoBackOrForward(distance_);
+    return true;  // TODO(darin): Did it really start a navigation?
   }
  private:
   int distance_;
 };
 
 void LayoutTestController::queueBackNavigation(
     const CppArgumentList& args, CppVariant* result) {
   if (args.size() > 0 && args[0].isNumber())
     work_queue_.AddWork(new WorkItemBackForward(-args[0].ToInt32()));
   result->SetNull();
 }
 
 void LayoutTestController::queueForwardNavigation(
     const CppArgumentList& args, CppVariant* result) {
   if (args.size() > 0 && args[0].isNumber())
     work_queue_.AddWork(new WorkItemBackForward(args[0].ToInt32()));
   result->SetNull();
 }
 
 class WorkItemReload : public LayoutTestController::WorkItem {
  public:
-  void Run(TestShell* shell) {
+  bool Run(TestShell* shell) {
     shell->Reload();
+    return true;
   }
 };
 
 void LayoutTestController::queueReload(
     const CppArgumentList& args, CppVariant* result) {
   work_queue_.AddWork(new WorkItemReload);
   result->SetNull();
 }
 
-class WorkItemScript : public LayoutTestController::WorkItem {
+class WorkItemLoadingScript : public LayoutTestController::WorkItem {
  public:
-  WorkItemScript(const string& script) : script_(script) {}
-  void Run(TestShell* shell) {
-    wstring url = L"javascript:" + UTF8ToWide(script_);
-    shell->LoadURL(url.c_str());
+  WorkItemLoadingScript(const string& script) : script_(script) {}
+  bool Run(TestShell* shell) {
+    shell->webView()->GetMainFrame()->ExecuteScript(
+        WebScriptSource(WebString::fromUTF8(script_)));
+    return true;  // TODO(darin): Did it really start a navigation?
   }
  private:
   string script_;
 };
 
-void LayoutTestController::queueScript(
+class WorkItemNonLoadingScript : public LayoutTestController::WorkItem {
+ public:
+  WorkItemNonLoadingScript(const string& script) : script_(script) {}
+  bool Run(TestShell* shell) {
+    shell->webView()->GetMainFrame()->ExecuteScript(
+        WebScriptSource(WebString::fromUTF8(script_)));
+    return false;
+  }
+ private:
+  string script_;
+};
+
+void LayoutTestController::queueLoadingScript(
     const CppArgumentList& args, CppVariant* result) {
   if (args.size() > 0 && args[0].isString())
-    work_queue_.AddWork(new WorkItemScript(args[0].ToString()));
+    work_queue_.AddWork(new WorkItemLoadingScript(args[0].ToString()));
+  result->SetNull();
+}
+
+void LayoutTestController::queueNonLoadingScript(
+    const CppArgumentList& args, CppVariant* result) {
+  if (args.size() > 0 && args[0].isString())
+    work_queue_.AddWork(new WorkItemNonLoadingScript(args[0].ToString()));
   result->SetNull();
 }
 
 class WorkItemLoad : public LayoutTestController::WorkItem {
  public:
   WorkItemLoad(const GURL& url, const string& target)
       : url_(url), target_(target) {}
-  void Run(TestShell* shell) {
+  bool Run(TestShell* shell) {
     shell->LoadURLForFrame(UTF8ToWide(url_.spec()).c_str(),
                            UTF8ToWide(target_).c_str());
+    return true;  // TODO(darin): Did it really start a navigation?
   }
  private:
   GURL url_;
   string target_;
 };
 
 void LayoutTestController::queueLoad(
     const CppArgumentList& args, CppVariant* result) {
   if (args.size() > 0 && args[0].isString()) {
     GURL current_url = shell_->webView()->GetMainFrame()->GetURL();
@@ skipping 364 matching lines @@
 void LayoutTestController::fallbackMethod(
     const CppArgumentList& args, CppVariant* result) {
   std::wstring message(L"JavaScript ERROR: unknown method called on LayoutTestController");
   if (!shell_->layout_test_mode()) {
     logging::LogMessage("CONSOLE:", 0).stream() << message;
   } else {
     printf("CONSOLE MESSAGE: %S\n", message.c_str());
   }
   result->SetNull();
 }