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

Unified Diff: ui/gl/gl_context_android.cc

Issue 786123002: Update from https://crrev.com/307330 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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
« no previous file with comments | « ui/gl/gl_bindings.h ('k') | ui/gl/gl_gl_api_implementation.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_context_android.cc
diff --git a/ui/gl/gl_context_android.cc b/ui/gl/gl_context_android.cc
index 2d91a652f66ac2e0b3cf079815ff9059f58a4aa3..7f9cf2d96c761e9b8f7a2544fa594780479cc777 100644
--- a/ui/gl/gl_context_android.cc
+++ b/ui/gl/gl_context_android.cc
@@ -120,7 +120,7 @@ bool GLContextEGL::GetTotalGpuMemory(size_t* bytes) {
// Droid Razr M(1GB) 114MB (normally 57MB)
// Galaxy Nexus(1GB) 100MB (normally 50MB)
// Xoom(1GB) 100MB (normally 50MB)
- // Nexus S(low-end) 12MB (normally 8MB)
+ // Nexus S(low-end) 8MB (normally 8MB)
// Note that the compositor now uses only some of this memory for
// pre-painting and uses the rest only for 'emergencies'.
static size_t limit_bytes = 0;
@@ -140,9 +140,7 @@ bool GLContextEGL::GetTotalGpuMemory(size_t* bytes) {
// Low-end devices have 512MB or less memory by definition
// so we hard code the limit rather than relying on the heuristics
// above. Low-end devices use 4444 textures so we can use a lower limit.
- // NOTE: Low-end uses 2/3 (67%) of this memory in practice, so we have
- // increased the limit to 12 (8MB, or 12MB in emergencies).
- limit_bytes = 12;
+ limit_bytes = 8;
}
limit_bytes = limit_bytes * 1024 * 1024;
}
« no previous file with comments | « ui/gl/gl_bindings.h ('k') | ui/gl/gl_gl_api_implementation.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698