OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/debug/debugger.h" | 10 #include "base/debug/debugger.h" |
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
207 | 207 |
208 virtual void Cancel() { | 208 virtual void Cancel() { |
209 adaptor_.reset(); | 209 adaptor_.reset(); |
210 } | 210 } |
211 | 211 |
212 private: | 212 private: |
213 scoped_ptr<webkit_support::TaskAdaptor> adaptor_; | 213 scoped_ptr<webkit_support::TaskAdaptor> adaptor_; |
214 }; | 214 }; |
215 | 215 |
216 webkit_support::GraphicsContext3DImplementation | 216 webkit_support::GraphicsContext3DImplementation |
217 g_graphics_context_3d_implementation = webkit_support::IN_PROCESS; | 217 g_graphics_context_3d_implementation = |
| 218 webkit_support::IN_PROCESS_COMMAND_BUFFER; |
218 | 219 |
219 } // namespace | 220 } // namespace |
220 | 221 |
221 namespace webkit_support { | 222 namespace webkit_support { |
222 | 223 |
223 static TestEnvironment* test_environment; | 224 static TestEnvironment* test_environment; |
224 | 225 |
225 static void SetUpTestEnvironmentImpl(bool unit_test_mode) { | 226 static void SetUpTestEnvironmentImpl(bool unit_test_mode) { |
226 base::EnableInProcessStackDumping(); | 227 base::EnableInProcessStackDumping(); |
227 base::EnableTerminationOnHeapCorruption(); | 228 base::EnableTerminationOnHeapCorruption(); |
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
603 test_environment->webkit_client()->fileSystem()); | 604 test_environment->webkit_client()->fileSystem()); |
604 fileSystem->OpenFileSystem(frame, type, size, create, callbacks); | 605 fileSystem->OpenFileSystem(frame, type, size, create, callbacks); |
605 } | 606 } |
606 | 607 |
607 // Timers | 608 // Timers |
608 double GetForegroundTabTimerInterval() { | 609 double GetForegroundTabTimerInterval() { |
609 return webkit_glue::kForegroundTabTimerInterval; | 610 return webkit_glue::kForegroundTabTimerInterval; |
610 } | 611 } |
611 | 612 |
612 } // namespace webkit_support | 613 } // namespace webkit_support |
OLD | NEW |