| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 using std::string; | 50 using std::string; |
| 51 | 51 |
| 52 using WebKit::WebBindings; | 52 using WebKit::WebBindings; |
| 53 using WebKit::WebConsoleMessage; | 53 using WebKit::WebConsoleMessage; |
| 54 using WebKit::WebElement; | 54 using WebKit::WebElement; |
| 55 using WebKit::WebScriptSource; | 55 using WebKit::WebScriptSource; |
| 56 using WebKit::WebSecurityPolicy; | 56 using WebKit::WebSecurityPolicy; |
| 57 using WebKit::WebSize; | 57 using WebKit::WebSize; |
| 58 using WebKit::WebString; | 58 using WebKit::WebString; |
| 59 using WebKit::WebURL; | 59 using WebKit::WebURL; |
| 60 using webkit_glue::CppArgumentList; |
| 61 using webkit_glue::CppVariant; |
| 60 | 62 |
| 61 TestShell* LayoutTestController::shell_ = NULL; | 63 TestShell* LayoutTestController::shell_ = NULL; |
| 62 // Most of these flags need to be cleared in Reset() so that they get turned | 64 // Most of these flags need to be cleared in Reset() so that they get turned |
| 63 // off between each test run. | 65 // off between each test run. |
| 64 bool LayoutTestController::accepts_editing_ = true; | 66 bool LayoutTestController::accepts_editing_ = true; |
| 65 bool LayoutTestController::wait_until_done_ = false; | 67 bool LayoutTestController::wait_until_done_ = false; |
| 66 bool LayoutTestController::can_open_windows_ = false; | 68 bool LayoutTestController::can_open_windows_ = false; |
| 67 bool LayoutTestController::close_remaining_windows_ = true; | 69 bool LayoutTestController::close_remaining_windows_ = true; |
| 68 bool LayoutTestController::stop_provisional_frame_loads_ = false; | 70 bool LayoutTestController::stop_provisional_frame_loads_ = false; |
| 69 LayoutTestController::WorkQueue LayoutTestController::work_queue_; | 71 LayoutTestController::WorkQueue LayoutTestController::work_queue_; |
| (...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 276 } | 278 } |
| 277 result->SetNull(); | 279 result->SetNull(); |
| 278 } | 280 } |
| 279 | 281 |
| 280 void LayoutTestController::LogErrorToConsole(const std::string& text) { | 282 void LayoutTestController::LogErrorToConsole(const std::string& text) { |
| 281 shell_->delegate()->didAddMessageToConsole( | 283 shell_->delegate()->didAddMessageToConsole( |
| 282 WebConsoleMessage(WebConsoleMessage::LevelError, | 284 WebConsoleMessage(WebConsoleMessage::LevelError, |
| 283 WebString::fromUTF8(text)), | 285 WebString::fromUTF8(text)), |
| 284 WebString(), 0); | 286 WebString(), 0); |
| 285 } | 287 } |
| OLD | NEW |