| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/public/renderer/web_preferences.h" | 5 #include "content/public/renderer/web_preferences.h" |
| 6 | 6 |
| 7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
| 8 #include "third_party/WebKit/public/platform/WebString.h" | 8 #include "third_party/WebKit/public/platform/WebString.h" |
| 9 #include "third_party/WebKit/public/platform/WebURL.h" | 9 #include "third_party/WebKit/public/platform/WebURL.h" |
| 10 #include "third_party/WebKit/public/web/WebKit.h" | 10 #include "third_party/WebKit/public/web/WebKit.h" |
| (...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 228 settings->setContainerCullingEnabled(prefs.container_culling_enabled); | 228 settings->setContainerCullingEnabled(prefs.container_culling_enabled); |
| 229 | 229 |
| 230 // Enable gesture tap highlight if requested on the command line. | 230 // Enable gesture tap highlight if requested on the command line. |
| 231 settings->setGestureTapHighlightEnabled(prefs.gesture_tap_highlight_enabled); | 231 settings->setGestureTapHighlightEnabled(prefs.gesture_tap_highlight_enabled); |
| 232 | 232 |
| 233 // Enabling accelerated layers from the command line enabled accelerated | 233 // Enabling accelerated layers from the command line enabled accelerated |
| 234 // Video. | 234 // Video. |
| 235 settings->setAcceleratedCompositingForVideoEnabled( | 235 settings->setAcceleratedCompositingForVideoEnabled( |
| 236 prefs.accelerated_compositing_for_video_enabled); | 236 prefs.accelerated_compositing_for_video_enabled); |
| 237 | 237 |
| 238 // Always enable composited 3D css, animations and plugins. | |
| 239 settings->setAcceleratedCompositingFor3DTransformsEnabled(true); | |
| 240 settings->setAcceleratedCompositingForAnimationEnabled(true); | |
| 241 settings->setAcceleratedCompositingForPluginsEnabled(true); | |
| 242 | |
| 243 // WebGL and accelerated 2D canvas are always gpu composited. | 238 // WebGL and accelerated 2D canvas are always gpu composited. |
| 244 settings->setAcceleratedCompositingForCanvasEnabled( | 239 settings->setAcceleratedCompositingForCanvasEnabled( |
| 245 prefs.experimental_webgl_enabled || prefs.accelerated_2d_canvas_enabled); | 240 prefs.experimental_webgl_enabled || prefs.accelerated_2d_canvas_enabled); |
| 246 | 241 |
| 247 settings->setAsynchronousSpellCheckingEnabled( | 242 settings->setAsynchronousSpellCheckingEnabled( |
| 248 prefs.asynchronous_spell_checking_enabled); | 243 prefs.asynchronous_spell_checking_enabled); |
| 249 settings->setUnifiedTextCheckerEnabled(prefs.unified_textchecker_enabled); | 244 settings->setUnifiedTextCheckerEnabled(prefs.unified_textchecker_enabled); |
| 250 | 245 |
| 251 for (webkit_glue::WebInspectorPreferences::const_iterator it = | 246 for (webkit_glue::WebInspectorPreferences::const_iterator it = |
| 252 prefs.inspector_settings.begin(); | 247 prefs.inspector_settings.begin(); |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 346 settings->setPinchVirtualViewportEnabled( | 341 settings->setPinchVirtualViewportEnabled( |
| 347 prefs.pinch_virtual_viewport_enabled); | 342 prefs.pinch_virtual_viewport_enabled); |
| 348 | 343 |
| 349 settings->setPinchOverlayScrollbarThickness( | 344 settings->setPinchOverlayScrollbarThickness( |
| 350 prefs.pinch_overlay_scrollbar_thickness); | 345 prefs.pinch_overlay_scrollbar_thickness); |
| 351 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars); | 346 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars); |
| 352 settings->setCompositorTouchHitTesting(prefs.compositor_touch_hit_testing); | 347 settings->setCompositorTouchHitTesting(prefs.compositor_touch_hit_testing); |
| 353 } | 348 } |
| 354 | 349 |
| 355 } // namespace content | 350 } // namespace content |
| OLD | NEW |