OLD | NEW |
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 "webkit/support/webkit_support.h" | 5 #include "webkit/support/webkit_support.h" |
6 | 6 |
7 #include "base/at_exit.h" | 7 #include "base/at_exit.h" |
8 #include "base/base64.h" | 8 #include "base/base64.h" |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
103 | 103 |
104 // Preserve existing error mode, as discussed at | 104 // Preserve existing error mode, as discussed at |
105 // http://blogs.msdn.com/oldnewthing/archive/2004/07/27/198410.aspx | 105 // http://blogs.msdn.com/oldnewthing/archive/2004/07/27/198410.aspx |
106 UINT existing_flags = SetErrorMode(new_flags); | 106 UINT existing_flags = SetErrorMode(new_flags); |
107 SetErrorMode(existing_flags | new_flags); | 107 SetErrorMode(existing_flags | new_flags); |
108 } | 108 } |
109 #endif | 109 #endif |
110 | 110 |
111 #if defined(OS_ANDROID) | 111 #if defined(OS_ANDROID) |
112 // On Android we expect the log to appear in logcat. | 112 // On Android we expect the log to appear in logcat. |
113 InitAndroidTestLogging(); | 113 base::InitAndroidTestLogging(); |
114 #else | 114 #else |
115 FilePath log_filename; | 115 FilePath log_filename; |
116 PathService::Get(base::DIR_EXE, &log_filename); | 116 PathService::Get(base::DIR_EXE, &log_filename); |
117 log_filename = log_filename.AppendASCII("DumpRenderTree.log"); | 117 log_filename = log_filename.AppendASCII("DumpRenderTree.log"); |
118 logging::InitLogging( | 118 logging::InitLogging( |
119 log_filename.value().c_str(), | 119 log_filename.value().c_str(), |
120 // Only log to a file. This prevents debugging output from disrupting | 120 // Only log to a file. This prevents debugging output from disrupting |
121 // whether or not we pass. | 121 // whether or not we pass. |
122 logging::LOG_ONLY_TO_FILE, | 122 logging::LOG_ONLY_TO_FILE, |
123 // We might have multiple DumpRenderTree processes going at once. | 123 // We might have multiple DumpRenderTree processes going at once. |
(...skipping 657 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
781 // Logging | 781 // Logging |
782 void EnableWebCoreLogChannels(const std::string& channels) { | 782 void EnableWebCoreLogChannels(const std::string& channels) { |
783 webkit_glue::EnableWebCoreLogChannels(channels); | 783 webkit_glue::EnableWebCoreLogChannels(channels); |
784 } | 784 } |
785 | 785 |
786 void SetGamepadData(const WebKit::WebGamepads& pads) { | 786 void SetGamepadData(const WebKit::WebGamepads& pads) { |
787 test_environment->webkit_platform_support()->setGamepadData(pads); | 787 test_environment->webkit_platform_support()->setGamepadData(pads); |
788 } | 788 } |
789 | 789 |
790 } // namespace webkit_support | 790 } // namespace webkit_support |
OLD | NEW |