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 <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 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
269 | 269 |
270 // Display the current compositor tree as overlay if requested on | 270 // Display the current compositor tree as overlay if requested on |
271 // the command line | 271 // the command line |
272 settings->setShowPlatformLayerTree(show_composited_layer_tree); | 272 settings->setShowPlatformLayerTree(show_composited_layer_tree); |
273 | 273 |
274 settings->setThreadedAnimationEnabled(threaded_animation_enabled); | 274 settings->setThreadedAnimationEnabled(threaded_animation_enabled); |
275 | 275 |
276 // Enable gpu-accelerated compositing if requested on the command line. | 276 // Enable gpu-accelerated compositing if requested on the command line. |
277 settings->setAcceleratedCompositingEnabled(accelerated_compositing_enabled); | 277 settings->setAcceleratedCompositingEnabled(accelerated_compositing_enabled); |
278 | 278 |
279 #ifndef WEBCOMPOSITOR_HAS_INITIALIZE | |
280 settings->setUseThreadedCompositor(threaded_compositing_enabled); | |
281 #endif | |
282 | |
283 // Always enter compositing if requested on the command line. | 279 // Always enter compositing if requested on the command line. |
284 settings->setForceCompositingMode(force_compositing_mode); | 280 settings->setForceCompositingMode(force_compositing_mode); |
285 | 281 |
286 // Enable composite to offscreen texture if requested on the command line. | 282 // Enable composite to offscreen texture if requested on the command line. |
287 settings->setCompositeToTextureEnabled(composite_to_texture_enabled); | 283 settings->setCompositeToTextureEnabled(composite_to_texture_enabled); |
288 | 284 |
289 // Enable compositing for fixed position elements if requested | 285 // Enable compositing for fixed position elements if requested |
290 // on the command line. | 286 // on the command line. |
291 settings->setAcceleratedCompositingForFixedPositionEnabled( | 287 settings->setAcceleratedCompositingForFixedPositionEnabled( |
292 fixed_position_compositing_enabled); | 288 fixed_position_compositing_enabled); |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
352 hixie76_websocket_protocol_enabled); | 348 hixie76_websocket_protocol_enabled); |
353 settings->setVisualWordMovementEnabled(visual_word_movement_enabled); | 349 settings->setVisualWordMovementEnabled(visual_word_movement_enabled); |
354 | 350 |
355 // Enable per-tile painting if requested on the command line. | 351 // Enable per-tile painting if requested on the command line. |
356 settings->setPerTilePaintingEnabled(per_tile_painting_enabled); | 352 settings->setPerTilePaintingEnabled(per_tile_painting_enabled); |
357 | 353 |
358 settings->setExperimentalCSSRegionsEnabled(css_regions_enabled); | 354 settings->setExperimentalCSSRegionsEnabled(css_regions_enabled); |
359 | 355 |
360 WebNetworkStateNotifier::setOnLine(is_online); | 356 WebNetworkStateNotifier::setOnLine(is_online); |
361 } | 357 } |
OLD | NEW |