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/WebCompositor.h" | 9 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositor.h" |
10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNetworkStateNotifi
er.h" | 10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNetworkStateNotifi
er.h" |
(...skipping 20 matching lines...) Expand all Loading... |
31 // "Zyyy" is the ISO 15924 script code for undetermined script aka Common. | 31 // "Zyyy" is the ISO 15924 script code for undetermined script aka Common. |
32 const char WebPreferences::kCommonScript[] = "Zyyy"; | 32 const char WebPreferences::kCommonScript[] = "Zyyy"; |
33 | 33 |
34 WebPreferences::WebPreferences() | 34 WebPreferences::WebPreferences() |
35 : default_font_size(16), | 35 : default_font_size(16), |
36 default_fixed_font_size(13), | 36 default_fixed_font_size(13), |
37 minimum_font_size(0), | 37 minimum_font_size(0), |
38 minimum_logical_font_size(6), | 38 minimum_logical_font_size(6), |
39 default_device_scale_factor(1), | 39 default_device_scale_factor(1), |
40 default_encoding("ISO-8859-1"), | 40 default_encoding("ISO-8859-1"), |
| 41 apply_default_device_scale_factor_in_compositor(false), |
41 javascript_enabled(true), | 42 javascript_enabled(true), |
42 web_security_enabled(true), | 43 web_security_enabled(true), |
43 javascript_can_open_windows_automatically(true), | 44 javascript_can_open_windows_automatically(true), |
44 loads_images_automatically(true), | 45 loads_images_automatically(true), |
45 images_enabled(true), | 46 images_enabled(true), |
46 plugins_enabled(true), | 47 plugins_enabled(true), |
47 dom_paste_enabled(false), // enables execCommand("paste") | 48 dom_paste_enabled(false), // enables execCommand("paste") |
48 developer_extras_enabled(false), // Requires extra work by embedder | 49 developer_extras_enabled(false), // Requires extra work by embedder |
49 site_specific_quirks_enabled(false), | 50 site_specific_quirks_enabled(false), |
50 shrinks_standalone_images_to_fit(true), | 51 shrinks_standalone_images_to_fit(true), |
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
191 ApplyFontsFromMap(cursive_font_family_map, setCursiveFontFamilyWrapper, | 192 ApplyFontsFromMap(cursive_font_family_map, setCursiveFontFamilyWrapper, |
192 settings); | 193 settings); |
193 ApplyFontsFromMap(fantasy_font_family_map, setFantasyFontFamilyWrapper, | 194 ApplyFontsFromMap(fantasy_font_family_map, setFantasyFontFamilyWrapper, |
194 settings); | 195 settings); |
195 settings->setDefaultFontSize(default_font_size); | 196 settings->setDefaultFontSize(default_font_size); |
196 settings->setDefaultFixedFontSize(default_fixed_font_size); | 197 settings->setDefaultFixedFontSize(default_fixed_font_size); |
197 settings->setMinimumFontSize(minimum_font_size); | 198 settings->setMinimumFontSize(minimum_font_size); |
198 settings->setMinimumLogicalFontSize(minimum_logical_font_size); | 199 settings->setMinimumLogicalFontSize(minimum_logical_font_size); |
199 settings->setDefaultDeviceScaleFactor(default_device_scale_factor); | 200 settings->setDefaultDeviceScaleFactor(default_device_scale_factor); |
200 settings->setDefaultTextEncodingName(ASCIIToUTF16(default_encoding)); | 201 settings->setDefaultTextEncodingName(ASCIIToUTF16(default_encoding)); |
| 202 settings->setApplyDefaultDeviceScaleFactorInCompositor( |
| 203 apply_default_device_scale_factor_in_compositor); |
201 settings->setJavaScriptEnabled(javascript_enabled); | 204 settings->setJavaScriptEnabled(javascript_enabled); |
202 settings->setWebSecurityEnabled(web_security_enabled); | 205 settings->setWebSecurityEnabled(web_security_enabled); |
203 settings->setJavaScriptCanOpenWindowsAutomatically( | 206 settings->setJavaScriptCanOpenWindowsAutomatically( |
204 javascript_can_open_windows_automatically); | 207 javascript_can_open_windows_automatically); |
205 settings->setLoadsImagesAutomatically(loads_images_automatically); | 208 settings->setLoadsImagesAutomatically(loads_images_automatically); |
206 settings->setImagesEnabled(images_enabled); | 209 settings->setImagesEnabled(images_enabled); |
207 settings->setPluginsEnabled(plugins_enabled); | 210 settings->setPluginsEnabled(plugins_enabled); |
208 settings->setDOMPasteAllowed(dom_paste_enabled); | 211 settings->setDOMPasteAllowed(dom_paste_enabled); |
209 settings->setDeveloperExtrasEnabled(developer_extras_enabled); | 212 settings->setDeveloperExtrasEnabled(developer_extras_enabled); |
210 settings->setNeedsSiteSpecificQuirks(site_specific_quirks_enabled); | 213 settings->setNeedsSiteSpecificQuirks(site_specific_quirks_enabled); |
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
362 | 365 |
363 settings->setDefaultTileSize( | 366 settings->setDefaultTileSize( |
364 WebSize(default_tile_width, default_tile_height)); | 367 WebSize(default_tile_width, default_tile_height)); |
365 settings->setMaxUntiledLayerSize( | 368 settings->setMaxUntiledLayerSize( |
366 WebSize(max_untiled_layer_width, max_untiled_layer_height)); | 369 WebSize(max_untiled_layer_width, max_untiled_layer_height)); |
367 | 370 |
368 WebNetworkStateNotifier::setOnLine(is_online); | 371 WebNetworkStateNotifier::setOnLine(is_online); |
369 } | 372 } |
370 | 373 |
371 } // namespace webkit_glue | 374 } // namespace webkit_glue |
OLD | NEW |