| 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 777 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 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_plugins_enabled = false; | 790     prefs->accelerated_compositing_for_plugins_enabled = false; | 
| 791     prefs->pepper_3d_enabled = false; | 791     prefs->pepper_3d_enabled = false; | 
| 792   } | 792   } | 
| 793 | 793 | 
| 794   if (use_software_compositor_) { | 794   if (use_software_compositor_) { | 
| 795     prefs->force_compositing_mode = true; | 795     prefs->force_compositing_mode = true; | 
| 796     prefs->accelerated_compositing_enabled = true; | 796     prefs->accelerated_compositing_enabled = true; | 
| 797     prefs->accelerated_compositing_for_3d_transforms_enabled = true; | 797     prefs->accelerated_compositing_for_3d_transforms_enabled = true; | 
|  | 798     prefs->accelerated_compositing_for_animation_enabled = true; | 
| 798     prefs->accelerated_compositing_for_plugins_enabled = true; | 799     prefs->accelerated_compositing_for_plugins_enabled = true; | 
| 799     prefs->accelerated_compositing_for_video_enabled = true; | 800     prefs->accelerated_compositing_for_video_enabled = true; | 
| 800   } | 801   } | 
| 801 | 802 | 
| 802 #if defined(USE_AURA) | 803 #if defined(USE_AURA) | 
| 803   if (!CanUseGpuBrowserCompositor()) { | 804   if (!CanUseGpuBrowserCompositor()) { | 
| 804     prefs->accelerated_2d_canvas_enabled = false; | 805     prefs->accelerated_2d_canvas_enabled = false; | 
| 805     prefs->pepper_3d_enabled = false; | 806     prefs->pepper_3d_enabled = false; | 
| 806   } | 807   } | 
| 807 #endif | 808 #endif | 
| (...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1174 | 1175 | 
| 1175 void GpuDataManagerImplPrivate::OnGpuProcessInitFailure() { | 1176 void GpuDataManagerImplPrivate::OnGpuProcessInitFailure() { | 
| 1176   gpu_process_accessible_ = false; | 1177   gpu_process_accessible_ = false; | 
| 1177   gpu_info_.finalized = true; | 1178   gpu_info_.finalized = true; | 
| 1178   complete_gpu_info_already_requested_ = true; | 1179   complete_gpu_info_already_requested_ = true; | 
| 1179   // Some observers might be waiting. | 1180   // Some observers might be waiting. | 
| 1180   NotifyGpuInfoUpdate(); | 1181   NotifyGpuInfoUpdate(); | 
| 1181 } | 1182 } | 
| 1182 | 1183 | 
| 1183 }  // namespace content | 1184 }  // namespace content | 
| OLD | NEW | 
|---|