Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(502)

Side by Side Diff: content/shell/webkit_test_runner.cc

Issue 11830035: Update some #includes in content/shell for headers in the new Platform directory (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #include "content/shell/webkit_test_runner.h" 5 #include "content/shell/webkit_test_runner.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 8
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "base/md5.h" 10 #include "base/md5.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/message_loop.h" 12 #include "base/message_loop.h"
13 #include "base/stringprintf.h" 13 #include "base/stringprintf.h"
14 #include "base/sys_string_conversions.h" 14 #include "base/sys_string_conversions.h"
15 #include "base/time.h" 15 #include "base/time.h"
16 #include "base/utf_string_conversions.h" 16 #include "base/utf_string_conversions.h"
17 #include "content/public/renderer/render_view.h" 17 #include "content/public/renderer/render_view.h"
18 #include "content/public/test/layouttest_support.h" 18 #include "content/public/test/layouttest_support.h"
19 #include "content/shell/shell_messages.h" 19 #include "content/shell/shell_messages.h"
20 #include "content/shell/shell_render_process_observer.h" 20 #include "content/shell/shell_render_process_observer.h"
21 #include "content/shell/webkit_test_helpers.h" 21 #include "content/shell/webkit_test_helpers.h"
22 #include "net/base/net_util.h" 22 #include "net/base/net_util.h"
23 #include "skia/ext/platform_canvas.h" 23 #include "skia/ext/platform_canvas.h"
24 #include "third_party/WebKit/Source/Platform/chromium/public/Platform.h" 24 #include "third_party/WebKit/Source/Platform/chromium/public/Platform.h"
25 #include "third_party/WebKit/Source/Platform/chromium/public/WebCString.h"
26 #include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h"
27 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"
28 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h"
29 #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h"
25 #include "third_party/WebKit/Source/WebKit/chromium/public/WebContextMenuData.h" 30 #include "third_party/WebKit/Source/WebKit/chromium/public/WebContextMenuData.h"
26 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsAgent.h" 31 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsAgent.h"
27 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" 32 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
28 #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" 33 #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h"
29 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" 34 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
30 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" 35 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
31 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" 36 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
32 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCString.h "
33 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h"
34 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h"
35 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
36 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
37 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/Web Task.h" 37 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/Web Task.h"
38 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/Web TestProxy.h" 38 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/Web TestProxy.h"
39 #include "webkit/base/file_path_string_conversions.h" 39 #include "webkit/base/file_path_string_conversions.h"
40 #include "webkit/glue/webkit_glue.h" 40 #include "webkit/glue/webkit_glue.h"
41 #include "webkit/glue/webpreferences.h" 41 #include "webkit/glue/webpreferences.h"
42 42
43 using WebKit::Platform; 43 using WebKit::Platform;
44 using WebKit::WebContextMenuData; 44 using WebKit::WebContextMenuData;
45 using WebKit::WebDevToolsAgent; 45 using WebKit::WebDevToolsAgent;
46 using WebKit::WebElement; 46 using WebKit::WebElement;
(...skipping 586 matching lines...) Expand 10 before | Expand all | Expand 10 after
633 PaintRect(rect); 633 PaintRect(rect);
634 } 634 }
635 CHECK(proxy_->paintRect().isEmpty()); 635 CHECK(proxy_->paintRect().isEmpty());
636 } 636 }
637 637
638 void WebKitTestRunner::DisplayRepaintMask() { 638 void WebKitTestRunner::DisplayRepaintMask() {
639 GetCanvas()->drawARGB(167, 0, 0, 0); 639 GetCanvas()->drawARGB(167, 0, 0, 0);
640 } 640 }
641 641
642 } // namespace content 642 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698