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 "ui/compositor/compositor.h" | 5 #include "ui/compositor/compositor.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 #include <deque> | 10 #include <deque> |
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
103 settings.layers_always_allowed_lcd_text = true; | 103 settings.layers_always_allowed_lcd_text = true; |
104 // Use occlusion to allow more overlapping windows to take less memory. | 104 // Use occlusion to allow more overlapping windows to take less memory. |
105 settings.use_occlusion_for_tile_prioritization = true; | 105 settings.use_occlusion_for_tile_prioritization = true; |
106 settings.renderer_settings.refresh_rate = | 106 settings.renderer_settings.refresh_rate = |
107 context_factory_->DoesCreateTestContexts() ? kTestRefreshRate | 107 context_factory_->DoesCreateTestContexts() ? kTestRefreshRate |
108 : kDefaultRefreshRate; | 108 : kDefaultRefreshRate; |
109 settings.main_frame_before_activation_enabled = false; | 109 settings.main_frame_before_activation_enabled = false; |
110 if (command_line->HasSwitch(switches::kDisableGpuVsync)) { | 110 if (command_line->HasSwitch(switches::kDisableGpuVsync)) { |
111 std::string display_vsync_string = | 111 std::string display_vsync_string = |
112 command_line->GetSwitchValueASCII(switches::kDisableGpuVsync); | 112 command_line->GetSwitchValueASCII(switches::kDisableGpuVsync); |
113 if (display_vsync_string == "gpu") { | 113 if (display_vsync_string != "beginframe") |
danakj
2016/09/12 22:18:00
Don't you mean != "gpu"?
If "beginframe" then we
danakj
2016/09/12 22:24:26
Can you put a comment here explaining that this is
| |
114 settings.renderer_settings.disable_display_vsync = true; | 114 settings.renderer_settings.disable_display_vsync = true; |
115 } else if (display_vsync_string == "beginframe") { | |
116 settings.wait_for_beginframe_interval = false; | |
117 } else { | |
118 settings.renderer_settings.disable_display_vsync = true; | |
119 settings.wait_for_beginframe_interval = false; | |
120 } | |
121 } | 115 } |
122 settings.renderer_settings.partial_swap_enabled = | 116 settings.renderer_settings.partial_swap_enabled = |
123 !command_line->HasSwitch(switches::kUIDisablePartialSwap); | 117 !command_line->HasSwitch(switches::kUIDisablePartialSwap); |
124 #if defined(OS_WIN) | 118 #if defined(OS_WIN) |
125 settings.renderer_settings.finish_rendering_on_resize = true; | 119 settings.renderer_settings.finish_rendering_on_resize = true; |
126 #elif defined(OS_MACOSX) | 120 #elif defined(OS_MACOSX) |
127 settings.renderer_settings.release_overlay_resources_after_gpu_query = true; | 121 settings.renderer_settings.release_overlay_resources_after_gpu_query = true; |
128 #endif | 122 #endif |
129 settings.renderer_settings.gl_composited_texture_quad_border = | 123 settings.renderer_settings.gl_composited_texture_quad_border = |
130 command_line->HasSwitch(cc::switches::kGlCompositedTextureQuadBorder); | 124 command_line->HasSwitch(cc::switches::kGlCompositedTextureQuadBorder); |
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
544 observer_list_, | 538 observer_list_, |
545 OnCompositingLockStateChanged(this)); | 539 OnCompositingLockStateChanged(this)); |
546 } | 540 } |
547 | 541 |
548 void Compositor::CancelCompositorLock() { | 542 void Compositor::CancelCompositorLock() { |
549 if (compositor_lock_) | 543 if (compositor_lock_) |
550 compositor_lock_->CancelLock(); | 544 compositor_lock_->CancelLock(); |
551 } | 545 } |
552 | 546 |
553 } // namespace ui | 547 } // namespace ui |
OLD | NEW |