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

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

Issue 10827267: Remove unused include and always-true compile-time check (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 8 years, 4 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/WebNetworkStateNotifi er.h" 9 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNetworkStateNotifi er.h"
10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" 10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 allow_running_insecure_content(false), 99 allow_running_insecure_content(false),
100 password_echo_enabled(false), 100 password_echo_enabled(false),
101 should_print_backgrounds(false), 101 should_print_backgrounds(false),
102 enable_scroll_animator(false), 102 enable_scroll_animator(false),
103 visual_word_movement_enabled(false), 103 visual_word_movement_enabled(false),
104 css_regions_enabled(false), 104 css_regions_enabled(false),
105 css_shaders_enabled(false), 105 css_shaders_enabled(false),
106 css_variables_enabled(false), 106 css_variables_enabled(false),
107 device_supports_touch(false), 107 device_supports_touch(false),
108 device_supports_mouse(true), 108 device_supports_mouse(true),
109 #if !defined(WEBCOMPOSITOR_OWNS_SETTINGS)
110 threaded_animation_enabled(false),
111 per_tile_painting_enabled(false),
112 partial_swap_enabled(false),
113 #endif
114 default_tile_width(256), 109 default_tile_width(256),
115 default_tile_height(256), 110 default_tile_height(256),
116 max_untiled_layer_width(512), 111 max_untiled_layer_width(512),
117 max_untiled_layer_height(512), 112 max_untiled_layer_height(512),
118 fixed_position_creates_stacking_context(false), 113 fixed_position_creates_stacking_context(false),
119 sync_xhr_in_documents_enabled(true), 114 sync_xhr_in_documents_enabled(true),
120 number_of_cpu_cores(1), 115 number_of_cpu_cores(1),
121 cookie_enabled(true) { 116 cookie_enabled(true) {
122 standard_font_family_map[kCommonScript] = 117 standard_font_family_map[kCommonScript] =
123 ASCIIToUTF16("Times New Roman"); 118 ASCIIToUTF16("Times New Roman");
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 settings->setEnableScrollAnimator(enable_scroll_animator); 385 settings->setEnableScrollAnimator(enable_scroll_animator);
391 settings->setVisualWordMovementEnabled(visual_word_movement_enabled); 386 settings->setVisualWordMovementEnabled(visual_word_movement_enabled);
392 387
393 settings->setExperimentalCSSRegionsEnabled(css_regions_enabled); 388 settings->setExperimentalCSSRegionsEnabled(css_regions_enabled);
394 settings->setExperimentalCSSCustomFilterEnabled(css_shaders_enabled); 389 settings->setExperimentalCSSCustomFilterEnabled(css_shaders_enabled);
395 settings->setExperimentalCSSVariablesEnabled(css_variables_enabled); 390 settings->setExperimentalCSSVariablesEnabled(css_variables_enabled);
396 391
397 settings->setDeviceSupportsTouch(device_supports_touch); 392 settings->setDeviceSupportsTouch(device_supports_touch);
398 settings->setDeviceSupportsMouse(device_supports_mouse); 393 settings->setDeviceSupportsMouse(device_supports_mouse);
399 394
400 #if !defined(WEBCOMPOSITOR_OWNS_SETTINGS)
401 settings->setThreadedAnimationEnabled(threaded_animation_enabled);
402
403 // Enable per-tile painting if requested on the command line.
404 settings->setPerTilePaintingEnabled(per_tile_painting_enabled);
405
406 // Enable partial swaps if specified form the command line.
407 settings->setPartialSwapEnabled(partial_swap_enabled);
408 #endif
409
410 settings->setDefaultTileSize( 395 settings->setDefaultTileSize(
411 WebSize(default_tile_width, default_tile_height)); 396 WebSize(default_tile_width, default_tile_height));
412 settings->setMaxUntiledLayerSize( 397 settings->setMaxUntiledLayerSize(
413 WebSize(max_untiled_layer_width, max_untiled_layer_height)); 398 WebSize(max_untiled_layer_width, max_untiled_layer_height));
414 399
415 settings->setFixedPositionCreatesStackingContext( 400 settings->setFixedPositionCreatesStackingContext(
416 fixed_position_creates_stacking_context); 401 fixed_position_creates_stacking_context);
417 402
418 WebNetworkStateNotifier::setOnLine(is_online); 403 WebNetworkStateNotifier::setOnLine(is_online);
419 } 404 }
420 405
421 } // namespace webkit_glue 406 } // 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