| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 15 matching lines...) Expand all Loading... |
| 26 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDeviceOrientation.
h" | 26 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDeviceOrientation.
h" |
| 27 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDeviceOrientationC
lientMock.h" | 27 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDeviceOrientationC
lientMock.h" |
| 28 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" | 28 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" |
| 29 #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" | 29 #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" |
| 30 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" | 30 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" |
| 31 #include "third_party/WebKit/Source/WebKit/chromium/public/WebGeolocationClientM
ock.h" | 31 #include "third_party/WebKit/Source/WebKit/chromium/public/WebGeolocationClientM
ock.h" |
| 32 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" | 32 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" |
| 33 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptSource.h" | 33 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptSource.h" |
| 34 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h" | 34 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h" |
| 35 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSettings.h" | 35 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSettings.h" |
| 36 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h" | 36 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h" |
| 37 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSpeechInputControl
lerMock.h" | 37 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSpeechInputControl
lerMock.h" |
| 38 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h" | 38 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h" |
| 39 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" | 39 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" |
| 40 #include "webkit/glue/dom_operations.h" | 40 #include "webkit/glue/dom_operations.h" |
| 41 #include "webkit/glue/webkit_glue.h" | 41 #include "webkit/glue/webkit_glue.h" |
| 42 #include "webkit/glue/webpreferences.h" | 42 #include "webkit/glue/webpreferences.h" |
| 43 #include "webkit/support/simple_database_system.h" | 43 #include "webkit/support/simple_database_system.h" |
| 44 #include "webkit/tools/test_shell/notification_presenter.h" | 44 #include "webkit/tools/test_shell/notification_presenter.h" |
| 45 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h" | 45 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h" |
| 46 #include "webkit/tools/test_shell/test_navigation_controller.h" | 46 #include "webkit/tools/test_shell/test_navigation_controller.h" |
| 47 #include "webkit/tools/test_shell/test_shell.h" | 47 #include "webkit/tools/test_shell/test_shell.h" |
| 48 #include "webkit/tools/test_shell/test_shell_devtools_agent.h" | 48 #include "webkit/tools/test_shell/test_shell_devtools_agent.h" |
| (...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 277 } | 277 } |
| 278 result->SetNull(); | 278 result->SetNull(); |
| 279 } | 279 } |
| 280 | 280 |
| 281 void LayoutTestController::LogErrorToConsole(const std::string& text) { | 281 void LayoutTestController::LogErrorToConsole(const std::string& text) { |
| 282 shell_->delegate()->didAddMessageToConsole( | 282 shell_->delegate()->didAddMessageToConsole( |
| 283 WebConsoleMessage(WebConsoleMessage::LevelError, | 283 WebConsoleMessage(WebConsoleMessage::LevelError, |
| 284 WebString::fromUTF8(text)), | 284 WebString::fromUTF8(text)), |
| 285 WebString(), 0); | 285 WebString(), 0); |
| 286 } | 286 } |
| OLD | NEW |