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