OLD | NEW |
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 945 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
956 if (!url.isValid()) | 956 if (!url.isValid()) |
957 return; | 957 return; |
958 | 958 |
959 WebKit::whiteListAccessFromOrigin(url, | 959 WebKit::whiteListAccessFromOrigin(url, |
960 WebString::fromUTF8(args[1].ToString()), | 960 WebString::fromUTF8(args[1].ToString()), |
961 WebString::fromUTF8(args[2].ToString()), | 961 WebString::fromUTF8(args[2].ToString()), |
962 args[3].ToBoolean()); | 962 args[3].ToBoolean()); |
963 } | 963 } |
964 | 964 |
965 void LayoutTestController::LogErrorToConsole(const std::string& text) { | 965 void LayoutTestController::LogErrorToConsole(const std::string& text) { |
966 shell_->webView()->GetMainFrame()->addMessageToConsole( | 966 shell_->delegate()->didAddMessageToConsole( |
967 WebConsoleMessage(WebConsoleMessage::LevelError, | 967 WebConsoleMessage(WebConsoleMessage::LevelError, |
968 WebString::fromUTF8(text))); | 968 WebString::fromUTF8(text)), |
| 969 WebString(), 0); |
969 } | 970 } |
OLD | NEW |