OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
72 privileged_webgl_extensions_enabled(false), | 72 privileged_webgl_extensions_enabled(false), |
73 show_composited_layer_borders(false), | 73 show_composited_layer_borders(false), |
74 show_composited_layer_tree(false), | 74 show_composited_layer_tree(false), |
75 show_fps_counter(false), | 75 show_fps_counter(false), |
76 asynchronous_spell_checking_enabled(true), | 76 asynchronous_spell_checking_enabled(true), |
77 accelerated_compositing_enabled(false), | 77 accelerated_compositing_enabled(false), |
78 threaded_compositing_enabled(false), | 78 threaded_compositing_enabled(false), |
79 force_compositing_mode(false), | 79 force_compositing_mode(false), |
80 allow_webui_compositing(false), | 80 allow_webui_compositing(false), |
81 composite_to_texture_enabled(false), | 81 composite_to_texture_enabled(false), |
| 82 fixed_position_compositing_enabled(false), |
82 accelerated_layers_enabled(false), | 83 accelerated_layers_enabled(false), |
83 accelerated_video_enabled(false), | 84 accelerated_video_enabled(false), |
84 accelerated_2d_canvas_enabled(false), | 85 accelerated_2d_canvas_enabled(false), |
85 accelerated_drawing_enabled(false), | 86 accelerated_drawing_enabled(false), |
86 accelerated_plugins_enabled(false), | 87 accelerated_plugins_enabled(false), |
87 memory_info_enabled(false), | 88 memory_info_enabled(false), |
88 interactive_form_validation_enabled(true), | 89 interactive_form_validation_enabled(true), |
89 fullscreen_enabled(false), | 90 fullscreen_enabled(false), |
90 allow_displaying_insecure_content(true), | 91 allow_displaying_insecure_content(true), |
91 allow_running_insecure_content(false), | 92 allow_running_insecure_content(false), |
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
257 settings->setAcceleratedCompositingEnabled(accelerated_compositing_enabled); | 258 settings->setAcceleratedCompositingEnabled(accelerated_compositing_enabled); |
258 | 259 |
259 settings->setUseThreadedCompositor(threaded_compositing_enabled); | 260 settings->setUseThreadedCompositor(threaded_compositing_enabled); |
260 | 261 |
261 // Always enter compositing if requested on the command line. | 262 // Always enter compositing if requested on the command line. |
262 settings->setForceCompositingMode(force_compositing_mode); | 263 settings->setForceCompositingMode(force_compositing_mode); |
263 | 264 |
264 // Enable composite to offscreen texture if requested on the command line. | 265 // Enable composite to offscreen texture if requested on the command line. |
265 settings->setCompositeToTextureEnabled(composite_to_texture_enabled); | 266 settings->setCompositeToTextureEnabled(composite_to_texture_enabled); |
266 | 267 |
| 268 // Enable compositing for fixed position elements if requested |
| 269 // on the command line. |
| 270 settings->setAcceleratedCompositingForFixedPositionEnabled( |
| 271 fixed_position_compositing_enabled); |
| 272 |
267 // Enable gpu-accelerated 2d canvas if requested on the command line. | 273 // Enable gpu-accelerated 2d canvas if requested on the command line. |
268 settings->setAccelerated2dCanvasEnabled(accelerated_2d_canvas_enabled); | 274 settings->setAccelerated2dCanvasEnabled(accelerated_2d_canvas_enabled); |
269 | 275 |
270 // Enable gpu-accelerated drawing if requested on the command line. | 276 // Enable gpu-accelerated drawing if requested on the command line. |
271 settings->setAcceleratedDrawingEnabled(accelerated_drawing_enabled); | 277 settings->setAcceleratedDrawingEnabled(accelerated_drawing_enabled); |
272 | 278 |
273 // Enabling accelerated layers from the command line enabled accelerated | 279 // Enabling accelerated layers from the command line enabled accelerated |
274 // 3D CSS, Video, and Animations. | 280 // 3D CSS, Video, and Animations. |
275 settings->setAcceleratedCompositingFor3DTransformsEnabled( | 281 settings->setAcceleratedCompositingFor3DTransformsEnabled( |
276 accelerated_layers_enabled); | 282 accelerated_layers_enabled); |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
308 settings->setFullScreenEnabled(fullscreen_enabled); | 314 settings->setFullScreenEnabled(fullscreen_enabled); |
309 settings->setAllowDisplayOfInsecureContent(allow_displaying_insecure_content); | 315 settings->setAllowDisplayOfInsecureContent(allow_displaying_insecure_content); |
310 settings->setAllowRunningOfInsecureContent(allow_running_insecure_content); | 316 settings->setAllowRunningOfInsecureContent(allow_running_insecure_content); |
311 settings->setShouldPrintBackgrounds(should_print_backgrounds); | 317 settings->setShouldPrintBackgrounds(should_print_backgrounds); |
312 settings->setEnableScrollAnimator(enable_scroll_animator); | 318 settings->setEnableScrollAnimator(enable_scroll_animator); |
313 settings->setHixie76WebSocketProtocolEnabled( | 319 settings->setHixie76WebSocketProtocolEnabled( |
314 hixie76_websocket_protocol_enabled); | 320 hixie76_websocket_protocol_enabled); |
315 | 321 |
316 WebNetworkStateNotifier::setOnLine(is_online); | 322 WebNetworkStateNotifier::setOnLine(is_online); |
317 } | 323 } |
OLD | NEW |