Actually process the work queue if layoutTestController.waitUntilDone() is...

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"
 
@@ skipping 116 matching lines @@
   BindMethod("keepWebHistory", &LayoutTestController::keepWebHistory);
   BindMethod("storeWebScriptObject", &LayoutTestController::storeWebScriptObject);
   BindMethod("accessStoredWebScriptObject", &LayoutTestController::accessStoredWebScriptObject);
   BindMethod("objCClassNameOf", &LayoutTestController::objCClassNameOf);
   BindMethod("addDisallowedURL", &LayoutTestController::addDisallowedURL);
   BindMethod("setCallCloseOnWebViews", &LayoutTestController::setCallCloseOnWebViews);
   BindMethod("setPrivateBrowsingEnabled", &LayoutTestController::setPrivateBrowsingEnabled);
   BindMethod("setUseDashboardCompatibilityMode", &LayoutTestController::setUseDashboardCompatibilityMode);
 
   BindMethod("setXSSAuditorEnabled", &LayoutTestController::setXSSAuditorEnabled);
-  BindMethod("queueScriptInIsolatedWorld", &LayoutTestController::queueScriptInIsolatedWorld);
+  BindMethod("evaluateScriptInIsolatedWorld", &LayoutTestController::evaluateScriptInIsolatedWorld);
 
   // The fallback method is called when an unknown method is invoked.
   BindFallbackMethod(&LayoutTestController::fallbackMethod);
 
   // Shared properties.
   // globalFlag is used by a number of layout tests in
   // LayoutTests\http\tests\security\dataURL.
   BindProperty("globalFlag", &globalFlag_);
   // webHistoryItemCount is used by tests in LayoutTests\http\tests\history
   BindProperty("webHistoryItemCount", &webHistoryItemCount_);
@@ skipping 191 matching lines @@
   WorkItemNonLoadingScript(const string& script) : script_(script) {}
   bool Run(TestShell* shell) {
     shell->webView()->GetMainFrame()->ExecuteScript(
         WebScriptSource(WebString::fromUTF8(script_)));
     return false;
   }
  private:
   string script_;
 };
 
-class WorkItemIsolatedWorldScript : public LayoutTestController::WorkItem {
- public:
-  WorkItemIsolatedWorldScript(const string& script) : script_(script) {}
-  bool Run(TestShell* shell) {
-    WebScriptSource source(WebString::fromUTF8(script_));
-    shell->webView()->GetMainFrame()->ExecuteScriptInNewWorld(&source, 1);
-    return false;
-  }
- private:
-  string script_;
-};
-
 void LayoutTestController::queueLoadingScript(
     const CppArgumentList& args, CppVariant* result) {
   if (args.size() > 0 && args[0].isString())
     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())
@@ skipping 406 matching lines @@
 void LayoutTestController::setXSSAuditorEnabled(
     const CppArgumentList& args, CppVariant* result) {
   if (args.size() > 0 && args[0].isBool()) {
     WebPreferences* preferences = shell_->GetWebPreferences();
     preferences->xss_auditor_enabled = args[0].value.boolValue;
     shell_->webView()->SetPreferences(*preferences);
   }
   result->SetNull();
 }
 
-void LayoutTestController::queueScriptInIsolatedWorld(
+void LayoutTestController::evaluateScriptInIsolatedWorld(
     const CppArgumentList& args, CppVariant* result) {
-  if (args.size() > 0 && args[0].isString())
-    work_queue_.AddWork(new WorkItemIsolatedWorldScript(args[0].ToString()));
+  if (args.size() > 0 && args[0].isString()) {
+    WebScriptSource source(WebString::fromUTF8(args[0].ToString()));
+    shell_->webView()->GetMainFrame()->ExecuteScriptInNewWorld(&source, 1);
+  }
   result->SetNull();
 }
 
 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();
 }