OLD | NEW |
---|---|
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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/browser/gpu/gpu_data_manager_impl_private.h" | 5 #include "content/browser/gpu/gpu_data_manager_impl_private.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
(...skipping 769 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
780 } | 780 } |
781 if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO)) | 781 if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO)) |
782 prefs->accelerated_compositing_for_video_enabled = false; | 782 prefs->accelerated_compositing_for_video_enabled = false; |
783 | 783 |
784 // Accelerated video and animation are slower than regular when using | 784 // Accelerated video and animation are slower than regular when using |
785 // SwiftShader. 3D CSS or Pepper 3D may also be too slow to be worthwhile. | 785 // SwiftShader. 3D CSS or Pepper 3D may also be too slow to be worthwhile. |
786 if (ShouldUseSwiftShader()) { | 786 if (ShouldUseSwiftShader()) { |
787 prefs->accelerated_compositing_for_video_enabled = false; | 787 prefs->accelerated_compositing_for_video_enabled = false; |
788 prefs->accelerated_compositing_for_animation_enabled = false; | 788 prefs->accelerated_compositing_for_animation_enabled = false; |
789 prefs->accelerated_compositing_for_3d_transforms_enabled = false; | 789 prefs->accelerated_compositing_for_3d_transforms_enabled = false; |
790 prefs->accelerated_compositing_for_animation_enabled = false; | |
jbauman
2014/03/07 22:59:29
This line is redundant with the one above.
danakj
2014/03/07 23:02:36
Oh, I was mimicing line 779. Should we just always
jbauman
2014/03/07 23:09:44
I mean, this is literally a duplicate of line 788.
danakj
2014/03/07 23:11:11
Ohhh, order changed. :D thanks!
| |
790 prefs->accelerated_compositing_for_plugins_enabled = false; | 791 prefs->accelerated_compositing_for_plugins_enabled = false; |
791 prefs->pepper_3d_enabled = false; | 792 prefs->pepper_3d_enabled = false; |
792 } | 793 } |
793 | 794 |
794 if (use_software_compositor_) { | 795 if (use_software_compositor_) { |
795 prefs->force_compositing_mode = true; | 796 prefs->force_compositing_mode = true; |
796 prefs->accelerated_compositing_enabled = true; | 797 prefs->accelerated_compositing_enabled = true; |
797 prefs->accelerated_compositing_for_3d_transforms_enabled = true; | 798 prefs->accelerated_compositing_for_3d_transforms_enabled = true; |
799 prefs->accelerated_compositing_for_animation_enabled = true; | |
798 prefs->accelerated_compositing_for_plugins_enabled = true; | 800 prefs->accelerated_compositing_for_plugins_enabled = true; |
799 prefs->accelerated_compositing_for_video_enabled = true; | 801 prefs->accelerated_compositing_for_video_enabled = true; |
800 } | 802 } |
801 | 803 |
802 #if defined(USE_AURA) | 804 #if defined(USE_AURA) |
803 if (!CanUseGpuBrowserCompositor()) { | 805 if (!CanUseGpuBrowserCompositor()) { |
804 prefs->accelerated_2d_canvas_enabled = false; | 806 prefs->accelerated_2d_canvas_enabled = false; |
805 prefs->pepper_3d_enabled = false; | 807 prefs->pepper_3d_enabled = false; |
806 } | 808 } |
807 #endif | 809 #endif |
(...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1174 | 1176 |
1175 void GpuDataManagerImplPrivate::OnGpuProcessInitFailure() { | 1177 void GpuDataManagerImplPrivate::OnGpuProcessInitFailure() { |
1176 gpu_process_accessible_ = false; | 1178 gpu_process_accessible_ = false; |
1177 gpu_info_.finalized = true; | 1179 gpu_info_.finalized = true; |
1178 complete_gpu_info_already_requested_ = true; | 1180 complete_gpu_info_already_requested_ = true; |
1179 // Some observers might be waiting. | 1181 // Some observers might be waiting. |
1180 NotifyGpuInfoUpdate(); | 1182 NotifyGpuInfoUpdate(); |
1181 } | 1183 } |
1182 | 1184 |
1183 } // namespace content | 1185 } // namespace content |
OLD | NEW |