summaryrefslogtreecommitdiffstats
path: root/webkit/tools/test_shell/layout_test_controller.cc
diff options
context:
space:
mode:
authorfinnur@google.com <finnur@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-07 01:18:20 +0000
committerfinnur@google.com <finnur@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-07 01:18:20 +0000
commit0a836048108542bb8d10fe399b1ee08f6615501c (patch)
tree0180e5662cfb2ce56b9fb078deddb4b91f6778a7 /webkit/tools/test_shell/layout_test_controller.cc
parent645aaa5a8ef7a1a507e95da0e8794e0cabbf0811 (diff)
downloadchromium_src-0a836048108542bb8d10fe399b1ee08f6615501c.zip
chromium_src-0a836048108542bb8d10fe399b1ee08f6615501c.tar.gz
chromium_src-0a836048108542bb8d10fe399b1ee08f6615501c.tar.bz2
Reverting 9366.
Reverting due to failures in layout tests Review URL: http://codereview.chromium.org/21159 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9374 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/layout_test_controller.cc')
-rw-r--r--webkit/tools/test_shell/layout_test_controller.cc12
1 files changed, 2 insertions, 10 deletions
diff --git a/webkit/tools/test_shell/layout_test_controller.cc b/webkit/tools/test_shell/layout_test_controller.cc
index e861d37..47700e2 100644
--- a/webkit/tools/test_shell/layout_test_controller.cc
+++ b/webkit/tools/test_shell/layout_test_controller.cc
@@ -46,7 +46,6 @@ bool LayoutTestController::dump_resource_load_callbacks_ = false;
bool LayoutTestController::dump_back_forward_list_ = false;
bool LayoutTestController::dump_child_frame_scroll_positions_ = false;
bool LayoutTestController::dump_child_frames_as_text_ = false;
-bool LayoutTestController::dump_window_status_changes_ = false;
bool LayoutTestController::dump_title_changes_ = false;
bool LayoutTestController::accepts_editing_ = true;
bool LayoutTestController::wait_until_done_ = false;
@@ -59,7 +58,7 @@ CppVariant LayoutTestController::globalFlag_;
CppVariant LayoutTestController::webHistoryItemCount_;
LayoutTestController::LayoutTestController(TestShell* shell) {
- // Set static shell_ variable since we can't do it in an initializer list.
+ // Set static shell_ variable since we can't do it in an initializer list.
// We also need to be careful not to assign shell_ to new windows which are
// temporary.
if (NULL == shell_)
@@ -76,7 +75,6 @@ LayoutTestController::LayoutTestController(TestShell* shell) {
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);
@@ -186,7 +184,7 @@ void LayoutTestController::WorkQueue::AddWork(WorkItem* work) {
queue_.push(work);
}
-void LayoutTestController::dumpAsText(const CppArgumentList& args,
+void LayoutTestController::dumpAsText(const CppArgumentList& args,
CppVariant* result) {
dump_as_text_ = true;
result->SetNull();
@@ -228,12 +226,6 @@ void LayoutTestController::dumpChildFramesAsText(
result->SetNull();
}
-void LayoutTestController::dumpWindowStatusChanges(
- const CppArgumentList& args, CppVariant* result) {
- dump_window_status_changes_ = true;
- result->SetNull();
-}
-
void LayoutTestController::dumpTitleChanges(
const CppArgumentList& args, CppVariant* result) {
dump_title_changes_ = true;