| 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 <unicode/uchar.h> | 7 #include <unicode/uchar.h> |
| 8 | 8 |
| 9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
| 10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 96 memory_info_enabled(false), | 96 memory_info_enabled(false), |
| 97 interactive_form_validation_enabled(true), | 97 interactive_form_validation_enabled(true), |
| 98 fullscreen_enabled(false), | 98 fullscreen_enabled(false), |
| 99 allow_displaying_insecure_content(true), | 99 allow_displaying_insecure_content(true), |
| 100 allow_running_insecure_content(false), | 100 allow_running_insecure_content(false), |
| 101 password_echo_enabled(false), | 101 password_echo_enabled(false), |
| 102 should_print_backgrounds(false), | 102 should_print_backgrounds(false), |
| 103 enable_scroll_animator(false), | 103 enable_scroll_animator(false), |
| 104 hixie76_websocket_protocol_enabled(false), | 104 hixie76_websocket_protocol_enabled(false), |
| 105 visual_word_movement_enabled(false), | 105 visual_word_movement_enabled(false), |
| 106 per_tile_painting_enabled(false) { | 106 per_tile_painting_enabled(false), |
| 107 css_regions_enabled(false) { |
| 107 } | 108 } |
| 108 | 109 |
| 109 WebPreferences::~WebPreferences() { | 110 WebPreferences::~WebPreferences() { |
| 110 } | 111 } |
| 111 | 112 |
| 112 namespace { | 113 namespace { |
| 113 | 114 |
| 114 void setStandardFontFamilyWrapper(WebSettings* settings, | 115 void setStandardFontFamilyWrapper(WebSettings* settings, |
| 115 const string16& font, | 116 const string16& font, |
| 116 UScriptCode script) { | 117 UScriptCode script) { |
| (...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 345 settings->setPasswordEchoEnabled(password_echo_enabled); | 346 settings->setPasswordEchoEnabled(password_echo_enabled); |
| 346 settings->setShouldPrintBackgrounds(should_print_backgrounds); | 347 settings->setShouldPrintBackgrounds(should_print_backgrounds); |
| 347 settings->setEnableScrollAnimator(enable_scroll_animator); | 348 settings->setEnableScrollAnimator(enable_scroll_animator); |
| 348 settings->setHixie76WebSocketProtocolEnabled( | 349 settings->setHixie76WebSocketProtocolEnabled( |
| 349 hixie76_websocket_protocol_enabled); | 350 hixie76_websocket_protocol_enabled); |
| 350 settings->setVisualWordMovementEnabled(visual_word_movement_enabled); | 351 settings->setVisualWordMovementEnabled(visual_word_movement_enabled); |
| 351 | 352 |
| 352 // Enable per-tile painting if requested on the command line. | 353 // Enable per-tile painting if requested on the command line. |
| 353 settings->setPerTilePaintingEnabled(per_tile_painting_enabled); | 354 settings->setPerTilePaintingEnabled(per_tile_painting_enabled); |
| 354 | 355 |
| 356 settings->setExperimentalCSSRegionsEnabled(css_regions_enabled); |
| 357 |
| 355 WebNetworkStateNotifier::setOnLine(is_online); | 358 WebNetworkStateNotifier::setOnLine(is_online); |
| 356 } | 359 } |
| OLD | NEW |