OLD | NEW |
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 // This file contains the definition for LayoutTestController. | 5 // This file contains the definition for LayoutTestController. |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "webkit/tools/test_shell/layout_test_controller.h" | 9 #include "webkit/tools/test_shell/layout_test_controller.h" |
10 | 10 |
11 #include "base/basictypes.h" | 11 #include "base/basictypes.h" |
(...skipping 406 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
418 if (args.size() < 2) { | 418 if (args.size() < 2) { |
419 // This is the best we can do to return an error. | 419 // This is the best we can do to return an error. |
420 result->SetNull(); | 420 result->SetNull(); |
421 return; | 421 return; |
422 } | 422 } |
423 result->Set(args[0].isEqual(args[1])); | 423 result->Set(args[0].isEqual(args[1])); |
424 } | 424 } |
425 | 425 |
426 void LayoutTestController::Reset() { | 426 void LayoutTestController::Reset() { |
427 if (shell_) { | 427 if (shell_) { |
428 shell_->webView()->zoomDefault(); | 428 shell_->webView()->setZoomLevel(false, 0); |
429 shell_->webView()->setTabKeyCyclesThroughElements(true); | 429 shell_->webView()->setTabKeyCyclesThroughElements(true); |
430 } | 430 } |
431 dump_as_text_ = false; | 431 dump_as_text_ = false; |
432 dump_editing_callbacks_ = false; | 432 dump_editing_callbacks_ = false; |
433 dump_frame_load_callbacks_ = false; | 433 dump_frame_load_callbacks_ = false; |
434 dump_resource_load_callbacks_ = false; | 434 dump_resource_load_callbacks_ = false; |
435 dump_back_forward_list_ = false; | 435 dump_back_forward_list_ = false; |
436 dump_child_frame_scroll_positions_ = false; | 436 dump_child_frame_scroll_positions_ = false; |
437 dump_child_frames_as_text_ = false; | 437 dump_child_frames_as_text_ = false; |
438 dump_window_status_changes_ = false; | 438 dump_window_status_changes_ = false; |
(...skipping 584 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1023 return; | 1023 return; |
1024 result->Set(WideToUTF8(counterValue)); | 1024 result->Set(WideToUTF8(counterValue)); |
1025 } | 1025 } |
1026 | 1026 |
1027 void LayoutTestController::LogErrorToConsole(const std::string& text) { | 1027 void LayoutTestController::LogErrorToConsole(const std::string& text) { |
1028 shell_->delegate()->didAddMessageToConsole( | 1028 shell_->delegate()->didAddMessageToConsole( |
1029 WebConsoleMessage(WebConsoleMessage::LevelError, | 1029 WebConsoleMessage(WebConsoleMessage::LevelError, |
1030 WebString::fromUTF8(text)), | 1030 WebString::fromUTF8(text)), |
1031 WebString(), 0); | 1031 WebString(), 0); |
1032 } | 1032 } |
OLD | NEW |