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

Side by Side Diff: content/browser/gpu/gpu_data_manager_impl_private.cc

Issue 1103403002: gpu: Fix dependency cycle between service_sources and config_sources. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: zmo nits Created 5 years, 7 months 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 | « no previous file | content/browser/gpu/gpu_data_manager_impl_private_unittest.cc » ('j') | 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) 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/metrics/field_trial.h" 10 #include "base/metrics/field_trial.h"
(...skipping 11 matching lines...) Expand all
22 #include "content/public/browser/gpu_data_manager_observer.h" 22 #include "content/public/browser/gpu_data_manager_observer.h"
23 #include "content/public/common/content_client.h" 23 #include "content/public/common/content_client.h"
24 #include "content/public/common/content_constants.h" 24 #include "content/public/common/content_constants.h"
25 #include "content/public/common/content_switches.h" 25 #include "content/public/common/content_switches.h"
26 #include "content/public/common/web_preferences.h" 26 #include "content/public/common/web_preferences.h"
27 #include "gpu/command_buffer/service/gpu_switches.h" 27 #include "gpu/command_buffer/service/gpu_switches.h"
28 #include "gpu/config/gpu_control_list_jsons.h" 28 #include "gpu/config/gpu_control_list_jsons.h"
29 #include "gpu/config/gpu_driver_bug_workaround_type.h" 29 #include "gpu/config/gpu_driver_bug_workaround_type.h"
30 #include "gpu/config/gpu_feature_type.h" 30 #include "gpu/config/gpu_feature_type.h"
31 #include "gpu/config/gpu_info_collector.h" 31 #include "gpu/config/gpu_info_collector.h"
32 #include "gpu/config/gpu_switches.h"
32 #include "gpu/config/gpu_util.h" 33 #include "gpu/config/gpu_util.h"
33 #include "ui/base/ui_base_switches.h" 34 #include "ui/base/ui_base_switches.h"
34 #include "ui/gl/gl_implementation.h" 35 #include "ui/gl/gl_implementation.h"
35 #include "ui/gl/gl_switches.h" 36 #include "ui/gl/gl_switches.h"
36 #include "ui/gl/gpu_switching_manager.h" 37 #include "ui/gl/gpu_switching_manager.h"
37 38
38 #if defined(OS_MACOSX) 39 #if defined(OS_MACOSX)
39 #include <ApplicationServices/ApplicationServices.h> 40 #include <ApplicationServices/ApplicationServices.h>
40 #endif // OS_MACOSX 41 #endif // OS_MACOSX
41 #if defined(OS_WIN) 42 #if defined(OS_WIN)
(...skipping 1110 matching lines...) Expand 10 before | Expand all | Expand 10 after
1152 gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure; 1153 gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure;
1153 #if defined(OS_WIN) 1154 #if defined(OS_WIN)
1154 gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure; 1155 gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure;
1155 #endif 1156 #endif
1156 complete_gpu_info_already_requested_ = true; 1157 complete_gpu_info_already_requested_ = true;
1157 // Some observers might be waiting. 1158 // Some observers might be waiting.
1158 NotifyGpuInfoUpdate(); 1159 NotifyGpuInfoUpdate();
1159 } 1160 }
1160 1161
1161 } // namespace content 1162 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/browser/gpu/gpu_data_manager_impl_private_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698