From 63e78057b6ae2685ed3525d832fed48b7c85ee1e Mon Sep 17 00:00:00 2001
From: "tc@google.com" <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 2 Dec 2008 18:44:43 +0000
Subject: Add setStopProvisionalFrameLoads to the test shell layout test
 controller.

This fixes a layout test.

BUG=http://crbug.com/2980

Review URL: http://codereview.chromium.org/13038

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6224 0039d316-1c4b-4281-b951-d872f2087c98
---
 webkit/tools/test_shell/layout_test_controller.cc | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'webkit/tools/test_shell/layout_test_controller.cc')

diff --git a/webkit/tools/test_shell/layout_test_controller.cc b/webkit/tools/test_shell/layout_test_controller.cc
index 4aa5dcf..70efb9a 100644
--- a/webkit/tools/test_shell/layout_test_controller.cc
+++ b/webkit/tools/test_shell/layout_test_controller.cc
@@ -50,6 +50,7 @@ bool LayoutTestController::wait_until_done_ = false;
 bool LayoutTestController::can_open_windows_ = false;
 bool LayoutTestController::close_remaining_windows_ = true;
 bool LayoutTestController::should_add_file_to_pasteboard_ = false;
+bool LayoutTestController::stop_provisional_frame_loads_ = false;
 LayoutTestController::WorkQueue LayoutTestController::work_queue_;
 CppVariant LayoutTestController::globalFlag_;
 
@@ -92,6 +93,7 @@ LayoutTestController::LayoutTestController(TestShell* shell) {
   BindMethod("addFileToPasteboardOnDrag", &LayoutTestController::addFileToPasteboardOnDrag);
   BindMethod("execCommand", &LayoutTestController::execCommand);
   BindMethod("setPopupBlockingEnabled", &LayoutTestController::setPopupBlockingEnabled);
+  BindMethod("setStopProvisionalFrameLoads", &LayoutTestController::setStopProvisionalFrameLoads);
 
   // The following are stubs.
   BindMethod("dumpAsWebArchive", &LayoutTestController::dumpAsWebArchive);
@@ -362,6 +364,7 @@ void LayoutTestController::Reset() {
   wait_until_done_ = false;
   can_open_windows_ = false;
   should_add_file_to_pasteboard_ = false;
+  stop_provisional_frame_loads_ = false;
   globalFlag_.Set(false);
 
   if (close_remaining_windows_) {
@@ -525,6 +528,12 @@ void LayoutTestController::addFileToPasteboardOnDrag(
   should_add_file_to_pasteboard_ = true;
 }
 
+void LayoutTestController::setStopProvisionalFrameLoads(
+    const CppArgumentList& args, CppVariant* result) {
+  result->SetNull();
+  stop_provisional_frame_loads_ = true;
+}
+
 //
 // Unimplemented stubs
 //
-- 
cgit v1.1