Revert of Mustash: move content::GPUVideoMemoryUsageStats to gpu::Vid…

…eoMemoryUsageStats (patchset chromium#5 id:80001 of https://codereview.chromium.org/1708783002/ ) Reason for revert: Doesn't build on win/gn bots: https://build.chromium.org/p/chromium.win/builders/Win%20x64%20GN%20%28dbg%29/builds/18944/steps/compile/logs/stdio FAILED: E:/b/depot_tools/python276_bin/python.exe gyp-win-tool link-wrapper environment.x64 False link.exe /nologo /IMPLIB:./content.dll.lib /DLL /OUT:./content.dll /PDB:./content.dll.pdb @./content.dll.rsp gpu.dll.lib(gpu.dll) : error LNK2005: "public: __cdecl gpu::VideoMemoryUsageStats::VideoMemoryUsageStats(void)" (??0VideoMemoryUsageStats@gpu@@qeaa@XZ) already defined in memory_stats.obj gpu.dll.lib(gpu.dll) : error LNK2005: "public: __cdecl gpu::VideoMemoryUsageStats::~VideoMemoryUsageStats(void)" (??1VideoMemoryUsageStats@gpu@@qeaa@XZ) already defined in memory_stats.obj gpu.dll.lib(gpu.dll) : error LNK2005: "public: __cdecl gpu::VideoMemoryUsageStats::ProcessStats::ProcessStats(void)" (??0ProcessStats@VideoMemoryUsageStats@gpu@@qeaa@XZ) already defined in memory_stats.obj gpu.dll.lib(gpu.dll) : error LNK2005: "public: __cdecl gpu::VideoMemoryUsageStats::ProcessStats::~ProcessStats(void)" (??1ProcessStats@VideoMemoryUsageStats@gpu@@qeaa@XZ) already defined in memory_stats.obj gpu.dll.lib(gpu.dll) : error LNK2005: "public: __cdecl gpu::VideoMemoryUsageStats::VideoMemoryUsageStats(struct gpu::VideoMemoryUsageStats const &)" (??0VideoMemoryUsageStats@gpu@@qeaa@AEBU01@@z) already defined in memory_stats.obj ./content.dll : fatal error LNK1169: one or more multiply defined symbols found Original issue's description: > Move content:GPUVideo...Stats to gpu::Video...Stats. HolyJavaStyleNamingBatman! > > As a part of the GPU refactor for Mus, we are trying to eliminate spots where content/common/gpu depends on > content/. One such dependency is content::GPUVideoMemoryUsageStats. > > BUG=586367 > CQ_INCLUDE_TRYBOTS=tryserver.chromium.win:win_optional_gpu_tests_rel > > Committed: https://crrev.com/6c1a70a5d0436c7c647c995202fbfa307f28983a > Cr-Commit-Position: refs/heads/master@{#377036} TBR=fsamuel@chromium.org,piman@chromium.org,kenrb@chromium.org,jam@chromium.org,markdittmer@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=586367 Review URL: https://codereview.chromium.org/1726343003 Cr-Commit-Position: refs/heads/master@{#377295}
Denger-Network · Feb 24, 2016 · cf7a9b7 · cf7a9b7
1 parent c4d8f0b
commit cf7a9b7
Show file tree

Hide file tree

Showing 32 changed files with 77 additions and 200 deletions.
diff --git a/chrome/browser/task_management/sampling/task_group.cc b/chrome/browser/task_management/sampling/task_group.cc
@@ -11,7 +11,6 @@
 #include "chrome/browser/task_management/task_manager_observer.h"
 #include "components/nacl/browser/nacl_browser.h"
 #include "content/public/browser/browser_thread.h"
-#include "gpu/ipc/common/memory_stats.h"
 
 namespace task_management {
 
@@ -118,9 +117,10 @@ void TaskGroup::RemoveTask(Task* task) {
   tasks_.erase(task->task_id());
 }
 
-void TaskGroup::Refresh(const gpu::VideoMemoryUsageStats& gpu_memory_stats,
-                        base::TimeDelta update_interval,
-                        int64_t refresh_flags) {
+void TaskGroup::Refresh(
+    const content::GPUVideoMemoryUsageStats& gpu_memory_stats,
+    base::TimeDelta update_interval,
+    int64_t refresh_flags) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   // First refresh the enabled non-expensive resources usages on the UI thread.
@@ -180,7 +180,7 @@ Task* TaskGroup::GetTaskById(TaskId task_id) const {
 }
 
 void TaskGroup::RefreshGpuMemory(
-    const gpu::VideoMemoryUsageStats& gpu_memory_stats) {
+    const content::GPUVideoMemoryUsageStats& gpu_memory_stats) {
   auto itr = gpu_memory_stats.process_map.find(process_id_);
   if (itr == gpu_memory_stats.process_map.end()) {
     gpu_memory_ = -1;

diff --git a/chrome/browser/task_management/sampling/task_group.h b/chrome/browser/task_management/sampling/task_group.h
@@ -18,10 +18,7 @@
 #include "chrome/browser/task_management/providers/task.h"
 #include "chrome/browser/task_management/sampling/task_group_sampler.h"
 #include "chrome/browser/task_management/task_manager_observer.h"
-
-namespace gpu {
-struct VideoMemoryUsageStats;
-}
+#include "content/public/common/gpu_memory_stats.h"
 
 namespace task_management {
 
@@ -40,7 +37,7 @@ class TaskGroup {
   void AddTask(Task* task);
   void RemoveTask(Task* task);
 
-  void Refresh(const gpu::VideoMemoryUsageStats& gpu_memory_stats,
+  void Refresh(const content::GPUVideoMemoryUsageStats& gpu_memory_stats,
                base::TimeDelta update_interval,
                int64_t refresh_flags);
 
@@ -85,7 +82,8 @@ class TaskGroup {
   int idle_wakeups_per_second() const { return idle_wakeups_per_second_; }
 
  private:
-  void RefreshGpuMemory(const gpu::VideoMemoryUsageStats& gpu_memory_stats);
+  void RefreshGpuMemory(
+      const content::GPUVideoMemoryUsageStats& gpu_memory_stats);
 
   void RefreshWindowsHandles();
 

diff --git a/chrome/browser/task_management/sampling/task_manager_impl.cc b/chrome/browser/task_management/sampling/task_manager_impl.cc
@@ -297,7 +297,7 @@ void TaskManagerImpl::TaskRemoved(Task* task) {
 }
 
 void TaskManagerImpl::OnVideoMemoryUsageStatsUpdate(
-    const gpu::VideoMemoryUsageStats& gpu_memory_stats) {
+    const content::GPUVideoMemoryUsageStats& gpu_memory_stats) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   gpu_memory_stats_ = gpu_memory_stats;

diff --git a/chrome/browser/task_management/sampling/task_manager_impl.h b/chrome/browser/task_management/sampling/task_manager_impl.h
@@ -20,7 +20,6 @@
 #include "chrome/browser/task_management/sampling/task_manager_io_thread_helper.h"
 #include "chrome/browser/task_management/task_manager_interface.h"
 #include "content/public/browser/gpu_data_manager_observer.h"
-#include "gpu/ipc/common/memory_stats.h"
 
 namespace task_management {
 
@@ -78,7 +77,7 @@ class TaskManagerImpl :
 
   // content::GpuDataManagerObserver:
   void OnVideoMemoryUsageStatsUpdate(
-      const gpu::VideoMemoryUsageStats& gpu_memory_stats) override;
+      const content::GPUVideoMemoryUsageStats& gpu_memory_stats) override;
 
   // The notification method on the UI thread when multiple bytes are read
   // from URLRequests. This will be called by the |io_thread_helper_|
@@ -127,7 +126,7 @@ class TaskManagerImpl :
 
   // The current GPU memory usage stats that was last received from the
   // GpuDataManager.
-  gpu::VideoMemoryUsageStats gpu_memory_stats_;
+  content::GPUVideoMemoryUsageStats gpu_memory_stats_;
 
   // The specific blocking pool SequencedTaskRunner that will be used to make
   // sure TaskGroupSampler posts their refreshes serially.

diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc
@@ -180,13 +180,13 @@ class TaskManagerModelGpuDataManagerObserver
   }
 
   static void NotifyVideoMemoryUsageStats(
-      const gpu::VideoMemoryUsageStats& video_memory_usage_stats) {
+      const content::GPUVideoMemoryUsageStats& video_memory_usage_stats) {
     TaskManager::GetInstance()->model()->NotifyVideoMemoryUsageStats(
         video_memory_usage_stats);
   }
 
-  void OnVideoMemoryUsageStatsUpdate(
-      const gpu::VideoMemoryUsageStats& video_memory_usage_stats) override {
+  void OnVideoMemoryUsageStatsUpdate(const content::GPUVideoMemoryUsageStats&
+                                         video_memory_usage_stats) override {
     if (BrowserThread::CurrentlyOn(BrowserThread::UI)) {
       NotifyVideoMemoryUsageStats(video_memory_usage_stats);
     } else {
@@ -662,7 +662,7 @@ bool TaskManagerModel::GetVideoMemory(int index,
   PerProcessValues& values(
       per_process_cache_[GetResource(index)->GetProcess()]);
   if (!values.is_video_memory_valid) {
-    gpu::VideoMemoryUsageStats::ProcessMap::const_iterator i =
+    content::GPUVideoMemoryUsageStats::ProcessMap::const_iterator i =
         video_memory_usage_stats_.process_map.find(pid);
     if (i == video_memory_usage_stats_.process_map.end())
       return false;
@@ -1248,7 +1248,7 @@ void TaskManagerModel::Refresh() {
 }
 
 void TaskManagerModel::NotifyVideoMemoryUsageStats(
-    const gpu::VideoMemoryUsageStats& video_memory_usage_stats) {
+    const content::GPUVideoMemoryUsageStats& video_memory_usage_stats) {
   DCHECK(pending_video_memory_usage_stats_update_);
   video_memory_usage_stats_ = video_memory_usage_stats;
   pending_video_memory_usage_stats_update_ = false;

diff --git a/chrome/browser/task_manager/task_manager.h b/chrome/browser/task_manager/task_manager.h
@@ -21,7 +21,7 @@
 #include "build/build_config.h"
 #include "chrome/browser/task_manager/resource_provider.h"
 #include "chrome/browser/ui/host_desktop.h"
-#include "gpu/ipc/common/memory_stats.h"
+#include "content/public/common/gpu_memory_stats.h"
 #include "third_party/WebKit/public/web/WebCache.h"
 
 class PrefRegistrySimple;
@@ -298,7 +298,7 @@ class TaskManagerModel : public base::RefCountedThreadSafe<TaskManagerModel> {
   void RefreshPhysicalMemoryFromWorkingSetSnapshot();
 
   void NotifyVideoMemoryUsageStats(
-      const gpu::VideoMemoryUsageStats& video_memory_usage_stats);
+      const content::GPUVideoMemoryUsageStats& video_memory_usage_stats);
 
   void NotifyBytesRead(const net::URLRequest& request, int64_t bytes_read);
 
@@ -509,7 +509,7 @@ class TaskManagerModel : public base::RefCountedThreadSafe<TaskManagerModel> {
   ResourceValueMap current_byte_count_map_;
 
   // A map that contains the video memory usage for a process
-  gpu::VideoMemoryUsageStats video_memory_usage_stats_;
+  content::GPUVideoMemoryUsageStats video_memory_usage_stats_;
 
   // Set to true when we've requested video stats and false once we get them.
   bool pending_video_memory_usage_stats_update_;

diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
@@ -3487,7 +3487,6 @@
             'sync_file_system_drive_proto',
             '../components/components.gyp:cryptauth',
             '../components/components.gyp:drive',
-            '../gpu/gpu.gyp:gpu_ipc_common',
             '../media/cast/cast.gyp:cast_net',
           ],
           'sources': [ '<@(chrome_browser_extensions_sources)' ],
@@ -3504,7 +3503,6 @@
         }],
         ['enable_task_manager==1', {
           'sources': [ '<@(chrome_browser_task_manager_sources)' ],
-          'dependencies': [ '../gpu/gpu.gyp:gpu_ipc_common' ],
           'conditions': [
             ['chromeos==1', {
               'sources': [ '<@(chrome_browser_task_manager_chromeos_sources)' ],

diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
@@ -2432,7 +2432,6 @@
         }],
         ['enable_task_manager==1', {
           'sources': [ '<@(chrome_unit_tests_task_manager_sources)' ],
-          'dependencies': [ '../gpu/gpu.gyp:gpu_ipc_common' ],
         }],
         ['enable_mdns==1', {
           'sources': [ '<@(chrome_unit_tests_mdns_sources)' ],

diff --git a/content/browser/gpu/gpu_data_manager_impl.cc b/content/browser/gpu/gpu_data_manager_impl.cc
@@ -5,7 +5,6 @@
 #include "content/browser/gpu/gpu_data_manager_impl.h"
 
 #include "content/browser/gpu/gpu_data_manager_impl_private.h"
-#include "gpu/ipc/common/memory_stats.h"
 
 namespace content {
 
@@ -145,7 +144,7 @@ void GpuDataManagerImpl::UpdateGpuInfo(const gpu::GPUInfo& gpu_info) {
 }
 
 void GpuDataManagerImpl::UpdateVideoMemoryUsageStats(
-    const gpu::VideoMemoryUsageStats& video_memory_usage_stats) {
+    const GPUVideoMemoryUsageStats& video_memory_usage_stats) {
   base::AutoLock auto_lock(lock_);
   private_->UpdateVideoMemoryUsageStats(video_memory_usage_stats);
 }

diff --git a/content/browser/gpu/gpu_data_manager_impl.h b/content/browser/gpu/gpu_data_manager_impl.h
@@ -21,6 +21,7 @@
 #include "base/time/time.h"
 #include "base/values.h"
 #include "content/public/browser/gpu_data_manager.h"
+#include "content/public/common/gpu_memory_stats.h"
 #include "content/public/common/three_d_api_types.h"
 #include "gpu/config/gpu_info.h"
 
@@ -30,10 +31,6 @@ namespace base {
 class CommandLine;
 }
 
-namespace gpu {
-struct VideoMemoryUsageStats;
-}
-
 namespace content {
 
 class GpuDataManagerImplPrivate;
@@ -106,7 +103,7 @@ class CONTENT_EXPORT GpuDataManagerImpl
   void UpdateGpuInfo(const gpu::GPUInfo& gpu_info);
 
   void UpdateVideoMemoryUsageStats(
-      const gpu::VideoMemoryUsageStats& video_memory_usage_stats);
+      const GPUVideoMemoryUsageStats& video_memory_usage_stats);
 
   // Insert disable-feature switches corresponding to preliminary gpu feature
   // flags into the renderer process command line.

diff --git a/content/browser/gpu/gpu_data_manager_impl_private.cc b/content/browser/gpu/gpu_data_manager_impl_private.cc
@@ -32,7 +32,6 @@
 #include "gpu/config/gpu_info_collector.h"
 #include "gpu/config/gpu_switches.h"
 #include "gpu/config/gpu_util.h"
-#include "gpu/ipc/common/memory_stats.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_switches.h"
@@ -645,7 +644,7 @@ void GpuDataManagerImplPrivate::UpdateGpuInfo(const gpu::GPUInfo& gpu_info) {
 }
 
 void GpuDataManagerImplPrivate::UpdateVideoMemoryUsageStats(
-    const gpu::VideoMemoryUsageStats& video_memory_usage_stats) {
+    const GPUVideoMemoryUsageStats& video_memory_usage_stats) {
   GpuDataManagerImpl::UnlockedSession session(owner_);
   observer_list_->Notify(FROM_HERE,
                          &GpuDataManagerObserver::OnVideoMemoryUsageStatsUpdate,

diff --git a/content/browser/gpu/gpu_data_manager_impl_private.h b/content/browser/gpu/gpu_data_manager_impl_private.h
@@ -28,10 +28,6 @@ namespace base {
 class CommandLine;
 }
 
-namespace gpu {
-struct VideoMemoryUsageStats;
-}
-
 namespace content {
 
 class CONTENT_EXPORT GpuDataManagerImplPrivate {
@@ -70,7 +66,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {
   void UpdateGpuInfo(const gpu::GPUInfo& gpu_info);
 
   void UpdateVideoMemoryUsageStats(
-      const gpu::VideoMemoryUsageStats& video_memory_usage_stats);
+      const GPUVideoMemoryUsageStats& video_memory_usage_stats);
 
   void AppendRendererCommandLine(base::CommandLine* command_line) const;
 

diff --git a/content/browser/gpu/gpu_data_manager_impl_private_unittest.cc b/content/browser/gpu/gpu_data_manager_impl_private_unittest.cc
@@ -15,7 +15,6 @@
 #include "gpu/config/gpu_feature_type.h"
 #include "gpu/config/gpu_info.h"
 #include "gpu/config/gpu_switches.h"
-#include "gpu/ipc/common/memory_stats.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
@@ -44,7 +43,7 @@ class TestObserver : public GpuDataManagerObserver {
   void OnGpuInfoUpdate() override { gpu_info_updated_ = true; }
 
   void OnVideoMemoryUsageStatsUpdate(
-      const gpu::VideoMemoryUsageStats& stats) override {
+      const GPUVideoMemoryUsageStats& stats) override {
     video_memory_usage_stats_updated_ = true;
   }
 
@@ -357,7 +356,7 @@ TEST_F(GpuDataManagerImplPrivateTest, GPUVideoMemoryUsageStatsUpdate) {
   }
   EXPECT_FALSE(observer.video_memory_usage_stats_updated());
 
-  gpu::VideoMemoryUsageStats vram_stats;
+  GPUVideoMemoryUsageStats vram_stats;
   manager->UpdateVideoMemoryUsageStats(vram_stats);
   {
     base::RunLoop run_loop;

diff --git a/content/browser/gpu/gpu_process_host_ui_shim.cc b/content/browser/gpu/gpu_process_host_ui_shim.cc
@@ -24,7 +24,6 @@
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "content/public/browser/browser_thread.h"
-#include "gpu/ipc/common/memory_stats.h"
 
 #if defined(OS_MACOSX)
 #include "ui/accelerated_widget_mac/accelerated_widget_mac.h"
@@ -272,7 +271,7 @@ void GpuProcessHostUIShim::OnAcceleratedSurfaceBuffersSwapped(
 #endif
 
 void GpuProcessHostUIShim::OnVideoMemoryUsageStatsReceived(
-    const gpu::VideoMemoryUsageStats& video_memory_usage_stats) {
+    const GPUVideoMemoryUsageStats& video_memory_usage_stats) {
   GpuDataManagerImpl::GetInstance()->UpdateVideoMemoryUsageStats(
       video_memory_usage_stats);
 }

diff --git a/content/browser/gpu/gpu_process_host_ui_shim.h b/content/browser/gpu/gpu_process_host_ui_shim.h
@@ -21,8 +21,8 @@
 #include "base/threading/non_thread_safe.h"
 #include "build/build_config.h"
 #include "content/common/content_export.h"
+#include "content/public/common/gpu_memory_stats.h"
 #include "gpu/config/gpu_info.h"
-#include "gpu/ipc/common/memory_stats.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_sender.h"
 #include "ipc/message_router.h"
@@ -43,10 +43,6 @@ namespace IPC {
 class Message;
 }
 
-namespace gpu {
-struct VideoMemoryUsageStats;
-}
-
 namespace content {
 void RouteToGpuProcessHostUIShimTask(int host_id, const IPC::Message& msg);
 
@@ -105,7 +101,7 @@ class GpuProcessHostUIShim : public IPC::Listener,
       const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params);
 #endif
   void OnVideoMemoryUsageStatsReceived(
-      const gpu::VideoMemoryUsageStats& video_memory_usage_stats);
+      const GPUVideoMemoryUsageStats& video_memory_usage_stats);
   void OnAddSubscription(int32_t process_id, unsigned int target);
   void OnRemoveSubscription(int32_t process_id, unsigned int target);
 

diff --git a/content/common/gpu/gpu_memory_manager.cc b/content/common/gpu/gpu_memory_manager.cc
@@ -18,7 +18,6 @@
 #include "content/common/gpu/gpu_messages.h"
 #include "gpu/command_buffer/common/gpu_memory_allocation.h"
 #include "gpu/command_buffer/service/gpu_switches.h"
-#include "gpu/ipc/common/memory_stats.h"
 
 using gpu::MemoryAllocation;
 
@@ -92,7 +91,7 @@ void GpuMemoryManager::OnDestroyTrackingGroup(
 }
 
 void GpuMemoryManager::GetVideoMemoryUsageStats(
-    gpu::VideoMemoryUsageStats* video_memory_usage_stats) const {
+    GPUVideoMemoryUsageStats* video_memory_usage_stats) const {
   // For each context group, assign its memory usage to its PID
   video_memory_usage_stats->process_map.clear();
   for (TrackingGroupMap::const_iterator i =

diff --git a/content/common/gpu/gpu_memory_manager.h b/content/common/gpu/gpu_memory_manager.h
@@ -16,13 +16,10 @@
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "content/common/content_export.h"
+#include "content/public/common/gpu_memory_stats.h"
 #include "gpu/command_buffer/common/gpu_memory_allocation.h"
 #include "gpu/command_buffer/service/memory_tracking.h"
 
-namespace gpu {
-struct VideoMemoryUsageStats;
-}
-
 namespace content {
 
 class GpuChannelManager;
@@ -36,7 +33,7 @@ class CONTENT_EXPORT GpuMemoryManager :
 
   // Retrieve GPU Resource consumption statistics for the task manager
   void GetVideoMemoryUsageStats(
-      gpu::VideoMemoryUsageStats* video_memory_usage_stats) const;
+      content::GPUVideoMemoryUsageStats* video_memory_usage_stats) const;
 
   GpuMemoryTrackingGroup* CreateTrackingGroup(
       base::ProcessId pid, gpu::gles2::MemoryTracker* memory_tracker);