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

Issue 1726343003: Revert of Mustash: move content::GPUVideoMemoryUsageStats to gpu::VideoMemoryUsageStats (Closed)

Created:
4 years, 10 months ago by Nico
Modified:
4 years, 10 months ago
CC:
chromium-reviews, darin-cc_chromium.org, jam, piman+watch_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

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 Committed: https://crrev.com/cf7a9b7d244d6f9ed03e139adebcd58e492f6aea Cr-Commit-Position: refs/heads/master@{#377295}

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+119 lines, -242 lines) Patch
M chrome/browser/task_management/sampling/task_group.h View 3 chunks +4 lines, -6 lines 0 comments Download
M chrome/browser/task_management/sampling/task_group.cc View 3 chunks +5 lines, -5 lines 0 comments Download
M chrome/browser/task_management/sampling/task_manager_impl.h View 3 chunks +2 lines, -3 lines 0 comments Download
M chrome/browser/task_management/sampling/task_manager_impl.cc View 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/task_manager/task_manager.h View 3 chunks +3 lines, -3 lines 0 comments Download
M chrome/browser/task_manager/task_manager.cc View 3 chunks +5 lines, -5 lines 0 comments Download
M chrome/chrome_browser.gypi View 2 chunks +0 lines, -2 lines 0 comments Download
M chrome/chrome_tests_unit.gypi View 1 chunk +0 lines, -1 line 0 comments Download
M content/browser/gpu/gpu_data_manager_impl.h View 3 chunks +2 lines, -5 lines 0 comments Download
M content/browser/gpu/gpu_data_manager_impl.cc View 2 chunks +1 line, -2 lines 0 comments Download
M content/browser/gpu/gpu_data_manager_impl_private.h View 2 chunks +1 line, -5 lines 0 comments Download
M content/browser/gpu/gpu_data_manager_impl_private.cc View 2 chunks +1 line, -2 lines 0 comments Download
M content/browser/gpu/gpu_data_manager_impl_private_unittest.cc View 3 chunks +2 lines, -3 lines 0 comments Download
M content/browser/gpu/gpu_process_host_ui_shim.h View 3 chunks +2 lines, -6 lines 0 comments Download
M content/browser/gpu/gpu_process_host_ui_shim.cc View 2 chunks +1 line, -2 lines 0 comments Download
M content/common/gpu/gpu_memory_manager.h View 2 chunks +2 lines, -5 lines 0 comments Download
M content/common/gpu/gpu_memory_manager.cc View 2 chunks +1 line, -2 lines 0 comments Download
M content/common/gpu/gpu_messages.h View 4 chunks +4 lines, -4 lines 0 comments Download
M content/content_browser.gypi View 1 chunk +0 lines, -1 line 0 comments Download
M content/content_common.gypi View 2 chunks +2 lines, -1 line 0 comments Download
M content/content_gpu.gypi View 1 chunk +0 lines, -1 line 0 comments Download
M content/content_tests.gypi View 1 chunk +0 lines, -1 line 0 comments Download
M content/gpu/BUILD.gn View 1 chunk +0 lines, -1 line 0 comments Download
M content/gpu/gpu_child_thread.cc View 2 chunks +1 line, -2 lines 0 comments Download
M content/public/browser/gpu_data_manager_observer.h View 2 chunks +2 lines, -5 lines 0 comments Download
A content/public/common/gpu_memory_stats.h View 1 chunk +52 lines, -0 lines 0 comments Download
A content/public/common/gpu_memory_stats.cc View 1 chunk +25 lines, -0 lines 0 comments Download
M gpu/BUILD.gn View 1 chunk +0 lines, -1 line 0 comments Download
M gpu/gpu.gyp View 5 chunks +0 lines, -42 lines 0 comments Download
D gpu/gpu_ipc_common.gypi View 1 chunk +0 lines, -26 lines 0 comments Download
D gpu/ipc/common/BUILD.gn View 1 chunk +0 lines, -28 lines 0 comments Download
D gpu/ipc/common/memory_stats.h View 1 chunk +0 lines, -52 lines 0 comments Download
D gpu/ipc/common/memory_stats.cc View 1 chunk +0 lines, -19 lines 0 comments Download

Messages

Total messages: 6 (2 generated)
Nico
Created Revert of Mustash: move content::GPUVideoMemoryUsageStats to gpu::VideoMemoryUsageStats
4 years, 10 months ago (2016-02-24 15:08:45 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1726343003/1 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1726343003/1
4 years, 10 months ago (2016-02-24 15:10:18 UTC) #2
commit-bot: I haz the power
Committed patchset #1 (id:1)
4 years, 10 months ago (2016-02-24 15:12:10 UTC) #4
commit-bot: I haz the power
4 years, 10 months ago (2016-02-24 15:13:32 UTC) #6
Message was sent while issue was closed.
Patchset 1 (id:??) landed as
https://crrev.com/cf7a9b7d244d6f9ed03e139adebcd58e492f6aea
Cr-Commit-Position: refs/heads/master@{#377295}

Powered by Google App Engine
This is Rietveld 408576698