webkit/tools/test_shell/layout_test_controller.cc - Issue 387020: Upstreaming WebKit.gyp

Side by Side Diff: webkit/tools/test_shell/layout_test_controller.cc

Issue 387020: Upstreaming WebKit.gyp (Closed)

Patch Set: Created 11 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

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

11 #include "base/basictypes.h"	11 #include "base/basictypes.h"

12 #include "base/file_path.h"	12 #include "base/file_path.h"

13 #include "base/logging.h"	13 #include "base/logging.h"

14 #include "base/message_loop.h"	14 #include "base/message_loop.h"

15 #include "base/path_service.h"	15 #include "base/path_service.h"

16 #include "base/string_util.h"	16 #include "base/string_util.h"

17 #include "webkit/api/public/WebConsoleMessage.h"	17 #include "third_party/WebKit/WebKit/chromium/public/WebConsoleMessage.h"

18 #include "webkit/api/public/WebFrame.h"	18 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"

19 #include "webkit/api/public/WebKit.h"	19 #include "third_party/WebKit/WebKit/chromium/public/WebKit.h"

20 #include "webkit/api/public/WebScriptSource.h"	20 #include "third_party/WebKit/WebKit/chromium/public/WebScriptSource.h"

21 #include "webkit/api/public/WebSecurityPolicy.h"	21 #include "third_party/WebKit/WebKit/chromium/public/WebSecurityPolicy.h"

22 #include "webkit/api/public/WebURL.h"	22 #include "third_party/WebKit/WebKit/chromium/public/WebURL.h"

23 #include "webkit/api/public/WebView.h"	23 #include "third_party/WebKit/WebKit/chromium/public/WebView.h"

24 #include "webkit/glue/dom_operations.h"	24 #include "webkit/glue/dom_operations.h"

25 #include "webkit/glue/webkit_glue.h"	25 #include "webkit/glue/webkit_glue.h"

26 #include "webkit/glue/webpreferences.h"	26 #include "webkit/glue/webpreferences.h"

27 #include "webkit/tools/test_shell/simple_database_system.h"	27 #include "webkit/tools/test_shell/simple_database_system.h"

28 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h"	28 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h"

29 #include "webkit/tools/test_shell/test_navigation_controller.h"	29 #include "webkit/tools/test_shell/test_navigation_controller.h"

30 #include "webkit/tools/test_shell/test_shell.h"	30 #include "webkit/tools/test_shell/test_shell.h"

31	31

32 using std::string;	32 using std::string;

33 using std::wstring;	33 using std::wstring;

(...skipping 972 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1006 return;	1006 return;

1007 result->Set(WideToUTF8(counterValue));	1007 result->Set(WideToUTF8(counterValue));

1008 }	1008 }

1009	1009

1010 void LayoutTestController::LogErrorToConsole(const std::string& text) {	1010 void LayoutTestController::LogErrorToConsole(const std::string& text) {

1011 shell_->delegate()->didAddMessageToConsole(	1011 shell_->delegate()->didAddMessageToConsole(

1012 WebConsoleMessage(WebConsoleMessage::LevelError,	1012 WebConsoleMessage(WebConsoleMessage::LevelError,

1013 WebString::fromUTF8(text)),	1013 WebString::fromUTF8(text)),

1014 WebString(), 0);	1014 WebString(), 0);

1015 }	1015 }

OLD	NEW

« no previous file with comments | « webkit/tools/test_shell/keyboard_unittest.cc ('k') | webkit/tools/test_shell/mac/test_shell_webview.mm » ('j') | no next file with comments »