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 "content/renderer/render_thread_impl.h" | 5 #include "content/renderer/render_thread_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <limits> | 8 #include <limits> |
9 #include <map> | 9 #include <map> |
10 #include <vector> | 10 #include <vector> |
(...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
390 new WebRtcLoggingMessageFilter(GetIOMessageLoopProxy()); | 390 new WebRtcLoggingMessageFilter(GetIOMessageLoopProxy()); |
391 AddFilter(webrtc_logging_message_filter_.get()); | 391 AddFilter(webrtc_logging_message_filter_.get()); |
392 #endif | 392 #endif |
393 | 393 |
394 GetContentClient()->renderer()->RenderThreadStarted(); | 394 GetContentClient()->renderer()->RenderThreadStarted(); |
395 | 395 |
396 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); | 396 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); |
397 if (command_line.HasSwitch(switches::kEnableGpuBenchmarking)) | 397 if (command_line.HasSwitch(switches::kEnableGpuBenchmarking)) |
398 RegisterExtension(GpuBenchmarkingExtension::Get()); | 398 RegisterExtension(GpuBenchmarkingExtension::Get()); |
399 | 399 |
| 400 #if defined(USE_TCMALLOC) && (defined(OS_LINUX) || defined(OS_ANDROID)) |
400 if (command_line.HasSwitch(switches::kEnableMemoryBenchmarking)) | 401 if (command_line.HasSwitch(switches::kEnableMemoryBenchmarking)) |
401 RegisterExtension(MemoryBenchmarkingExtension::Get()); | 402 RegisterExtension(MemoryBenchmarkingExtension::Get()); |
| 403 #endif // USE_TCMALLOC |
402 | 404 |
403 if (command_line.HasSwitch(switches::kEnableSkiaBenchmarking)) { | 405 if (command_line.HasSwitch(switches::kEnableSkiaBenchmarking)) { |
404 LOG(WARNING) << "Enabling unsafe Skia benchmarking extension."; | 406 LOG(WARNING) << "Enabling unsafe Skia benchmarking extension."; |
405 RegisterExtension(SkiaBenchmarkingExtension::Get()); | 407 RegisterExtension(SkiaBenchmarkingExtension::Get()); |
406 } | 408 } |
407 | 409 |
408 context_lost_cb_.reset(new GpuVDAContextLostCallback()); | 410 context_lost_cb_.reset(new GpuVDAContextLostCallback()); |
409 | 411 |
410 // Note that under Linux, the media library will normally already have | 412 // Note that under Linux, the media library will normally already have |
411 // been initialized by the Zygote before this instance became a Renderer. | 413 // been initialized by the Zygote before this instance became a Renderer. |
(...skipping 905 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1317 | 1319 |
1318 void RenderThreadImpl::SetFlingCurveParameters( | 1320 void RenderThreadImpl::SetFlingCurveParameters( |
1319 const std::vector<float>& new_touchpad, | 1321 const std::vector<float>& new_touchpad, |
1320 const std::vector<float>& new_touchscreen) { | 1322 const std::vector<float>& new_touchscreen) { |
1321 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, | 1323 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, |
1322 new_touchscreen); | 1324 new_touchscreen); |
1323 | 1325 |
1324 } | 1326 } |
1325 | 1327 |
1326 } // namespace content | 1328 } // namespace content |
OLD | NEW |