From cf7a9b7d244d6f9ed03e139adebcd58e492f6aea Mon Sep 17 00:00:00 2001 From: thakis Date: Wed, 24 Feb 2016 07:12:00 -0800 Subject: [PATCH] Revert of Mustash: move content::GPUVideoMemoryUsageStats to gpu::VideoMemoryUsageStats (patchset #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} --- .../task_management/sampling/task_group.cc | 10 ++--- .../task_management/sampling/task_group.h | 10 ++--- .../sampling/task_manager_impl.cc | 2 +- .../sampling/task_manager_impl.h | 5 +-- chrome/browser/task_manager/task_manager.cc | 10 ++--- chrome/browser/task_manager/task_manager.h | 6 +-- chrome/chrome_browser.gypi | 2 - chrome/chrome_tests_unit.gypi | 1 - content/browser/gpu/gpu_data_manager_impl.cc | 3 +- content/browser/gpu/gpu_data_manager_impl.h | 7 +--- .../gpu/gpu_data_manager_impl_private.cc | 3 +- .../gpu/gpu_data_manager_impl_private.h | 6 +-- .../gpu_data_manager_impl_private_unittest.cc | 5 +-- .../browser/gpu/gpu_process_host_ui_shim.cc | 3 +- .../browser/gpu/gpu_process_host_ui_shim.h | 8 +--- content/common/gpu/gpu_memory_manager.cc | 3 +- content/common/gpu/gpu_memory_manager.h | 7 +--- content/common/gpu/gpu_messages.h | 8 ++-- content/content_browser.gypi | 1 - content/content_common.gypi | 3 +- content/content_gpu.gypi | 1 - content/content_tests.gypi | 1 - content/gpu/BUILD.gn | 1 - content/gpu/gpu_child_thread.cc | 3 +- .../browser/gpu_data_manager_observer.h | 7 +--- content/public/common/gpu_memory_stats.cc | 25 +++++++++++ .../public/common/gpu_memory_stats.h | 20 ++++----- gpu/BUILD.gn | 1 - gpu/gpu.gyp | 42 ------------------- gpu/gpu_ipc_common.gypi | 26 ------------ gpu/ipc/common/BUILD.gn | 28 ------------- gpu/ipc/common/memory_stats.cc | 19 --------- 32 files changed, 77 insertions(+), 200 deletions(-) create mode 100644 content/public/common/gpu_memory_stats.cc rename gpu/ipc/common/memory_stats.h => content/public/common/gpu_memory_stats.h (75%) delete mode 100644 gpu/gpu_ipc_common.gypi delete mode 100644 gpu/ipc/common/BUILD.gn delete mode 100644 gpu/ipc/common/memory_stats.cc diff --git a/chrome/browser/task_management/sampling/task_group.cc b/chrome/browser/task_management/sampling/task_group.cc index 3787bd32fe897e..9911136d9cf37e 100644 --- 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 index a9276fdf01dedd..02459fd5ab4e8e 100644 --- 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 index 6ca6fe209dbb0e..7fee4a5bcc3ee6 100644 --- 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 index 0f0eedd4884198..562b8dcadef093 100644 --- 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 index eb52d8e8934a90..3cfb9955731215 100644 --- 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 index a10ea2141bb606..5e4e1ccba9f008 100644 --- 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 { 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 { 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 index 643afb54fd862f..5dfafa93c3a92e 100644 --- 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 index 854b5be21f32ab..6d1fe039b00695 100644 --- 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 index 88fcf97dc525ef..19f6788b7409f6 100644 --- 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 index f94a39c78a3a75..2b484cc908104c 100644 --- 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 index 3f655bb74b76f8..6b57bcf4150859 100644 --- 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 index ca98ab2811391c..887703b9356dae 100644 --- 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 index a9a189d271a06f..e98046cf2f05b3 100644 --- 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 index 52d1d8df8b20fa..f50db216e35c78 100644 --- 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 index 32768337dc2723..e37eda0545e00c 100644 --- 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 index 85aa15f92f9aec..10f769c134b87f 100644 --- 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 index b83e220184b896..7de22e5aa786df 100644 --- 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); diff --git a/content/common/gpu/gpu_messages.h b/content/common/gpu/gpu_messages.h index e4b4f6801d3b1c..e4db8b3d496114 100644 --- a/content/common/gpu/gpu_messages.h +++ b/content/common/gpu/gpu_messages.h @@ -18,6 +18,7 @@ #include "content/common/gpu/gpu_process_launch_causes.h" #include "content/common/gpu/gpu_stream_constants.h" #include "content/public/common/common_param_traits.h" +#include "content/public/common/gpu_memory_stats.h" #include "gpu/command_buffer/common/capabilities.h" #include "gpu/command_buffer/common/command_buffer.h" #include "gpu/command_buffer/common/constants.h" @@ -26,7 +27,6 @@ #include "gpu/command_buffer/common/sync_token.h" #include "gpu/command_buffer/common/value_state.h" #include "gpu/config/gpu_info.h" -#include "gpu/ipc/common/memory_stats.h" #include "gpu/ipc/gpu_command_buffer_traits.h" #include "ipc/ipc_channel_handle.h" #include "ipc/ipc_message_macros.h" @@ -285,12 +285,12 @@ IPC_STRUCT_TRAITS_BEGIN(gpu::GPUInfo) IPC_STRUCT_TRAITS_MEMBER(jpeg_decode_accelerator_supported) IPC_STRUCT_TRAITS_END() -IPC_STRUCT_TRAITS_BEGIN(gpu::VideoMemoryUsageStats::ProcessStats) +IPC_STRUCT_TRAITS_BEGIN(content::GPUVideoMemoryUsageStats::ProcessStats) IPC_STRUCT_TRAITS_MEMBER(video_memory) IPC_STRUCT_TRAITS_MEMBER(has_duplicates) IPC_STRUCT_TRAITS_END() -IPC_STRUCT_TRAITS_BEGIN(gpu::VideoMemoryUsageStats) +IPC_STRUCT_TRAITS_BEGIN(content::GPUVideoMemoryUsageStats) IPC_STRUCT_TRAITS_MEMBER(process_map) IPC_STRUCT_TRAITS_MEMBER(bytes_allocated) IPC_STRUCT_TRAITS_MEMBER(bytes_allocated_historical_max) @@ -447,7 +447,7 @@ IPC_MESSAGE_CONTROL1(GpuHostMsg_GraphicsInfoCollected, // Response from GPU to a GpuMsg_GetVideoMemory. IPC_MESSAGE_CONTROL1(GpuHostMsg_VideoMemoryUsageStats, - gpu::VideoMemoryUsageStats /* GPU memory stats */) + content::GPUVideoMemoryUsageStats /* GPU memory stats */) // Message from GPU to add a GPU log message to the about:gpu page. IPC_MESSAGE_CONTROL3(GpuHostMsg_OnLogMessage, diff --git a/content/content_browser.gypi b/content/content_browser.gypi index e86e4e64aa0fb4..f1997c23ede6f1 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -21,7 +21,6 @@ '../device/vibration/vibration.gyp:device_vibration_mojo_bindings', '../gin/gin.gyp:gin', '../google_apis/google_apis.gyp:google_apis', - '../gpu/gpu.gyp:gpu_ipc_common', '../mojo/mojo_base.gyp:mojo_application_base', '../mojo/mojo_base.gyp:mojo_geometry_lib', '../mojo/mojo_base.gyp:mojo_url_type_converters', diff --git a/content/content_common.gypi b/content/content_common.gypi index d02b5dcf85cdf8..4de364b2c4c48d 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -17,7 +17,6 @@ # content and moved to android_webview. See crbug.com/365797. '../gpu/gpu.gyp:gl_in_process_context', '../gpu/gpu.gyp:gpu_ipc', - '../gpu/gpu.gyp:gpu_ipc_common', '../gpu/skia_bindings/skia_bindings.gyp:gpu_skia_bindings', '../ipc/ipc.gyp:ipc', '../ipc/mojo/ipc_mojo.gyp:ipc_mojo', @@ -131,6 +130,8 @@ 'public/common/frame_navigate_params.h', 'public/common/geoposition.cc', 'public/common/geoposition.h', + 'public/common/gpu_memory_stats.cc', + 'public/common/gpu_memory_stats.h', 'public/common/injection_test_mac.h', 'public/common/injection_test_win.h', 'public/common/javascript_message_type.h', diff --git a/content/content_gpu.gypi b/content/content_gpu.gypi index 1de855752a7664..f9dd6368f3a967 100644 --- a/content/content_gpu.gypi +++ b/content/content_gpu.gypi @@ -5,7 +5,6 @@ { 'dependencies': [ '../base/base.gyp:base', - '../gpu/gpu.gyp:gpu_ipc_common', '../skia/skia.gyp:skia', '../ui/gl/gl.gyp:gl', 'content_common_mojo_bindings.gyp:content_common_mojo_bindings', diff --git a/content/content_tests.gypi b/content/content_tests.gypi index ded748e90e92cf..a7e31a64d00dc8 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -1161,7 +1161,6 @@ '../device/bluetooth/bluetooth.gyp:device_bluetooth', '../gin/gin.gyp:gin', '../gpu/gpu.gyp:gpu', - '../gpu/gpu.gyp:gpu_ipc_common', '../gpu/gpu.gyp:gpu_unittest_utils', '../ipc/ipc.gyp:test_support_ipc', '../media/media.gyp:media_test_support', diff --git a/content/gpu/BUILD.gn b/content/gpu/BUILD.gn index 88778643658068..3bc1845a82ee9a 100644 --- a/content/gpu/BUILD.gn +++ b/content/gpu/BUILD.gn @@ -44,7 +44,6 @@ source_set("gpu_sources") { "//base", "//content:export", "//content/public/child:child_sources", - "//gpu/ipc/common:ipc_common_sources", "//mojo/shell/public/interfaces", "//skia", "//ui/gl", diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc index 7b4450b37cb832..6ea7e2ec22010e 100644 --- a/content/gpu/gpu_child_thread.cc +++ b/content/gpu/gpu_child_thread.cc @@ -22,7 +22,6 @@ #include "content/public/common/content_switches.h" #include "content/public/gpu/content_gpu_client.h" #include "gpu/config/gpu_info_collector.h" -#include "gpu/ipc/common/memory_stats.h" #include "ipc/ipc_channel_handle.h" #include "ipc/ipc_sync_message_filter.h" #include "ui/gl/gl_implementation.h" @@ -352,7 +351,7 @@ void GpuChildThread::OnCollectGraphicsInfo() { } void GpuChildThread::OnGetVideoMemoryUsageStats() { - gpu::VideoMemoryUsageStats video_memory_usage_stats; + GPUVideoMemoryUsageStats video_memory_usage_stats; if (gpu_channel_manager_) gpu_channel_manager_->gpu_memory_manager()->GetVideoMemoryUsageStats( &video_memory_usage_stats); diff --git a/content/public/browser/gpu_data_manager_observer.h b/content/public/browser/gpu_data_manager_observer.h index 64a6b9e17edcc1..2f36feb63e330b 100644 --- a/content/public/browser/gpu_data_manager_observer.h +++ b/content/public/browser/gpu_data_manager_observer.h @@ -7,14 +7,11 @@ #include "base/process/kill.h" #include "content/common/content_export.h" +#include "content/public/common/gpu_memory_stats.h" #include "content/public/common/three_d_api_types.h" class GURL; -namespace gpu { -struct VideoMemoryUsageStats; -} - namespace content { // Observers can register themselves via GpuDataManager::AddObserver, and @@ -26,7 +23,7 @@ class CONTENT_EXPORT GpuDataManagerObserver { // Called for any observers whenever there is a GPU video memory update. virtual void OnVideoMemoryUsageStatsUpdate( - const gpu::VideoMemoryUsageStats& video_memory_usage_stats) {} + const GPUVideoMemoryUsageStats& video_memory_usage_stats) {} // Indicates that client 3D APIs (Pepper 3D, WebGL) were just blocked on the // given page, specifically because the GPU was reset recently. diff --git a/content/public/common/gpu_memory_stats.cc b/content/public/common/gpu_memory_stats.cc new file mode 100644 index 00000000000000..2b4e0fad14c424 --- /dev/null +++ b/content/public/common/gpu_memory_stats.cc @@ -0,0 +1,25 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "content/public/common/gpu_memory_stats.h" + +namespace content { + +GPUVideoMemoryUsageStats::GPUVideoMemoryUsageStats() + : bytes_allocated(0), + bytes_allocated_historical_max(0) { +} + +GPUVideoMemoryUsageStats::~GPUVideoMemoryUsageStats() { +} + +GPUVideoMemoryUsageStats::ProcessStats::ProcessStats() + : video_memory(0), + has_duplicates(false) { +} + +GPUVideoMemoryUsageStats::ProcessStats::~ProcessStats() { +} + +} // namespace content diff --git a/gpu/ipc/common/memory_stats.h b/content/public/common/gpu_memory_stats.h similarity index 75% rename from gpu/ipc/common/memory_stats.h rename to content/public/common/gpu_memory_stats.h index ecc3944a09c935..ed358abc1c81f0 100644 --- a/gpu/ipc/common/memory_stats.h +++ b/content/public/common/gpu_memory_stats.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef GPU_IPC_COMMON_MEMORY_STATS_H_ -#define GPU_IPC_COMMON_MEMORY_STATS_H_ +#ifndef CONTENT_PUBLIC_COMMON_GPU_MEMORY_STATS_H_ +#define CONTENT_PUBLIC_COMMON_GPU_MEMORY_STATS_H_ // Provides access to the GPU information for the system // on which chrome is currently running. @@ -13,17 +13,17 @@ #include #include "base/process/process.h" -#include "gpu/gpu_export.h" +#include "content/common/content_export.h" -namespace gpu { +namespace content { // Note: we use uint64_t instead of size_t for byte count because this struct // is sent over IPC which could span 32 & 64 bit processes. -struct GPU_EXPORT VideoMemoryUsageStats { - VideoMemoryUsageStats(); - ~VideoMemoryUsageStats(); +struct CONTENT_EXPORT GPUVideoMemoryUsageStats { + GPUVideoMemoryUsageStats(); + ~GPUVideoMemoryUsageStats(); - struct GPU_EXPORT ProcessStats { + struct CONTENT_EXPORT ProcessStats { ProcessStats(); ~ProcessStats(); @@ -47,6 +47,6 @@ struct GPU_EXPORT VideoMemoryUsageStats { uint64_t bytes_allocated_historical_max; }; -} // namespace gpu +} // namespace content -#endif // GPU_IPC_COMMON_MEMORY_STATS_H_ +#endif // CONTENT_PUBLIC_COMMON_GPU_MEMORY_STATS_H_ diff --git a/gpu/BUILD.gn b/gpu/BUILD.gn index bf1d6b0aee490e..c3f82eb8fcfcc9 100644 --- a/gpu/BUILD.gn +++ b/gpu/BUILD.gn @@ -46,7 +46,6 @@ component("gpu") { "//gpu/command_buffer/service:service_sources", "//gpu/config:config_sources", "//gpu/ipc:ipc_sources", - "//gpu/ipc/common:ipc_common_sources", ] } diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp index 8d5343f9ce3411..2ad775d2c6e601 100644 --- a/gpu/gpu.gyp +++ b/gpu/gpu.gyp @@ -523,7 +523,6 @@ 'gles2_cmd_helper', 'gpu_config', 'gpu_ipc', - 'gpu_ipc_common', ], 'sources': [ 'gpu_export.h', @@ -603,14 +602,6 @@ 'command_buffer_common', ], }, - { - # GN version: //gpu/ipc/common - 'target_name': 'gpu_ipc_common', - 'type': 'static_library', - 'includes': [ - 'gpu_ipc_common.gypi', - ], - }, { 'target_name': 'gpu_config', 'type': 'static_library', @@ -644,7 +635,6 @@ 'gles2_cmd_helper.gypi', 'gpu_config.gypi', 'gpu_ipc.gypi', - 'gpu_ipc_common.gypi', '../build/android/increase_size_for_speed.gypi', ], 'defines': [ @@ -704,14 +694,6 @@ 'gpu', ], }, - { - # GN version: //gpu/ipc/common - 'target_name': 'gpu_ipc_common', - 'type': 'none', - 'dependencies': [ - 'gpu', - ], - }, ], }], ['disable_nacl!=1 and OS=="win" and target_arch=="ia32"', { @@ -762,30 +744,6 @@ }, }, }, - { - 'target_name': 'gpu_ipc_common_win64', - 'type': 'static_library', - 'variables': { - 'nacl_win64_target': 1, - }, - 'includes': [ - 'gpu_ipc_common.gypi', - ], - 'dependencies': [ - '../base/base.gyp:base_win64', - '../ipc/ipc.gyp:ipc_win64', - 'command_buffer_common_win64', - ], - 'defines': [ - '<@(nacl_win64_defines)', - 'GPU_IMPLEMENTATION', - ], - 'configurations': { - 'Common_Base': { - 'msvs_target_platform': 'x64', - }, - }, - }, ], }], ['OS == "android"', { diff --git a/gpu/gpu_ipc_common.gypi b/gpu/gpu_ipc_common.gypi deleted file mode 100644 index d1395151cd385e..00000000000000 --- a/gpu/gpu_ipc_common.gypi +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (c) 2016 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -{ - 'dependencies': [ - '../ipc/ipc.gyp:ipc', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'ipc/common/memory_stats.cc', - 'ipc/common/memory_stats.h', - ], - 'conditions': [ - # This section applies to gpu_ipc_win64, used by the NaCl Win64 helper - # (nacl64.exe). - ['nacl_win64_target==1', { - # gpu_ipc_win64 must only link against the 64-bit ipc target. - 'dependencies!': [ - '../ipc/ipc.gyp:ipc', - ], - }], - ], -} diff --git a/gpu/ipc/common/BUILD.gn b/gpu/ipc/common/BUILD.gn deleted file mode 100644 index b77a9f9f6b28df..00000000000000 --- a/gpu/ipc/common/BUILD.gn +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 2016 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -group("ipc") { - if (is_component_build) { - public_deps = [ - "//gpu", - ] - } else { - public_deps = [ - ":ipc_common_sources", - ] - } -} - -source_set("ipc_common_sources") { - sources = [ - "memory_stats.cc", - "memory_stats.h", - ] - - configs += [ "//gpu:gpu_implementation" ] - - deps = [ - "//ipc", - ] -} diff --git a/gpu/ipc/common/memory_stats.cc b/gpu/ipc/common/memory_stats.cc deleted file mode 100644 index af55e48b885e14..00000000000000 --- a/gpu/ipc/common/memory_stats.cc +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "gpu/ipc/common/memory_stats.h" - -namespace gpu { - -VideoMemoryUsageStats::VideoMemoryUsageStats() - : bytes_allocated(0), bytes_allocated_historical_max(0) {} - -VideoMemoryUsageStats::~VideoMemoryUsageStats() {} - -VideoMemoryUsageStats::ProcessStats::ProcessStats() - : video_memory(0), has_duplicates(false) {} - -VideoMemoryUsageStats::ProcessStats::~ProcessStats() {} - -} // namespace gpu