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

Side by Side Diff: content/renderer/web_preferences.cc

Issue 239973005: Remove GPU_FEATURE_TYPE_3D_CSS and --disable-accelerated-layers (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 8 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "content/public/renderer/web_preferences.h" 5 #include "content/public/renderer/web_preferences.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "third_party/WebKit/public/platform/WebString.h" 8 #include "third_party/WebKit/public/platform/WebString.h"
9 #include "third_party/WebKit/public/platform/WebURL.h" 9 #include "third_party/WebKit/public/platform/WebURL.h"
10 #include "third_party/WebKit/public/web/WebKit.h" 10 #include "third_party/WebKit/public/web/WebKit.h"
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 // Enable deferred filter rendering if requested on the command line. 224 // Enable deferred filter rendering if requested on the command line.
225 settings->setDeferredFiltersEnabled(prefs.deferred_filters_enabled); 225 settings->setDeferredFiltersEnabled(prefs.deferred_filters_enabled);
226 226
227 // Enable container culling if requested on the command line. 227 // Enable container culling if requested on the command line.
228 settings->setContainerCullingEnabled(prefs.container_culling_enabled); 228 settings->setContainerCullingEnabled(prefs.container_culling_enabled);
229 229
230 // Enable gesture tap highlight if requested on the command line. 230 // Enable gesture tap highlight if requested on the command line.
231 settings->setGestureTapHighlightEnabled(prefs.gesture_tap_highlight_enabled); 231 settings->setGestureTapHighlightEnabled(prefs.gesture_tap_highlight_enabled);
232 232
233 // Enabling accelerated layers from the command line enabled accelerated 233 // Enabling accelerated layers from the command line enabled accelerated
234 // 3D CSS, Video, and Animations. 234 // Video.
235 settings->setAcceleratedCompositingFor3DTransformsEnabled(
236 prefs.accelerated_compositing_for_3d_transforms_enabled);
237 settings->setAcceleratedCompositingForVideoEnabled( 235 settings->setAcceleratedCompositingForVideoEnabled(
238 prefs.accelerated_compositing_for_video_enabled); 236 prefs.accelerated_compositing_for_video_enabled);
239 settings->setAcceleratedCompositingForAnimationEnabled(
240 prefs.accelerated_compositing_for_animation_enabled);
241 237
242 // Enabling accelerated plugins if specified from the command line. 238 // Always enable composited 3D css, animations and plugins.
243 settings->setAcceleratedCompositingForPluginsEnabled( 239 settings->setAcceleratedCompositingFor3DTransformsEnabled(true);
244 prefs.accelerated_compositing_for_plugins_enabled); 240 settings->setAcceleratedCompositingForAnimationEnabled(true);
241 settings->setAcceleratedCompositingForPluginsEnabled(true);
245 242
246 // WebGL and accelerated 2D canvas are always gpu composited. 243 // WebGL and accelerated 2D canvas are always gpu composited.
247 settings->setAcceleratedCompositingForCanvasEnabled( 244 settings->setAcceleratedCompositingForCanvasEnabled(
248 prefs.experimental_webgl_enabled || prefs.accelerated_2d_canvas_enabled); 245 prefs.experimental_webgl_enabled || prefs.accelerated_2d_canvas_enabled);
249 246
250 settings->setAsynchronousSpellCheckingEnabled( 247 settings->setAsynchronousSpellCheckingEnabled(
251 prefs.asynchronous_spell_checking_enabled); 248 prefs.asynchronous_spell_checking_enabled);
252 settings->setUnifiedTextCheckerEnabled(prefs.unified_textchecker_enabled); 249 settings->setUnifiedTextCheckerEnabled(prefs.unified_textchecker_enabled);
253 250
254 for (webkit_glue::WebInspectorPreferences::const_iterator it = 251 for (webkit_glue::WebInspectorPreferences::const_iterator it =
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 settings->setPinchVirtualViewportEnabled( 346 settings->setPinchVirtualViewportEnabled(
350 prefs.pinch_virtual_viewport_enabled); 347 prefs.pinch_virtual_viewport_enabled);
351 348
352 settings->setPinchOverlayScrollbarThickness( 349 settings->setPinchOverlayScrollbarThickness(
353 prefs.pinch_overlay_scrollbar_thickness); 350 prefs.pinch_overlay_scrollbar_thickness);
354 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars); 351 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars);
355 settings->setCompositorTouchHitTesting(prefs.compositor_touch_hit_testing); 352 settings->setCompositorTouchHitTesting(prefs.compositor_touch_hit_testing);
356 } 353 }
357 354
358 } // namespace content 355 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/pepper/ppb_graphics_3d_impl.cc ('k') | content/test/gpu/gpu_tests/hardware_accelerated_feature.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698