Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(123)

Side by Side Diff: webkit/glue/webpreferences.cc

Issue 9500015: Pass DefaultDeviceScaleFactor to webkit (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Style nit Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webkit/glue/webpreferences.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 18 matching lines...) Expand all
29 : standard_font_family(ASCIIToUTF16("Times New Roman")), 29 : standard_font_family(ASCIIToUTF16("Times New Roman")),
30 fixed_font_family(ASCIIToUTF16("Courier New")), 30 fixed_font_family(ASCIIToUTF16("Courier New")),
31 serif_font_family(ASCIIToUTF16("Times New Roman")), 31 serif_font_family(ASCIIToUTF16("Times New Roman")),
32 sans_serif_font_family(ASCIIToUTF16("Arial")), 32 sans_serif_font_family(ASCIIToUTF16("Arial")),
33 cursive_font_family(ASCIIToUTF16("Script")), 33 cursive_font_family(ASCIIToUTF16("Script")),
34 fantasy_font_family(), // Not sure what to use on Windows. 34 fantasy_font_family(), // Not sure what to use on Windows.
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_encoding("ISO-8859-1"), 40 default_encoding("ISO-8859-1"),
40 javascript_enabled(true), 41 javascript_enabled(true),
41 web_security_enabled(true), 42 web_security_enabled(true),
42 javascript_can_open_windows_automatically(true), 43 javascript_can_open_windows_automatically(true),
43 loads_images_automatically(true), 44 loads_images_automatically(true),
44 images_enabled(true), 45 images_enabled(true),
45 plugins_enabled(true), 46 plugins_enabled(true),
46 dom_paste_enabled(false), // enables execCommand("paste") 47 dom_paste_enabled(false), // enables execCommand("paste")
47 developer_extras_enabled(false), // Requires extra work by embedder 48 developer_extras_enabled(false), // Requires extra work by embedder
48 site_specific_quirks_enabled(false), 49 site_specific_quirks_enabled(false),
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 ApplyFontsFromMap(sans_serif_font_family_map, setSansSerifFontFamilyWrapper, 179 ApplyFontsFromMap(sans_serif_font_family_map, setSansSerifFontFamilyWrapper,
179 settings); 180 settings);
180 ApplyFontsFromMap(cursive_font_family_map, setCursiveFontFamilyWrapper, 181 ApplyFontsFromMap(cursive_font_family_map, setCursiveFontFamilyWrapper,
181 settings); 182 settings);
182 ApplyFontsFromMap(fantasy_font_family_map, setFantasyFontFamilyWrapper, 183 ApplyFontsFromMap(fantasy_font_family_map, setFantasyFontFamilyWrapper,
183 settings); 184 settings);
184 settings->setDefaultFontSize(default_font_size); 185 settings->setDefaultFontSize(default_font_size);
185 settings->setDefaultFixedFontSize(default_fixed_font_size); 186 settings->setDefaultFixedFontSize(default_fixed_font_size);
186 settings->setMinimumFontSize(minimum_font_size); 187 settings->setMinimumFontSize(minimum_font_size);
187 settings->setMinimumLogicalFontSize(minimum_logical_font_size); 188 settings->setMinimumLogicalFontSize(minimum_logical_font_size);
189 settings->setDefaultDeviceScaleFactor(default_device_scale_factor);
188 settings->setDefaultTextEncodingName(ASCIIToUTF16(default_encoding)); 190 settings->setDefaultTextEncodingName(ASCIIToUTF16(default_encoding));
189 settings->setJavaScriptEnabled(javascript_enabled); 191 settings->setJavaScriptEnabled(javascript_enabled);
190 settings->setWebSecurityEnabled(web_security_enabled); 192 settings->setWebSecurityEnabled(web_security_enabled);
191 settings->setJavaScriptCanOpenWindowsAutomatically( 193 settings->setJavaScriptCanOpenWindowsAutomatically(
192 javascript_can_open_windows_automatically); 194 javascript_can_open_windows_automatically);
193 settings->setLoadsImagesAutomatically(loads_images_automatically); 195 settings->setLoadsImagesAutomatically(loads_images_automatically);
194 settings->setImagesEnabled(images_enabled); 196 settings->setImagesEnabled(images_enabled);
195 settings->setPluginsEnabled(plugins_enabled); 197 settings->setPluginsEnabled(plugins_enabled);
196 settings->setDOMPasteAllowed(dom_paste_enabled); 198 settings->setDOMPasteAllowed(dom_paste_enabled);
197 settings->setDeveloperExtrasEnabled(developer_extras_enabled); 199 settings->setDeveloperExtrasEnabled(developer_extras_enabled);
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
347 settings->setEnableScrollAnimator(enable_scroll_animator); 349 settings->setEnableScrollAnimator(enable_scroll_animator);
348 settings->setHixie76WebSocketProtocolEnabled( 350 settings->setHixie76WebSocketProtocolEnabled(
349 hixie76_websocket_protocol_enabled); 351 hixie76_websocket_protocol_enabled);
350 settings->setVisualWordMovementEnabled(visual_word_movement_enabled); 352 settings->setVisualWordMovementEnabled(visual_word_movement_enabled);
351 353
352 // Enable per-tile painting if requested on the command line. 354 // Enable per-tile painting if requested on the command line.
353 settings->setPerTilePaintingEnabled(per_tile_painting_enabled); 355 settings->setPerTilePaintingEnabled(per_tile_painting_enabled);
354 356
355 WebNetworkStateNotifier::setOnLine(is_online); 357 WebNetworkStateNotifier::setOnLine(is_online);
356 } 358 }
OLDNEW
« no previous file with comments | « webkit/glue/webpreferences.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698