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

Side by Side Diff: ui/compositor/compositor.cc

Issue 1469733006: Revert of Enable compositor-thread property trees (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years 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
« no previous file with comments | « third_party/WebKit/LayoutTests/TestExpectations ('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 "ui/compositor/compositor.h" 5 #include "ui/compositor/compositor.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <deque> 8 #include <deque>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 settings.initial_debug_state.show_surface_damage_rects = 130 settings.initial_debug_state.show_surface_damage_rects =
131 command_line->HasSwitch(cc::switches::kUIShowSurfaceDamageRects); 131 command_line->HasSwitch(cc::switches::kUIShowSurfaceDamageRects);
132 settings.initial_debug_state.show_screen_space_rects = 132 settings.initial_debug_state.show_screen_space_rects =
133 command_line->HasSwitch(cc::switches::kUIShowScreenSpaceRects); 133 command_line->HasSwitch(cc::switches::kUIShowScreenSpaceRects);
134 settings.initial_debug_state.show_replica_screen_space_rects = 134 settings.initial_debug_state.show_replica_screen_space_rects =
135 command_line->HasSwitch(cc::switches::kUIShowReplicaScreenSpaceRects); 135 command_line->HasSwitch(cc::switches::kUIShowReplicaScreenSpaceRects);
136 136
137 settings.initial_debug_state.SetRecordRenderingStats( 137 settings.initial_debug_state.SetRecordRenderingStats(
138 command_line->HasSwitch(cc::switches::kEnableGpuBenchmarking)); 138 command_line->HasSwitch(cc::switches::kEnableGpuBenchmarking));
139 139
140 if (command_line->HasSwitch(cc::switches::kDisableCompositorPropertyTrees)) 140 settings.use_property_trees =
141 settings.use_property_trees = false; 141 command_line->HasSwitch(cc::switches::kEnableCompositorPropertyTrees);
142 settings.use_zero_copy = IsUIZeroCopyEnabled(); 142 settings.use_zero_copy = IsUIZeroCopyEnabled();
143 143
144 settings.renderer_settings.use_rgba_4444_textures = 144 settings.renderer_settings.use_rgba_4444_textures =
145 command_line->HasSwitch(switches::kUIEnableRGBA4444Textures); 145 command_line->HasSwitch(switches::kUIEnableRGBA4444Textures);
146 146
147 // UI compositor always uses partial raster if not using zero-copy. Zero copy 147 // UI compositor always uses partial raster if not using zero-copy. Zero copy
148 // doesn't currently support partial raster. 148 // doesn't currently support partial raster.
149 settings.use_partial_raster = !settings.use_zero_copy; 149 settings.use_partial_raster = !settings.use_zero_copy;
150 150
151 // Use CPU_READ_WRITE_PERSISTENT memory buffers to support partial tile 151 // Use CPU_READ_WRITE_PERSISTENT memory buffers to support partial tile
(...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after
504 observer_list_, 504 observer_list_,
505 OnCompositingLockStateChanged(this)); 505 OnCompositingLockStateChanged(this));
506 } 506 }
507 507
508 void Compositor::CancelCompositorLock() { 508 void Compositor::CancelCompositorLock() {
509 if (compositor_lock_) 509 if (compositor_lock_)
510 compositor_lock_->CancelLock(); 510 compositor_lock_->CancelLock();
511 } 511 }
512 512
513 } // namespace ui 513 } // namespace ui
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/TestExpectations ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698