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

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

Issue 11264058: Disable force compositing mode when disabling compositing, re-enter in DoDeferredUpdate (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix threaded mode Created 8 years, 1 month 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 | « content/renderer/render_widget.cc ('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 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 // Display visualization of what has changed on the screen using an 341 // Display visualization of what has changed on the screen using an
342 // overlay of rects, if requested on the command line. 342 // overlay of rects, if requested on the command line.
343 settings->setShowPaintRects(show_paint_rects); 343 settings->setShowPaintRects(show_paint_rects);
344 344
345 // Set whether to throttle framerate to Vsync. 345 // Set whether to throttle framerate to Vsync.
346 settings->setRenderVSyncEnabled(render_vsync_enabled); 346 settings->setRenderVSyncEnabled(render_vsync_enabled);
347 347
348 // Enable gpu-accelerated compositing if requested on the command line. 348 // Enable gpu-accelerated compositing if requested on the command line.
349 settings->setAcceleratedCompositingEnabled(accelerated_compositing_enabled); 349 settings->setAcceleratedCompositingEnabled(accelerated_compositing_enabled);
350 350
351 // Always enter compositing if requested on the command line.
352 settings->setForceCompositingMode(force_compositing_mode);
353
354 // Enable compositing for fixed position elements if requested 351 // Enable compositing for fixed position elements if requested
355 // on the command line. 352 // on the command line.
356 settings->setAcceleratedCompositingForFixedPositionEnabled( 353 settings->setAcceleratedCompositingForFixedPositionEnabled(
357 fixed_position_compositing_enabled); 354 fixed_position_compositing_enabled);
358 355
359 // Enable gpu-accelerated 2d canvas if requested on the command line. 356 // Enable gpu-accelerated 2d canvas if requested on the command line.
360 settings->setAccelerated2dCanvasEnabled(accelerated_2d_canvas_enabled); 357 settings->setAccelerated2dCanvasEnabled(accelerated_2d_canvas_enabled);
361 358
362 // Enable deferred 2d canvas if requested on the command line. 359 // Enable deferred 2d canvas if requested on the command line.
363 settings->setDeferred2dCanvasEnabled(deferred_2d_canvas_enabled); 360 settings->setDeferred2dCanvasEnabled(deferred_2d_canvas_enabled);
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
439 settings->setFixedPositionCreatesStackingContext( 436 settings->setFixedPositionCreatesStackingContext(
440 fixed_position_creates_stacking_context); 437 fixed_position_creates_stacking_context);
441 438
442 settings->setApplyPageScaleFactorInCompositor( 439 settings->setApplyPageScaleFactorInCompositor(
443 apply_page_scale_factor_in_compositor); 440 apply_page_scale_factor_in_compositor);
444 441
445 WebNetworkStateNotifier::setOnLine(is_online); 442 WebNetworkStateNotifier::setOnLine(is_online);
446 } 443 }
447 444
448 } // namespace webkit_glue 445 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « content/renderer/render_widget.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698