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 "webkit/renderer/webpreferences_renderer.h" | 5 #include "webkit/renderer/webpreferences_renderer.h" |
6 | 6 |
7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
8 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" | 8 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" |
9 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNetworkStateNotifi
er.h" | 9 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNetworkStateNotifi
er.h" |
10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" | 10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" |
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
281 settings->setAllowRunningOfInsecureContent( | 281 settings->setAllowRunningOfInsecureContent( |
282 prefs.allow_running_insecure_content); | 282 prefs.allow_running_insecure_content); |
283 settings->setPasswordEchoEnabled(prefs.password_echo_enabled); | 283 settings->setPasswordEchoEnabled(prefs.password_echo_enabled); |
284 settings->setShouldPrintBackgrounds(prefs.should_print_backgrounds); | 284 settings->setShouldPrintBackgrounds(prefs.should_print_backgrounds); |
285 settings->setEnableScrollAnimator(prefs.enable_scroll_animator); | 285 settings->setEnableScrollAnimator(prefs.enable_scroll_animator); |
286 settings->setVisualWordMovementEnabled(prefs.visual_word_movement_enabled); | 286 settings->setVisualWordMovementEnabled(prefs.visual_word_movement_enabled); |
287 | 287 |
288 settings->setCSSStickyPositionEnabled(prefs.css_sticky_position_enabled); | 288 settings->setCSSStickyPositionEnabled(prefs.css_sticky_position_enabled); |
289 settings->setExperimentalCSSCustomFilterEnabled(prefs.css_shaders_enabled); | 289 settings->setExperimentalCSSCustomFilterEnabled(prefs.css_shaders_enabled); |
290 settings->setExperimentalCSSGridLayoutEnabled(prefs.css_grid_layout_enabled); | 290 settings->setExperimentalCSSGridLayoutEnabled(prefs.css_grid_layout_enabled); |
| 291 settings->setRegionBasedColumnsEnabled(prefs.region_based_columns_enabled); |
291 | 292 |
292 WebRuntimeFeatures::enableLazyLayout(prefs.lazy_layout_enabled); | 293 WebRuntimeFeatures::enableLazyLayout(prefs.lazy_layout_enabled); |
293 WebRuntimeFeatures::enableTouch(prefs.touch_enabled); | 294 WebRuntimeFeatures::enableTouch(prefs.touch_enabled); |
294 settings->setDeviceSupportsTouch(prefs.device_supports_touch); | 295 settings->setDeviceSupportsTouch(prefs.device_supports_touch); |
295 settings->setDeviceSupportsMouse(prefs.device_supports_mouse); | 296 settings->setDeviceSupportsMouse(prefs.device_supports_mouse); |
296 settings->setEnableTouchAdjustment(prefs.touch_adjustment_enabled); | 297 settings->setEnableTouchAdjustment(prefs.touch_adjustment_enabled); |
297 | 298 |
298 settings->setFixedPositionCreatesStackingContext( | 299 settings->setFixedPositionCreatesStackingContext( |
299 prefs.fixed_position_creates_stacking_context); | 300 prefs.fixed_position_creates_stacking_context); |
300 | 301 |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
337 | 338 |
338 WebNetworkStateNotifier::setOnLine(prefs.is_online); | 339 WebNetworkStateNotifier::setOnLine(prefs.is_online); |
339 settings->setExperimentalWebSocketEnabled( | 340 settings->setExperimentalWebSocketEnabled( |
340 prefs.experimental_websocket_enabled); | 341 prefs.experimental_websocket_enabled); |
341 settings->setPinchVirtualViewportEnabled( | 342 settings->setPinchVirtualViewportEnabled( |
342 prefs.pinch_virtual_viewport_enabled); | 343 prefs.pinch_virtual_viewport_enabled); |
343 } | 344 } |
344 | 345 |
345 | 346 |
346 } // namespace webkit_glue | 347 } // namespace webkit_glue |
OLD | NEW |