summaryrefslogtreecommitdiffstats
path: root/content/common/gpu/gpu_memory_tracking.cc
diff options
context:
space:
mode:
authorccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-31 21:31:48 +0000
committerccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-31 21:31:48 +0000
commit677cf5ffcfaca3eeb11e96c339a9dfb1c29df57c (patch)
tree9b7eccbe112999631d0bf712c7b89d96e1893565 /content/common/gpu/gpu_memory_tracking.cc
parent06df751563caad85fb5e4f0b42499851a43808c8 (diff)
downloadchromium_src-677cf5ffcfaca3eeb11e96c339a9dfb1c29df57c.zip
chromium_src-677cf5ffcfaca3eeb11e96c339a9dfb1c29df57c.tar.gz
chromium_src-677cf5ffcfaca3eeb11e96c339a9dfb1c29df57c.tar.bz2
Use uint64 instead of size_t in GpuMemoryManager
There are two reasons for this. Most pressing is that this is skating near the edge of overflow (especially where we multiply things by 9/8). Second is that it is indeed possible to have a Gpu with more than 4GB of VRAM accessible even to a 32-bit process. BUG=168413 Review URL: https://chromiumcodereview.appspot.com/12091051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179966 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common/gpu/gpu_memory_tracking.cc')
-rw-r--r--content/common/gpu/gpu_memory_tracking.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/content/common/gpu/gpu_memory_tracking.cc b/content/common/gpu/gpu_memory_tracking.cc
index de0e7f0..e2d1fc7 100644
--- a/content/common/gpu/gpu_memory_tracking.cc
+++ b/content/common/gpu/gpu_memory_tracking.cc
@@ -24,14 +24,14 @@ GpuMemoryTrackingGroup::~GpuMemoryTrackingGroup() {
}
void GpuMemoryTrackingGroup::TrackMemoryAllocatedChange(
- size_t old_size,
- size_t new_size,
+ uint64 old_size,
+ uint64 new_size,
gpu::gles2::MemoryTracker::Pool tracking_pool) {
memory_manager_->TrackMemoryAllocatedChange(
this, old_size, new_size, tracking_pool);
}
-bool GpuMemoryTrackingGroup::EnsureGPUMemoryAvailable(size_t size_needed) {
+bool GpuMemoryTrackingGroup::EnsureGPUMemoryAvailable(uint64 size_needed) {
return memory_manager_->EnsureGPUMemoryAvailable(size_needed);
}