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

Unified Diff: content/common/gpu/gpu_memory_manager.h

Issue 12223064: base: Fix parsing and add dalvik-heap-limit (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix tests. Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/common/gpu/gpu_memory_manager.h
diff --git a/content/common/gpu/gpu_memory_manager.h b/content/common/gpu/gpu_memory_manager.h
index 895f7b9b3c8f6a595131421ad455bc034d3c003e..01fd0b0174b0ab21b20ae677b2f376e8ffc78bbd 100644
--- a/content/common/gpu/gpu_memory_manager.h
+++ b/content/common/gpu/gpu_memory_manager.h
@@ -164,8 +164,9 @@ class CONTENT_EXPORT GpuMemoryManager :
return bytes_default_per_client_;
}
- // Get a reasonable memory limit from a viewport's surface area.
- static uint64 CalcAvailableFromViewportArea(int viewport_area);
+ // On Android only, estimate memory limite from Dalvik heap size.
ccameron 2013/02/11 20:05:33 s/limite/limit
+ static uint64 CalcAvailableFromDalvikHeap();
+
static uint64 CalcAvailableFromGpuTotal(uint64 total_gpu_memory);
// Send memory usage stats to the browser process.

Powered by Google App Engine
This is Rietveld 408576698