| 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 712 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 723 WebRuntimeFeatures::enableFileSystem(false); | 723 WebRuntimeFeatures::enableFileSystem(false); |
| 724 | 724 |
| 725 if (command_line.HasSwitch(switches::kDisableJavaScriptI18NAPI)) | 725 if (command_line.HasSwitch(switches::kDisableJavaScriptI18NAPI)) |
| 726 WebRuntimeFeatures::enableJavaScriptI18NAPI(false); | 726 WebRuntimeFeatures::enableJavaScriptI18NAPI(false); |
| 727 | 727 |
| 728 if (command_line.HasSwitch(switches::kEnableExperimentalCanvasFeatures)) | 728 if (command_line.HasSwitch(switches::kEnableExperimentalCanvasFeatures)) |
| 729 WebRuntimeFeatures::enableExperimentalCanvasFeatures(true); | 729 WebRuntimeFeatures::enableExperimentalCanvasFeatures(true); |
| 730 | 730 |
| 731 if (command_line.HasSwitch(switches::kEnableSpeechSynthesis)) | 731 if (command_line.HasSwitch(switches::kEnableSpeechSynthesis)) |
| 732 WebRuntimeFeatures::enableSpeechSynthesis(true); | 732 WebRuntimeFeatures::enableSpeechSynthesis(true); |
| 733 |
| 734 if (command_line.HasSwitch(switches::kEnableWebGLDraftExtensions)) |
| 735 WebRuntimeFeatures::enableWebGLDraftExtensions(true); |
| 733 } | 736 } |
| 734 | 737 |
| 735 void RenderThreadImpl::EnsureWebKitInitialized() { | 738 void RenderThreadImpl::EnsureWebKitInitialized() { |
| 736 if (webkit_platform_support_) | 739 if (webkit_platform_support_) |
| 737 return; | 740 return; |
| 738 | 741 |
| 739 webkit_platform_support_.reset(new RendererWebKitPlatformSupportImpl); | 742 webkit_platform_support_.reset(new RendererWebKitPlatformSupportImpl); |
| 740 WebKit::initialize(webkit_platform_support_.get()); | 743 WebKit::initialize(webkit_platform_support_.get()); |
| 741 WebKit::setSharedWorkerRepository( | 744 WebKit::setSharedWorkerRepository( |
| 742 webkit_platform_support_.get()->sharedWorkerRepository()); | 745 webkit_platform_support_.get()->sharedWorkerRepository()); |
| (...skipping 587 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 |