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 371 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
382 AddFilter(audio_message_filter_.get()); | 382 AddFilter(audio_message_filter_.get()); |
383 | 383 |
384 AddFilter(new IndexedDBMessageFilter); | 384 AddFilter(new IndexedDBMessageFilter); |
385 | 385 |
386 GetContentClient()->renderer()->RenderThreadStarted(); | 386 GetContentClient()->renderer()->RenderThreadStarted(); |
387 | 387 |
388 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); | 388 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); |
389 if (command_line.HasSwitch(switches::kEnableGpuBenchmarking)) | 389 if (command_line.HasSwitch(switches::kEnableGpuBenchmarking)) |
390 RegisterExtension(GpuBenchmarkingExtension::Get()); | 390 RegisterExtension(GpuBenchmarkingExtension::Get()); |
391 | 391 |
| 392 #if defined(USE_TCMALLOC) && (defined(OS_LINUX) || defined(OS_ANDROID)) |
392 if (command_line.HasSwitch(switches::kEnableMemoryBenchmarking)) | 393 if (command_line.HasSwitch(switches::kEnableMemoryBenchmarking)) |
393 RegisterExtension(MemoryBenchmarkingExtension::Get()); | 394 RegisterExtension(MemoryBenchmarkingExtension::Get()); |
| 395 #endif // USE_TCMALLOC |
394 | 396 |
395 context_lost_cb_.reset(new GpuVDAContextLostCallback()); | 397 context_lost_cb_.reset(new GpuVDAContextLostCallback()); |
396 | 398 |
397 // Note that under Linux, the media library will normally already have | 399 // Note that under Linux, the media library will normally already have |
398 // been initialized by the Zygote before this instance became a Renderer. | 400 // been initialized by the Zygote before this instance became a Renderer. |
399 base::FilePath media_path; | 401 base::FilePath media_path; |
400 PathService::Get(DIR_MEDIA_LIBS, &media_path); | 402 PathService::Get(DIR_MEDIA_LIBS, &media_path); |
401 if (!media_path.empty()) | 403 if (!media_path.empty()) |
402 media::InitializeMediaLibrary(media_path); | 404 media::InitializeMediaLibrary(media_path); |
403 | 405 |
(...skipping 901 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1305 | 1307 |
1306 void RenderThreadImpl::SetFlingCurveParameters( | 1308 void RenderThreadImpl::SetFlingCurveParameters( |
1307 const std::vector<float>& new_touchpad, | 1309 const std::vector<float>& new_touchpad, |
1308 const std::vector<float>& new_touchscreen) { | 1310 const std::vector<float>& new_touchscreen) { |
1309 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, | 1311 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, |
1310 new_touchscreen); | 1312 new_touchscreen); |
1311 | 1313 |
1312 } | 1314 } |
1313 | 1315 |
1314 } // namespace content | 1316 } // namespace content |
OLD | NEW |