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 "webkit/glue/webpreferences.h" | 5 #include "webkit/glue/webpreferences.h" |
6 | 6 |
7 #include "base/string_util.h" | 7 #include "base/string_util.h" |
8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
96 gesture_tap_highlight_enabled(false), | 96 gesture_tap_highlight_enabled(false), |
97 accelerated_plugins_enabled(false), | 97 accelerated_plugins_enabled(false), |
98 memory_info_enabled(false), | 98 memory_info_enabled(false), |
99 fullscreen_enabled(false), | 99 fullscreen_enabled(false), |
100 allow_displaying_insecure_content(true), | 100 allow_displaying_insecure_content(true), |
101 allow_running_insecure_content(false), | 101 allow_running_insecure_content(false), |
102 #if defined(OS_ANDROID) | 102 #if defined(OS_ANDROID) |
103 font_scale_factor(1.0f), | 103 font_scale_factor(1.0f), |
104 force_enable_zoom(false), | 104 force_enable_zoom(false), |
105 user_gesture_required_for_media_playback(true), | 105 user_gesture_required_for_media_playback(true), |
106 support_multiple_windows(true), | |
benm (inactive)
2012/10/19 11:02:59
should this default to false to match the legacy W
mnaganov (inactive)
2012/10/19 15:46:39
For WebView, we have default settings in ContentSe
| |
106 #endif | 107 #endif |
107 password_echo_enabled(false), | 108 password_echo_enabled(false), |
108 should_print_backgrounds(false), | 109 should_print_backgrounds(false), |
109 enable_scroll_animator(false), | 110 enable_scroll_animator(false), |
110 visual_word_movement_enabled(false), | 111 visual_word_movement_enabled(false), |
111 css_sticky_position_enabled(false), | 112 css_sticky_position_enabled(false), |
112 css_regions_enabled(false), | 113 css_regions_enabled(false), |
113 css_shaders_enabled(false), | 114 css_shaders_enabled(false), |
114 css_variables_enabled(false), | 115 css_variables_enabled(false), |
115 device_supports_touch(false), | 116 device_supports_touch(false), |
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
407 | 408 |
408 settings->setFullScreenEnabled(fullscreen_enabled); | 409 settings->setFullScreenEnabled(fullscreen_enabled); |
409 settings->setAllowDisplayOfInsecureContent(allow_displaying_insecure_content); | 410 settings->setAllowDisplayOfInsecureContent(allow_displaying_insecure_content); |
410 settings->setAllowRunningOfInsecureContent(allow_running_insecure_content); | 411 settings->setAllowRunningOfInsecureContent(allow_running_insecure_content); |
411 #if defined(OS_ANDROID) | 412 #if defined(OS_ANDROID) |
412 settings->setTextAutosizingFontScaleFactor(font_scale_factor); | 413 settings->setTextAutosizingFontScaleFactor(font_scale_factor); |
413 web_view->setIgnoreViewportTagMaximumScale(force_enable_zoom); | 414 web_view->setIgnoreViewportTagMaximumScale(force_enable_zoom); |
414 settings->setAutoZoomFocusedNodeToLegibleScale(true); | 415 settings->setAutoZoomFocusedNodeToLegibleScale(true); |
415 settings->setMediaPlaybackRequiresUserGesture( | 416 settings->setMediaPlaybackRequiresUserGesture( |
416 user_gesture_required_for_media_playback); | 417 user_gesture_required_for_media_playback); |
418 settings->setSupportMultipleWindows(support_multiple_windows); | |
417 #endif | 419 #endif |
418 settings->setPasswordEchoEnabled(password_echo_enabled); | 420 settings->setPasswordEchoEnabled(password_echo_enabled); |
419 settings->setShouldPrintBackgrounds(should_print_backgrounds); | 421 settings->setShouldPrintBackgrounds(should_print_backgrounds); |
420 settings->setEnableScrollAnimator(enable_scroll_animator); | 422 settings->setEnableScrollAnimator(enable_scroll_animator); |
421 settings->setVisualWordMovementEnabled(visual_word_movement_enabled); | 423 settings->setVisualWordMovementEnabled(visual_word_movement_enabled); |
422 | 424 |
423 settings->setCSSStickyPositionEnabled(css_sticky_position_enabled); | 425 settings->setCSSStickyPositionEnabled(css_sticky_position_enabled); |
424 settings->setExperimentalCSSRegionsEnabled(css_regions_enabled); | 426 settings->setExperimentalCSSRegionsEnabled(css_regions_enabled); |
425 settings->setExperimentalCSSCustomFilterEnabled(css_shaders_enabled); | 427 settings->setExperimentalCSSCustomFilterEnabled(css_shaders_enabled); |
426 settings->setExperimentalCSSVariablesEnabled(css_variables_enabled); | 428 settings->setExperimentalCSSVariablesEnabled(css_variables_enabled); |
427 | 429 |
428 settings->setDeviceSupportsTouch(device_supports_touch); | 430 settings->setDeviceSupportsTouch(device_supports_touch); |
429 settings->setDeviceSupportsMouse(device_supports_mouse); | 431 settings->setDeviceSupportsMouse(device_supports_mouse); |
430 | 432 |
431 settings->setDefaultTileSize( | 433 settings->setDefaultTileSize( |
432 WebSize(default_tile_width, default_tile_height)); | 434 WebSize(default_tile_width, default_tile_height)); |
433 settings->setMaxUntiledLayerSize( | 435 settings->setMaxUntiledLayerSize( |
434 WebSize(max_untiled_layer_width, max_untiled_layer_height)); | 436 WebSize(max_untiled_layer_width, max_untiled_layer_height)); |
435 | 437 |
436 settings->setFixedPositionCreatesStackingContext( | 438 settings->setFixedPositionCreatesStackingContext( |
437 fixed_position_creates_stacking_context); | 439 fixed_position_creates_stacking_context); |
438 | 440 |
439 settings->setApplyPageScaleFactorInCompositor( | 441 settings->setApplyPageScaleFactorInCompositor( |
440 apply_page_scale_factor_in_compositor); | 442 apply_page_scale_factor_in_compositor); |
441 | 443 |
442 WebNetworkStateNotifier::setOnLine(is_online); | 444 WebNetworkStateNotifier::setOnLine(is_online); |
443 } | 445 } |
444 | 446 |
445 } // namespace webkit_glue | 447 } // namespace webkit_glue |
OLD | NEW |