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

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

Issue 10815069: Add CSS variables feature flag to chrome://flags. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix roland's feedback. Created 8 years, 5 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 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 memory_info_enabled(false), 95 memory_info_enabled(false),
96 fullscreen_enabled(false), 96 fullscreen_enabled(false),
97 allow_displaying_insecure_content(true), 97 allow_displaying_insecure_content(true),
98 allow_running_insecure_content(false), 98 allow_running_insecure_content(false),
99 password_echo_enabled(false), 99 password_echo_enabled(false),
100 should_print_backgrounds(false), 100 should_print_backgrounds(false),
101 enable_scroll_animator(false), 101 enable_scroll_animator(false),
102 visual_word_movement_enabled(false), 102 visual_word_movement_enabled(false),
103 css_regions_enabled(false), 103 css_regions_enabled(false),
104 css_shaders_enabled(false), 104 css_shaders_enabled(false),
105 css_variables_enabled(false),
105 device_supports_touch(false), 106 device_supports_touch(false),
106 device_supports_mouse(true), 107 device_supports_mouse(true),
107 #if !defined(WEBCOMPOSITOR_OWNS_SETTINGS) 108 #if !defined(WEBCOMPOSITOR_OWNS_SETTINGS)
108 threaded_animation_enabled(false), 109 threaded_animation_enabled(false),
109 per_tile_painting_enabled(false), 110 per_tile_painting_enabled(false),
110 partial_swap_enabled(false), 111 partial_swap_enabled(false),
111 #endif 112 #endif
112 default_tile_width(256), 113 default_tile_width(256),
113 default_tile_height(256), 114 default_tile_height(256),
114 max_untiled_layer_width(512), 115 max_untiled_layer_width(512),
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 settings->setFullScreenEnabled(fullscreen_enabled); 381 settings->setFullScreenEnabled(fullscreen_enabled);
381 settings->setAllowDisplayOfInsecureContent(allow_displaying_insecure_content); 382 settings->setAllowDisplayOfInsecureContent(allow_displaying_insecure_content);
382 settings->setAllowRunningOfInsecureContent(allow_running_insecure_content); 383 settings->setAllowRunningOfInsecureContent(allow_running_insecure_content);
383 settings->setPasswordEchoEnabled(password_echo_enabled); 384 settings->setPasswordEchoEnabled(password_echo_enabled);
384 settings->setShouldPrintBackgrounds(should_print_backgrounds); 385 settings->setShouldPrintBackgrounds(should_print_backgrounds);
385 settings->setEnableScrollAnimator(enable_scroll_animator); 386 settings->setEnableScrollAnimator(enable_scroll_animator);
386 settings->setVisualWordMovementEnabled(visual_word_movement_enabled); 387 settings->setVisualWordMovementEnabled(visual_word_movement_enabled);
387 388
388 settings->setExperimentalCSSRegionsEnabled(css_regions_enabled); 389 settings->setExperimentalCSSRegionsEnabled(css_regions_enabled);
389 settings->setExperimentalCSSCustomFilterEnabled(css_shaders_enabled); 390 settings->setExperimentalCSSCustomFilterEnabled(css_shaders_enabled);
391 settings->setExperimentalCSSVariablesEnabled(css_variables_enabled);
390 392
391 settings->setDeviceSupportsTouch(device_supports_touch); 393 settings->setDeviceSupportsTouch(device_supports_touch);
392 settings->setDeviceSupportsMouse(device_supports_mouse); 394 settings->setDeviceSupportsMouse(device_supports_mouse);
393 395
394 #if !defined(WEBCOMPOSITOR_OWNS_SETTINGS) 396 #if !defined(WEBCOMPOSITOR_OWNS_SETTINGS)
395 settings->setThreadedAnimationEnabled(threaded_animation_enabled); 397 settings->setThreadedAnimationEnabled(threaded_animation_enabled);
396 398
397 // Enable per-tile painting if requested on the command line. 399 // Enable per-tile painting if requested on the command line.
398 settings->setPerTilePaintingEnabled(per_tile_painting_enabled); 400 settings->setPerTilePaintingEnabled(per_tile_painting_enabled);
399 401
400 // Enable partial swaps if specified form the command line. 402 // Enable partial swaps if specified form the command line.
401 settings->setPartialSwapEnabled(partial_swap_enabled); 403 settings->setPartialSwapEnabled(partial_swap_enabled);
402 #endif 404 #endif
403 405
404 settings->setDefaultTileSize( 406 settings->setDefaultTileSize(
405 WebSize(default_tile_width, default_tile_height)); 407 WebSize(default_tile_width, default_tile_height));
406 settings->setMaxUntiledLayerSize( 408 settings->setMaxUntiledLayerSize(
407 WebSize(max_untiled_layer_width, max_untiled_layer_height)); 409 WebSize(max_untiled_layer_width, max_untiled_layer_height));
408 410
409 settings->setFixedPositionCreatesStackingContext( 411 settings->setFixedPositionCreatesStackingContext(
410 fixed_position_creates_stacking_context); 412 fixed_position_creates_stacking_context);
411 413
412 WebNetworkStateNotifier::setOnLine(is_online); 414 WebNetworkStateNotifier::setOnLine(is_online);
413 } 415 }
414 416
415 } // namespace webkit_glue 417 } // 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