| 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 660 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 671 | 671 |
| 672 if (command_line.HasSwitch(switches::kDisableLocalStorage)) | 672 if (command_line.HasSwitch(switches::kDisableLocalStorage)) |
| 673 WebRuntimeFeatures::enableLocalStorage(false); | 673 WebRuntimeFeatures::enableLocalStorage(false); |
| 674 | 674 |
| 675 if (command_line.HasSwitch(switches::kDisableSessionStorage)) | 675 if (command_line.HasSwitch(switches::kDisableSessionStorage)) |
| 676 WebRuntimeFeatures::enableSessionStorage(false); | 676 WebRuntimeFeatures::enableSessionStorage(false); |
| 677 | 677 |
| 678 if (command_line.HasSwitch(switches::kDisableGeolocation)) | 678 if (command_line.HasSwitch(switches::kDisableGeolocation)) |
| 679 WebRuntimeFeatures::enableGeolocation(false); | 679 WebRuntimeFeatures::enableGeolocation(false); |
| 680 | 680 |
| 681 #if !defined(OS_ANDROID) || defined(GOOGLE_TV) | 681 #if defined(OS_ANDROID) && !defined(GOOGLE_TV) |
| 682 if (command_line.HasSwitch(switches::kEnableWebKitMediaSource)) |
| 683 WebRuntimeFeatures::enableWebKitMediaSource(true); |
| 684 #else |
| 682 if (command_line.HasSwitch(switches::kDisableWebKitMediaSource)) | 685 if (command_line.HasSwitch(switches::kDisableWebKitMediaSource)) |
| 683 WebRuntimeFeatures::enableWebKitMediaSource(false); | 686 WebRuntimeFeatures::enableWebKitMediaSource(false); |
| 684 #endif | 687 #endif |
| 685 | 688 |
| 686 #if defined(OS_ANDROID) | 689 #if defined(OS_ANDROID) |
| 687 if (command_line.HasSwitch(switches::kDisableWebRTC)) | 690 if (command_line.HasSwitch(switches::kDisableWebRTC)) |
| 688 WebRuntimeFeatures::enableMediaStream(false); | 691 WebRuntimeFeatures::enableMediaStream(false); |
| 689 #endif | 692 #endif |
| 690 | 693 |
| 691 #if defined(OS_ANDROID) | 694 #if defined(OS_ANDROID) |
| (...skipping 638 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1330 | 1333 |
| 1331 void RenderThreadImpl::SetFlingCurveParameters( | 1334 void RenderThreadImpl::SetFlingCurveParameters( |
| 1332 const std::vector<float>& new_touchpad, | 1335 const std::vector<float>& new_touchpad, |
| 1333 const std::vector<float>& new_touchscreen) { | 1336 const std::vector<float>& new_touchscreen) { |
| 1334 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, | 1337 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, |
| 1335 new_touchscreen); | 1338 new_touchscreen); |
| 1336 | 1339 |
| 1337 } | 1340 } |
| 1338 | 1341 |
| 1339 } // namespace content | 1342 } // namespace content |
| OLD | NEW |