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

Side by Side Diff: content/browser/gpu/gpu_data_manager.h

Issue 7495005: Revert 93236 (broke GPU support on CrOs and Linux 32-bit, see http://crbug.com/90201) - Disallow ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | content/browser/gpu/gpu_data_manager.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #ifndef CONTENT_BROWSER_GPU_GPU_DATA_MANAGER_H_ 5 #ifndef CONTENT_BROWSER_GPU_GPU_DATA_MANAGER_H_
6 #define CONTENT_BROWSER_GPU_GPU_DATA_MANAGER_H_ 6 #define CONTENT_BROWSER_GPU_GPU_DATA_MANAGER_H_
7 #pragma once 7 #pragma once
8 8
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 92
93 // If flags hasn't been set and GPUInfo is available, run through blacklist 93 // If flags hasn't been set and GPUInfo is available, run through blacklist
94 // and compute the flags. 94 // and compute the flags.
95 void UpdateGpuFeatureFlags(); 95 void UpdateGpuFeatureFlags();
96 96
97 // Call all callbacks. 97 // Call all callbacks.
98 void RunGpuInfoUpdateCallbacks(); 98 void RunGpuInfoUpdateCallbacks();
99 99
100 bool complete_gpu_info_already_requested_; 100 bool complete_gpu_info_already_requested_;
101 101
102 bool gpu_feature_flags_set_;
102 GpuFeatureFlags gpu_feature_flags_; 103 GpuFeatureFlags gpu_feature_flags_;
103 GpuFeatureFlags preliminary_gpu_feature_flags_; 104 GpuFeatureFlags preliminary_gpu_feature_flags_;
104 bool allows_gpu_access_;
105 105
106 GPUInfo gpu_info_; 106 GPUInfo gpu_info_;
107 mutable base::Lock gpu_info_lock_; 107 mutable base::Lock gpu_info_lock_;
108 108
109 scoped_ptr<GpuBlacklist> gpu_blacklist_; 109 scoped_ptr<GpuBlacklist> gpu_blacklist_;
110 110
111 // Map of callbacks. 111 // Map of callbacks.
112 std::set<Callback0::Type*> gpu_info_update_callbacks_; 112 std::set<Callback0::Type*> gpu_info_update_callbacks_;
113 113
114 ListValue log_messages_; 114 ListValue log_messages_;
115 115
116 DISALLOW_COPY_AND_ASSIGN(GpuDataManager); 116 DISALLOW_COPY_AND_ASSIGN(GpuDataManager);
117 }; 117 };
118 118
119 DISABLE_RUNNABLE_METHOD_REFCOUNT(GpuDataManager); 119 DISABLE_RUNNABLE_METHOD_REFCOUNT(GpuDataManager);
120 120
121 #endif // CONTENT_BROWSER_GPU_GPU_DATA_MANAGER_H_ 121 #endif // CONTENT_BROWSER_GPU_GPU_DATA_MANAGER_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/gpu/gpu_data_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698