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

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

Issue 10383297: Revert 138415 - Makes the browser send pixels to the GPU process where it should. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 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 | Annotate | Revision Log
« 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 "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
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),
42 javascript_enabled(true), 41 javascript_enabled(true),
43 web_security_enabled(true), 42 web_security_enabled(true),
44 javascript_can_open_windows_automatically(true), 43 javascript_can_open_windows_automatically(true),
45 loads_images_automatically(true), 44 loads_images_automatically(true),
46 images_enabled(true), 45 images_enabled(true),
47 plugins_enabled(true), 46 plugins_enabled(true),
48 dom_paste_enabled(false), // enables execCommand("paste") 47 dom_paste_enabled(false), // enables execCommand("paste")
49 developer_extras_enabled(false), // Requires extra work by embedder 48 developer_extras_enabled(false), // Requires extra work by embedder
50 site_specific_quirks_enabled(false), 49 site_specific_quirks_enabled(false),
51 shrinks_standalone_images_to_fit(true), 50 shrinks_standalone_images_to_fit(true),
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 ApplyFontsFromMap(cursive_font_family_map, setCursiveFontFamilyWrapper, 191 ApplyFontsFromMap(cursive_font_family_map, setCursiveFontFamilyWrapper,
193 settings); 192 settings);
194 ApplyFontsFromMap(fantasy_font_family_map, setFantasyFontFamilyWrapper, 193 ApplyFontsFromMap(fantasy_font_family_map, setFantasyFontFamilyWrapper,
195 settings); 194 settings);
196 settings->setDefaultFontSize(default_font_size); 195 settings->setDefaultFontSize(default_font_size);
197 settings->setDefaultFixedFontSize(default_fixed_font_size); 196 settings->setDefaultFixedFontSize(default_fixed_font_size);
198 settings->setMinimumFontSize(minimum_font_size); 197 settings->setMinimumFontSize(minimum_font_size);
199 settings->setMinimumLogicalFontSize(minimum_logical_font_size); 198 settings->setMinimumLogicalFontSize(minimum_logical_font_size);
200 settings->setDefaultDeviceScaleFactor(default_device_scale_factor); 199 settings->setDefaultDeviceScaleFactor(default_device_scale_factor);
201 settings->setDefaultTextEncodingName(ASCIIToUTF16(default_encoding)); 200 settings->setDefaultTextEncodingName(ASCIIToUTF16(default_encoding));
202 settings->setApplyDefaultDeviceScaleFactorInCompositor(
203 apply_default_device_scale_factor_in_compositor);
204 settings->setJavaScriptEnabled(javascript_enabled); 201 settings->setJavaScriptEnabled(javascript_enabled);
205 settings->setWebSecurityEnabled(web_security_enabled); 202 settings->setWebSecurityEnabled(web_security_enabled);
206 settings->setJavaScriptCanOpenWindowsAutomatically( 203 settings->setJavaScriptCanOpenWindowsAutomatically(
207 javascript_can_open_windows_automatically); 204 javascript_can_open_windows_automatically);
208 settings->setLoadsImagesAutomatically(loads_images_automatically); 205 settings->setLoadsImagesAutomatically(loads_images_automatically);
209 settings->setImagesEnabled(images_enabled); 206 settings->setImagesEnabled(images_enabled);
210 settings->setPluginsEnabled(plugins_enabled); 207 settings->setPluginsEnabled(plugins_enabled);
211 settings->setDOMPasteAllowed(dom_paste_enabled); 208 settings->setDOMPasteAllowed(dom_paste_enabled);
212 settings->setDeveloperExtrasEnabled(developer_extras_enabled); 209 settings->setDeveloperExtrasEnabled(developer_extras_enabled);
213 settings->setNeedsSiteSpecificQuirks(site_specific_quirks_enabled); 210 settings->setNeedsSiteSpecificQuirks(site_specific_quirks_enabled);
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 362
366 settings->setDefaultTileSize( 363 settings->setDefaultTileSize(
367 WebSize(default_tile_width, default_tile_height)); 364 WebSize(default_tile_width, default_tile_height));
368 settings->setMaxUntiledLayerSize( 365 settings->setMaxUntiledLayerSize(
369 WebSize(max_untiled_layer_width, max_untiled_layer_height)); 366 WebSize(max_untiled_layer_width, max_untiled_layer_height));
370 367
371 WebNetworkStateNotifier::setOnLine(is_online); 368 WebNetworkStateNotifier::setOnLine(is_online);
372 } 369 }
373 370
374 } // namespace webkit_glue 371 } // namespace webkit_glue
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