| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 88 accelerated_filters_enabled(false), | 88 accelerated_filters_enabled(false), |
| 89 accelerated_plugins_enabled(false), | 89 accelerated_plugins_enabled(false), |
| 90 memory_info_enabled(false), | 90 memory_info_enabled(false), |
| 91 interactive_form_validation_enabled(true), | 91 interactive_form_validation_enabled(true), |
| 92 fullscreen_enabled(false), | 92 fullscreen_enabled(false), |
| 93 allow_displaying_insecure_content(true), | 93 allow_displaying_insecure_content(true), |
| 94 allow_running_insecure_content(false), | 94 allow_running_insecure_content(false), |
| 95 should_print_backgrounds(false), | 95 should_print_backgrounds(false), |
| 96 enable_scroll_animator(false), | 96 enable_scroll_animator(false), |
| 97 hixie76_websocket_protocol_enabled(false), | 97 hixie76_websocket_protocol_enabled(false), |
| 98 visual_word_movement_enabled(false) { | 98 visual_word_movement_enabled(false), |
| 99 per_tile_drawing_enabled(false) { |
| 99 } | 100 } |
| 100 | 101 |
| 101 WebPreferences::~WebPreferences() { | 102 WebPreferences::~WebPreferences() { |
| 102 } | 103 } |
| 103 | 104 |
| 104 namespace { | 105 namespace { |
| 105 | 106 |
| 106 void setStandardFontFamilyWrapper(WebSettings* settings, | 107 void setStandardFontFamilyWrapper(WebSettings* settings, |
| 107 const string16& font, | 108 const string16& font, |
| 108 UScriptCode script) { | 109 UScriptCode script) { |
| (...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 321 | 322 |
| 322 settings->setFullScreenEnabled(fullscreen_enabled); | 323 settings->setFullScreenEnabled(fullscreen_enabled); |
| 323 settings->setAllowDisplayOfInsecureContent(allow_displaying_insecure_content); | 324 settings->setAllowDisplayOfInsecureContent(allow_displaying_insecure_content); |
| 324 settings->setAllowRunningOfInsecureContent(allow_running_insecure_content); | 325 settings->setAllowRunningOfInsecureContent(allow_running_insecure_content); |
| 325 settings->setShouldPrintBackgrounds(should_print_backgrounds); | 326 settings->setShouldPrintBackgrounds(should_print_backgrounds); |
| 326 settings->setEnableScrollAnimator(enable_scroll_animator); | 327 settings->setEnableScrollAnimator(enable_scroll_animator); |
| 327 settings->setHixie76WebSocketProtocolEnabled( | 328 settings->setHixie76WebSocketProtocolEnabled( |
| 328 hixie76_websocket_protocol_enabled); | 329 hixie76_websocket_protocol_enabled); |
| 329 settings->setVisualWordMovementEnabled(visual_word_movement_enabled); | 330 settings->setVisualWordMovementEnabled(visual_word_movement_enabled); |
| 330 | 331 |
| 332 // Enable per-tile drawing if requested on the command line. |
| 333 settings->setPerTileDrawingEnabled(per_tile_drawing_enabled); |
| 334 |
| 331 WebNetworkStateNotifier::setOnLine(is_online); | 335 WebNetworkStateNotifier::setOnLine(is_online); |
| 332 } | 336 } |
| OLD | NEW |