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

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

Issue 115412: Fix Skia includes to use the whole path name. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 7 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 | « webkit/tools/test_shell/simple_clipboard_impl.cc ('k') | 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) 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 #include "v8_proxy.h" 5 #include "v8_proxy.h"
6 #undef LOG 6 #undef LOG
7 7
8 #include "webkit/tools/test_shell/test_shell.h" 8 #include "webkit/tools/test_shell/test_shell.h"
9 9
10 #include "base/base_paths.h" 10 #include "base/base_paths.h"
(...skipping 13 matching lines...) Expand all
24 #include "base/stats_table.h" 24 #include "base/stats_table.h"
25 #include "base/string_util.h" 25 #include "base/string_util.h"
26 #include "build/build_config.h" 26 #include "build/build_config.h"
27 #include "googleurl/src/url_util.h" 27 #include "googleurl/src/url_util.h"
28 #include "grit/webkit_strings.h" 28 #include "grit/webkit_strings.h"
29 #include "net/base/mime_util.h" 29 #include "net/base/mime_util.h"
30 #include "net/url_request/url_request_file_job.h" 30 #include "net/url_request/url_request_file_job.h"
31 #include "net/url_request/url_request_filter.h" 31 #include "net/url_request/url_request_filter.h"
32 #include "skia/ext/bitmap_platform_device.h" 32 #include "skia/ext/bitmap_platform_device.h"
33 #include "testing/gtest/include/gtest/gtest.h" 33 #include "testing/gtest/include/gtest/gtest.h"
34 #include "third_party/skia/include/core/SkBitmap.h"
34 #include "webkit/glue/webdatasource.h" 35 #include "webkit/glue/webdatasource.h"
35 #include "webkit/glue/webframe.h" 36 #include "webkit/glue/webframe.h"
36 #include "webkit/glue/webkit_glue.h" 37 #include "webkit/glue/webkit_glue.h"
37 #include "webkit/glue/webpreferences.h" 38 #include "webkit/glue/webpreferences.h"
38 #include "webkit/glue/webresponse.h" 39 #include "webkit/glue/webresponse.h"
39 #include "webkit/glue/weburlrequest.h" 40 #include "webkit/glue/weburlrequest.h"
40 #include "webkit/glue/webview.h" 41 #include "webkit/glue/webview.h"
41 #include "webkit/glue/webwidget.h" 42 #include "webkit/glue/webwidget.h"
42 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h" 43 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
43 #include "webkit/tools/test_shell/test_navigation_controller.h" 44 #include "webkit/tools/test_shell/test_navigation_controller.h"
44 #include "webkit/tools/test_shell/test_shell_switches.h" 45 #include "webkit/tools/test_shell/test_shell_switches.h"
45 46
46 #include "SkBitmap.h"
47
48 namespace { 47 namespace {
49 48
50 // Default timeout in ms for file page loads when in layout test mode. 49 // Default timeout in ms for file page loads when in layout test mode.
51 const int kDefaultFileTestTimeoutMillisecs = 10 * 1000; 50 const int kDefaultFileTestTimeoutMillisecs = 10 * 1000;
52 51
53 // Content area size for newly created windows. 52 // Content area size for newly created windows.
54 const int kTestWindowWidth = 800; 53 const int kTestWindowWidth = 800;
55 const int kTestWindowHeight = 600; 54 const int kTestWindowHeight = 600;
56 55
57 // The W3C SVG layout tests use a different size than the other layout 56 // The W3C SVG layout tests use a different size than the other layout
(...skipping 588 matching lines...) Expand 10 before | Expand all | Expand 10 after
646 } 645 }
647 #endif // OS_WIN 646 #endif // OS_WIN
648 return false; 647 return false;
649 } 648 }
650 649
651 std::wstring GetWebKitLocale() { 650 std::wstring GetWebKitLocale() {
652 return L"en-US"; 651 return L"en-US";
653 } 652 }
654 653
655 } // namespace webkit_glue 654 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « webkit/tools/test_shell/simple_clipboard_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698