OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "webkit/support/webkit_support.h" | 5 #include "webkit/support/webkit_support.h" |
6 | 6 |
7 #include "app/gfx/gl/gl_implementation.h" | 7 #include "app/gfx/gl/gl_implementation.h" |
8 #include "base/at_exit.h" | 8 #include "base/at_exit.h" |
9 #include "base/base64.h" | 9 #include "base/base64.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
86 FilePath log_filename; | 86 FilePath log_filename; |
87 PathService::Get(base::DIR_EXE, &log_filename); | 87 PathService::Get(base::DIR_EXE, &log_filename); |
88 log_filename = log_filename.AppendASCII("DumpRenderTree.log"); | 88 log_filename = log_filename.AppendASCII("DumpRenderTree.log"); |
89 logging::InitLogging( | 89 logging::InitLogging( |
90 log_filename.value().c_str(), | 90 log_filename.value().c_str(), |
91 // Only log to a file. This prevents debugging output from disrupting | 91 // Only log to a file. This prevents debugging output from disrupting |
92 // whether or not we pass. | 92 // whether or not we pass. |
93 logging::LOG_ONLY_TO_FILE, | 93 logging::LOG_ONLY_TO_FILE, |
94 // We might have multiple DumpRenderTree processes going at once. | 94 // We might have multiple DumpRenderTree processes going at once. |
95 logging::LOCK_LOG_FILE, | 95 logging::LOCK_LOG_FILE, |
96 logging::DELETE_OLD_LOG_FILE); | 96 logging::DELETE_OLD_LOG_FILE, |
| 97 logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS); |
97 | 98 |
98 // We want process and thread IDs because we may have multiple processes. | 99 // We want process and thread IDs because we may have multiple processes. |
99 const bool kProcessId = true; | 100 const bool kProcessId = true; |
100 const bool kThreadId = true; | 101 const bool kThreadId = true; |
101 const bool kTimestamp = true; | 102 const bool kTimestamp = true; |
102 const bool kTickcount = true; | 103 const bool kTickcount = true; |
103 logging::SetLogItems(kProcessId, kThreadId, !kTimestamp, kTickcount); | 104 logging::SetLogItems(kProcessId, kThreadId, !kTimestamp, kTickcount); |
104 } | 105 } |
105 | 106 |
106 class TestEnvironment { | 107 class TestEnvironment { |
(...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
524 | 525 |
525 // FileSystem | 526 // FileSystem |
526 void OpenFileSystem(WebFrame* frame, WebFileSystem::Type type, | 527 void OpenFileSystem(WebFrame* frame, WebFileSystem::Type type, |
527 long long size, bool create, WebFileSystemCallbacks* callbacks) { | 528 long long size, bool create, WebFileSystemCallbacks* callbacks) { |
528 SimpleFileSystem* fileSystem = static_cast<SimpleFileSystem*>( | 529 SimpleFileSystem* fileSystem = static_cast<SimpleFileSystem*>( |
529 test_environment->webkit_client()->fileSystem()); | 530 test_environment->webkit_client()->fileSystem()); |
530 fileSystem->OpenFileSystem(frame, type, size, create, callbacks); | 531 fileSystem->OpenFileSystem(frame, type, size, create, callbacks); |
531 } | 532 } |
532 | 533 |
533 } // namespace webkit_support | 534 } // namespace webkit_support |
OLD | NEW |