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

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

Issue 1726343003: Revert of Mustash: move content::GPUVideoMemoryUsageStats to gpu::VideoMemoryUsageStats (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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
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 #ifndef CONTENT_BROWSER_GPU_GPU_DATA_MANAGER_IMPL_PRIVATE_H_ 5 #ifndef CONTENT_BROWSER_GPU_GPU_DATA_MANAGER_IMPL_PRIVATE_H_
6 #define CONTENT_BROWSER_GPU_GPU_DATA_MANAGER_IMPL_PRIVATE_H_ 6 #define CONTENT_BROWSER_GPU_GPU_DATA_MANAGER_IMPL_PRIVATE_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 10 matching lines...) Expand all
21 #include "base/observer_list_threadsafe.h" 21 #include "base/observer_list_threadsafe.h"
22 #include "build/build_config.h" 22 #include "build/build_config.h"
23 #include "content/browser/gpu/gpu_data_manager_impl.h" 23 #include "content/browser/gpu/gpu_data_manager_impl.h"
24 #include "gpu/config/gpu_blacklist.h" 24 #include "gpu/config/gpu_blacklist.h"
25 #include "gpu/config/gpu_driver_bug_list.h" 25 #include "gpu/config/gpu_driver_bug_list.h"
26 26
27 namespace base { 27 namespace base {
28 class CommandLine; 28 class CommandLine;
29 } 29 }
30 30
31 namespace gpu {
32 struct VideoMemoryUsageStats;
33 }
34
35 namespace content { 31 namespace content {
36 32
37 class CONTENT_EXPORT GpuDataManagerImplPrivate { 33 class CONTENT_EXPORT GpuDataManagerImplPrivate {
38 public: 34 public:
39 static GpuDataManagerImplPrivate* Create(GpuDataManagerImpl* owner); 35 static GpuDataManagerImplPrivate* Create(GpuDataManagerImpl* owner);
40 36
41 void InitializeForTesting( 37 void InitializeForTesting(
42 const std::string& gpu_blacklist_json, 38 const std::string& gpu_blacklist_json,
43 const gpu::GPUInfo& gpu_info); 39 const gpu::GPUInfo& gpu_info);
44 bool IsFeatureBlacklisted(int feature) const; 40 bool IsFeatureBlacklisted(int feature) const;
(...skipping 18 matching lines...) Expand all
63 void GetGLStrings(std::string* gl_vendor, 59 void GetGLStrings(std::string* gl_vendor,
64 std::string* gl_renderer, 60 std::string* gl_renderer,
65 std::string* gl_version); 61 std::string* gl_version);
66 void DisableHardwareAcceleration(); 62 void DisableHardwareAcceleration();
67 63
68 void Initialize(); 64 void Initialize();
69 65
70 void UpdateGpuInfo(const gpu::GPUInfo& gpu_info); 66 void UpdateGpuInfo(const gpu::GPUInfo& gpu_info);
71 67
72 void UpdateVideoMemoryUsageStats( 68 void UpdateVideoMemoryUsageStats(
73 const gpu::VideoMemoryUsageStats& video_memory_usage_stats); 69 const GPUVideoMemoryUsageStats& video_memory_usage_stats);
74 70
75 void AppendRendererCommandLine(base::CommandLine* command_line) const; 71 void AppendRendererCommandLine(base::CommandLine* command_line) const;
76 72
77 void AppendGpuCommandLine(base::CommandLine* command_line) const; 73 void AppendGpuCommandLine(base::CommandLine* command_line) const;
78 74
79 void AppendPluginCommandLine(base::CommandLine* command_line) const; 75 void AppendPluginCommandLine(base::CommandLine* command_line) const;
80 76
81 void UpdateRendererWebPrefs(WebPreferences* prefs) const; 77 void UpdateRendererWebPrefs(WebPreferences* prefs) const;
82 78
83 std::string GetBlacklistVersion() const; 79 std::string GetBlacklistVersion() const;
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 // If one tries to call a member before initialization then it is defered 276 // If one tries to call a member before initialization then it is defered
281 // until Initialize() is completed. 277 // until Initialize() is completed.
282 std::vector<base::Closure> post_init_tasks_; 278 std::vector<base::Closure> post_init_tasks_;
283 279
284 DISALLOW_COPY_AND_ASSIGN(GpuDataManagerImplPrivate); 280 DISALLOW_COPY_AND_ASSIGN(GpuDataManagerImplPrivate);
285 }; 281 };
286 282
287 } // namespace content 283 } // namespace content
288 284
289 #endif // CONTENT_BROWSER_GPU_GPU_DATA_MANAGER_IMPL_PRIVATE_H_ 285 #endif // CONTENT_BROWSER_GPU_GPU_DATA_MANAGER_IMPL_PRIVATE_H_
OLDNEW
« no previous file with comments | « content/browser/gpu/gpu_data_manager_impl.cc ('k') | content/browser/gpu/gpu_data_manager_impl_private.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698