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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
80 accelerated_compositing_enabled(false), | 80 accelerated_compositing_enabled(false), |
81 threaded_compositing_enabled(false), | 81 threaded_compositing_enabled(false), |
82 force_compositing_mode(false), | 82 force_compositing_mode(false), |
83 allow_webui_compositing(false), | 83 allow_webui_compositing(false), |
84 composite_to_texture_enabled(false), | 84 composite_to_texture_enabled(false), |
85 fixed_position_compositing_enabled(false), | 85 fixed_position_compositing_enabled(false), |
86 accelerated_layers_enabled(false), | 86 accelerated_layers_enabled(false), |
87 accelerated_animation_enabled(false), | 87 accelerated_animation_enabled(false), |
88 accelerated_video_enabled(false), | 88 accelerated_video_enabled(false), |
89 accelerated_2d_canvas_enabled(false), | 89 accelerated_2d_canvas_enabled(false), |
| 90 deferred_2d_canvas_enabled(false), |
90 accelerated_painting_enabled(false), | 91 accelerated_painting_enabled(false), |
91 accelerated_filters_enabled(false), | 92 accelerated_filters_enabled(false), |
92 accelerated_plugins_enabled(false), | 93 accelerated_plugins_enabled(false), |
93 partial_swap_enabled(false), | 94 partial_swap_enabled(false), |
94 memory_info_enabled(false), | 95 memory_info_enabled(false), |
95 interactive_form_validation_enabled(true), | 96 interactive_form_validation_enabled(true), |
96 fullscreen_enabled(false), | 97 fullscreen_enabled(false), |
97 allow_displaying_insecure_content(true), | 98 allow_displaying_insecure_content(true), |
98 allow_running_insecure_content(false), | 99 allow_running_insecure_content(false), |
99 should_print_backgrounds(false), | 100 should_print_backgrounds(false), |
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
276 settings->setCompositeToTextureEnabled(composite_to_texture_enabled); | 277 settings->setCompositeToTextureEnabled(composite_to_texture_enabled); |
277 | 278 |
278 // Enable compositing for fixed position elements if requested | 279 // Enable compositing for fixed position elements if requested |
279 // on the command line. | 280 // on the command line. |
280 settings->setAcceleratedCompositingForFixedPositionEnabled( | 281 settings->setAcceleratedCompositingForFixedPositionEnabled( |
281 fixed_position_compositing_enabled); | 282 fixed_position_compositing_enabled); |
282 | 283 |
283 // Enable gpu-accelerated 2d canvas if requested on the command line. | 284 // Enable gpu-accelerated 2d canvas if requested on the command line. |
284 settings->setAccelerated2dCanvasEnabled(accelerated_2d_canvas_enabled); | 285 settings->setAccelerated2dCanvasEnabled(accelerated_2d_canvas_enabled); |
285 | 286 |
| 287 // Enable deferred 2d canvas if requested on the command line. |
| 288 settings->setDeferred2dCanvasEnabled(deferred_2d_canvas_enabled); |
| 289 |
286 // Enable gpu-accelerated painting if requested on the command line. | 290 // Enable gpu-accelerated painting if requested on the command line. |
287 settings->setAcceleratedPaintingEnabled(accelerated_painting_enabled); | 291 settings->setAcceleratedPaintingEnabled(accelerated_painting_enabled); |
288 | 292 |
289 // Enable gpu-accelerated filters if requested on the command line. | 293 // Enable gpu-accelerated filters if requested on the command line. |
290 settings->setAcceleratedFiltersEnabled(accelerated_filters_enabled); | 294 settings->setAcceleratedFiltersEnabled(accelerated_filters_enabled); |
291 | 295 |
292 // Enabling accelerated layers from the command line enabled accelerated | 296 // Enabling accelerated layers from the command line enabled accelerated |
293 // 3D CSS, Video, and Animations. | 297 // 3D CSS, Video, and Animations. |
294 settings->setAcceleratedCompositingFor3DTransformsEnabled( | 298 settings->setAcceleratedCompositingFor3DTransformsEnabled( |
295 accelerated_layers_enabled); | 299 accelerated_layers_enabled); |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
335 settings->setEnableScrollAnimator(enable_scroll_animator); | 339 settings->setEnableScrollAnimator(enable_scroll_animator); |
336 settings->setHixie76WebSocketProtocolEnabled( | 340 settings->setHixie76WebSocketProtocolEnabled( |
337 hixie76_websocket_protocol_enabled); | 341 hixie76_websocket_protocol_enabled); |
338 settings->setVisualWordMovementEnabled(visual_word_movement_enabled); | 342 settings->setVisualWordMovementEnabled(visual_word_movement_enabled); |
339 | 343 |
340 // Enable per-tile painting if requested on the command line. | 344 // Enable per-tile painting if requested on the command line. |
341 settings->setPerTilePaintingEnabled(per_tile_painting_enabled); | 345 settings->setPerTilePaintingEnabled(per_tile_painting_enabled); |
342 | 346 |
343 WebNetworkStateNotifier::setOnLine(is_online); | 347 WebNetworkStateNotifier::setOnLine(is_online); |
344 } | 348 } |
OLD | NEW |