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 752 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
763 | 763 |
764 webkit_glue::EnableWebCoreLogChannels( | 764 webkit_glue::EnableWebCoreLogChannels( |
765 command_line.GetSwitchValueASCII(switches::kWebCoreLogChannels)); | 765 command_line.GetSwitchValueASCII(switches::kWebCoreLogChannels)); |
766 | 766 |
767 web_database_observer_impl_.reset( | 767 web_database_observer_impl_.reset( |
768 new WebDatabaseObserverImpl(sync_message_filter())); | 768 new WebDatabaseObserverImpl(sync_message_filter())); |
769 WebKit::WebDatabase::setObserver(web_database_observer_impl_.get()); | 769 WebKit::WebDatabase::setObserver(web_database_observer_impl_.get()); |
770 | 770 |
771 WebRuntimeFeatures::enableStableFeatures(true); | 771 WebRuntimeFeatures::enableStableFeatures(true); |
772 | 772 |
773 if (command_line.HasSwitch(switches::kEnableExperimentalWebKitFeatures)) | 773 if (command_line.HasSwitch(switches::kEnableExperimentalWebPlatformFeatures)) |
774 WebRuntimeFeatures::enableExperimentalFeatures(true); | 774 WebRuntimeFeatures::enableExperimentalFeatures(true); |
775 | 775 |
776 AdjustRuntimeFeatureDefaultsForPlatform(); | 776 AdjustRuntimeFeatureDefaultsForPlatform(); |
777 AdjustRuntimeFeaturesFromArgs(command_line); | 777 AdjustRuntimeFeaturesFromArgs(command_line); |
778 | 778 |
779 // Enabled by default for testing. | 779 // Enabled by default for testing. |
780 // TODO(urvang): Go back to using the command-line option after a few days. | 780 // TODO(urvang): Go back to using the command-line option after a few days. |
781 // https://code.google.com/p/chromium/issues/detail?id=234437 | 781 // https://code.google.com/p/chromium/issues/detail?id=234437 |
782 WebRuntimeFeatures::enableWebPInAcceptHeader(true); | 782 WebRuntimeFeatures::enableWebPInAcceptHeader(true); |
783 | 783 |
(...skipping 521 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1305 | 1305 |
1306 void RenderThreadImpl::SetFlingCurveParameters( | 1306 void RenderThreadImpl::SetFlingCurveParameters( |
1307 const std::vector<float>& new_touchpad, | 1307 const std::vector<float>& new_touchpad, |
1308 const std::vector<float>& new_touchscreen) { | 1308 const std::vector<float>& new_touchscreen) { |
1309 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, | 1309 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, |
1310 new_touchscreen); | 1310 new_touchscreen); |
1311 | 1311 |
1312 } | 1312 } |
1313 | 1313 |
1314 } // namespace content | 1314 } // namespace content |
OLD | NEW |