| 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 710 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 721 WebRuntimeFeatures::enableFileSystem(false); | 721 WebRuntimeFeatures::enableFileSystem(false); |
| 722 | 722 |
| 723 if (command_line.HasSwitch(switches::kDisableJavaScriptI18NAPI)) | 723 if (command_line.HasSwitch(switches::kDisableJavaScriptI18NAPI)) |
| 724 WebRuntimeFeatures::enableJavaScriptI18NAPI(false); | 724 WebRuntimeFeatures::enableJavaScriptI18NAPI(false); |
| 725 | 725 |
| 726 if (command_line.HasSwitch(switches::kEnableExperimentalCanvasFeatures)) | 726 if (command_line.HasSwitch(switches::kEnableExperimentalCanvasFeatures)) |
| 727 WebRuntimeFeatures::enableExperimentalCanvasFeatures(true); | 727 WebRuntimeFeatures::enableExperimentalCanvasFeatures(true); |
| 728 | 728 |
| 729 if (command_line.HasSwitch(switches::kEnableSpeechSynthesis)) | 729 if (command_line.HasSwitch(switches::kEnableSpeechSynthesis)) |
| 730 WebRuntimeFeatures::enableSpeechSynthesis(true); | 730 WebRuntimeFeatures::enableSpeechSynthesis(true); |
| 731 |
| 732 if (command_line.HasSwitch(switches::kEnableWebGLDraftExtensions)) |
| 733 WebRuntimeFeatures::enableWebGLDraftExtensions(true); |
| 731 } | 734 } |
| 732 | 735 |
| 733 void RenderThreadImpl::EnsureWebKitInitialized() { | 736 void RenderThreadImpl::EnsureWebKitInitialized() { |
| 734 if (webkit_platform_support_) | 737 if (webkit_platform_support_) |
| 735 return; | 738 return; |
| 736 | 739 |
| 737 webkit_platform_support_.reset(new RendererWebKitPlatformSupportImpl); | 740 webkit_platform_support_.reset(new RendererWebKitPlatformSupportImpl); |
| 738 WebKit::initialize(webkit_platform_support_.get()); | 741 WebKit::initialize(webkit_platform_support_.get()); |
| 739 WebKit::setSharedWorkerRepository( | 742 WebKit::setSharedWorkerRepository( |
| 740 webkit_platform_support_.get()->sharedWorkerRepository()); | 743 webkit_platform_support_.get()->sharedWorkerRepository()); |
| (...skipping 588 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1329 | 1332 |
| 1330 void RenderThreadImpl::SetFlingCurveParameters( | 1333 void RenderThreadImpl::SetFlingCurveParameters( |
| 1331 const std::vector<float>& new_touchpad, | 1334 const std::vector<float>& new_touchpad, |
| 1332 const std::vector<float>& new_touchscreen) { | 1335 const std::vector<float>& new_touchscreen) { |
| 1333 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, | 1336 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, |
| 1334 new_touchscreen); | 1337 new_touchscreen); |
| 1335 | 1338 |
| 1336 } | 1339 } |
| 1337 | 1340 |
| 1338 } // namespace content | 1341 } // namespace content |
| OLD | NEW |