Move GpuMemoryManager::ClientState structure to its own class.

Move GpuMemoryManager::ClientState structure to its own class.

Also clean up initialization path so that the GpuMemoryManager returns
a GpuMemoryManagerClientState, and destroying that structure deletes
the client.

BUG=164947
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=174591

[ccameron, 2012-12-20 02:35:00]

This is the second half of the cleanup that came with the LRU cache.

[greggman, 2012-12-20 07:59:59]

lgtm

https://codereview.chromium.org/11571075/diff/4001/content/common/gpu/gpu_mem...
File content/common/gpu/gpu_memory_manager.cc (right):

https://codereview.chromium.org/11571075/diff/4001/content/common/gpu/gpu_mem...
content/common/gpu/gpu_memory_manager.cc:179: GpuMemoryManagerClientState*
client_state = *it;
since it doesn't appear you are changing anything here should this be const?

https://codereview.chromium.org/11571075/diff/4001/content/common/gpu/gpu_mem...
File content/common/gpu/gpu_memory_manager_client.h (right):

https://codereview.chromium.org/11571075/diff/4001/content/common/gpu/gpu_mem...
content/common/gpu/gpu_memory_manager_client.h:18: class GpuMemoryTrackingGroup;
style: could you add a description of this class?

https://codereview.chromium.org/11571075/diff/4001/content/common/gpu/gpu_mem...
content/common/gpu/gpu_memory_manager_client.h:40: class
GpuMemoryManagerClientState {
style: could you add a description of this class?

https://codereview.chromium.org/11571075/diff/4001/content/common/gpu/gpu_mem...
content/common/gpu/gpu_memory_manager_client.h:51: private:
style: blank line before private

https://codereview.chromium.org/11571075/diff/4001/content/common/gpu/gpu_mem...
content/common/gpu/gpu_memory_manager_client.h:102: #endif //
CONTENT_COMMON_GPU_GPU_MEMORY_MANAGER_CLIENT_H_
nit: 2 spaces before //

https://codereview.chromium.org/11571075/diff/4001/content/common/gpu/gpu_mem...
File content/common/gpu/gpu_memory_manager_unittest.cc (right):

https://codereview.chromium.org/11571075/diff/4001/content/common/gpu/gpu_mem...
content/common/gpu/gpu_memory_manager_unittest.cc:22: #endif // COMPILER
nit: 2 spaces before //

[ccameron, 2012-12-20 19:41:01]

Thanks!!

https://codereview.chromium.org/11571075/diff/4001/content/common/gpu/gpu_mem...
File content/common/gpu/gpu_memory_manager.cc (right):

https://codereview.chromium.org/11571075/diff/4001/content/common/gpu/gpu_mem...
content/common/gpu/gpu_memory_manager.cc:179: GpuMemoryManagerClientState*
client_state = *it;
On 2012/12/20 07:59:59, greggman wrote:
> since it doesn't appear you are changing anything here should this be const?

Done.

https://codereview.chromium.org/11571075/diff/4001/content/common/gpu/gpu_mem...
File content/common/gpu/gpu_memory_manager_client.h (right):

https://codereview.chromium.org/11571075/diff/4001/content/common/gpu/gpu_mem...
content/common/gpu/gpu_memory_manager_client.h:18: class GpuMemoryTrackingGroup;
On 2012/12/20 07:59:59, greggman wrote:
> style: could you add a description of this class?

Done.

https://codereview.chromium.org/11571075/diff/4001/content/common/gpu/gpu_mem...
content/common/gpu/gpu_memory_manager_client.h:40: class
GpuMemoryManagerClientState {
On 2012/12/20 07:59:59, greggman wrote:
> style: could you add a description of this class?

Done.

https://codereview.chromium.org/11571075/diff/4001/content/common/gpu/gpu_mem...
content/common/gpu/gpu_memory_manager_client.h:51: private:
On 2012/12/20 07:59:59, greggman wrote:
> style: blank line before private

Done.

https://codereview.chromium.org/11571075/diff/4001/content/common/gpu/gpu_mem...
content/common/gpu/gpu_memory_manager_client.h:102: #endif //
CONTENT_COMMON_GPU_GPU_MEMORY_MANAGER_CLIENT_H_
On 2012/12/20 07:59:59, greggman wrote:
> nit: 2 spaces before //

Done.

https://codereview.chromium.org/11571075/diff/4001/content/common/gpu/gpu_mem...
File content/common/gpu/gpu_memory_manager_unittest.cc (right):

https://codereview.chromium.org/11571075/diff/4001/content/common/gpu/gpu_mem...
content/common/gpu/gpu_memory_manager_unittest.cc:22: #endif // COMPILER
On 2012/12/20 07:59:59, greggman wrote:
> nit: 2 spaces before //

Done.

[commit-bot: I haz the power, 2012-12-20 19:50:57]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/11571075/6003

[commit-bot: I haz the power, 2012-12-20 20:07:20]

Sorry for I got bad news for ya.
Compile failed with a clobber build on android_clang_dbg.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=android_cl...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[ccameron, 2012-12-20 23:30:37]

Because this updates the content/content_common.gypi, I need a OWNER from
content. Adding jam.

The last upload failed because I had a non-trivial destructor in a header file.
I've moved the non-trivial functions to a .cc file.

[jam, 2012-12-21 02:02:10]

gypi lgtm

[ccameron, 2012-12-21 17:38:17]

Thanks!!

[commit-bot: I haz the power, 2012-12-21 17:38:18]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/11571075/4004

[commit-bot: I haz the power, 2012-12-21 17:56:50]

Sorry for I got bad news for ya.
Compile failed with a clobber build on android_dbg.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=android_db...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2012-12-21 20:23:28]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/11571075/4004

[commit-bot: I haz the power, 2012-12-21 20:25:20]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/11571075/21004

[ccameron, 2012-12-21 20:26:09]

Hmm, looks like some trybots aren't picking up the GYP changes.

The android failure is a legit one though.

Trying again.

[commit-bot: I haz the power, 2012-12-21 20:51:14]

Sorry for I got bad news for ya.
Compile failed with a clobber build on linux_clang.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_clan...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[M-A Ruel, 2012-12-21 21:58:59]

https://codereview.chromium.org/11571075/diff/24006/content/common/gpu/gpu_me...
File content/common/gpu/gpu_memory_manager_client.cc (right):

https://codereview.chromium.org/11571075/diff/24006/content/common/gpu/gpu_me...
content/common/gpu/gpu_memory_manager_client.cc:7: #if defined(ENABLE_GPU)
^^^ here's the bug.

[ccameron, 2012-12-21 22:04:11]

I think it's something different.

https://codereview.chromium.org/11571075/diff/24006/content/common/gpu/gpu_me...
File content/common/gpu/gpu_memory_manager_client.h (right):

https://codereview.chromium.org/11571075/diff/24006/content/common/gpu/gpu_me...
content/common/gpu/gpu_memory_manager_client.h:8: #if defined(ENABLE_GPU)
All of the classes are wrapped in "#if defined(ENABLE_GPU)", so if that's not
defined for a build, it won't get missing function prototypes.

[M-A Ruel, 2012-12-21 22:09:48]

https://codereview.chromium.org/11571075/diff/24006/content/common/gpu/gpu_me...
File content/common/gpu/gpu_memory_manager_unittest.cc (right):

https://codereview.chromium.org/11571075/diff/24006/content/common/gpu/gpu_me...
content/common/gpu/gpu_memory_manager_unittest.cc:1: // Copyright (c) 2012 The
Chromium Authors. All rights reserved.
Do I see an if defined(ENABLE_GPU) here? No, I don't. :)

[ccameron, 2012-12-21 22:41:10]

On 2012/12/21 22:09:48, Marc-Antoine Ruel wrote:
>
https://codereview.chromium.org/11571075/diff/24006/content/common/gpu/gpu_me...
> File content/common/gpu/gpu_memory_manager_unittest.cc (right):
> 
>
https://codereview.chromium.org/11571075/diff/24006/content/common/gpu/gpu_me...
> content/common/gpu/gpu_memory_manager_unittest.cc:1: // Copyright (c) 2012 The
> Chromium Authors. All rights reserved.
> Do I see an if defined(ENABLE_GPU) here? No, I don't. :)

I asked around, and ENABLE_GPU doesn't do anything anymore (I'm told).  But that
file wouldn't compile if there were no ENABLE_GPU, cause it uses
gpu_memory_manager.h.

I think the bug might be that I don't have a "CONTENT_EXPORT"... let me see if
that fixes it.

[commit-bot: I haz the power, 2012-12-21 22:44:09]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/11571075/24007

[commit-bot: I haz the power, 2012-12-21 23:11:23]

Sorry for I got bad news for ya.
Compile failed with a clobber build on linux_chromeos.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_chro...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2012-12-24 00:48:13]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/11571075/23004

[commit-bot: I haz the power, 2012-12-24 03:20:27]

Retried try job too often on mac_rel for step(s) browser_tests

[commit-bot: I haz the power, 2012-12-24 22:52:54]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/11571075/23004

[commit-bot: I haz the power, 2012-12-24 23:34:47]

Change committed as 174591