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

Unified Diff: webkit/glue/webkitplatformsupport_impl.h

Issue 10113009: Set Android/V8 memory limits from dalvik.vm.heapsize. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments, tweak memory limits. Created 8 years, 7 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: webkit/glue/webkitplatformsupport_impl.h
diff --git a/webkit/glue/webkitplatformsupport_impl.h b/webkit/glue/webkitplatformsupport_impl.h
index 26fd53703b502372ababbd50b6c18d87d7b1bdd7..7d1fcefff2724c2950e5ebdf0e7d6129a8958d82 100644
--- a/webkit/glue/webkitplatformsupport_impl.h
+++ b/webkit/glue/webkitplatformsupport_impl.h
@@ -17,7 +17,9 @@
#include "webkit/glue/webthemeengine_impl_win.h"
#elif defined(OS_MACOSX)
#include "webkit/glue/webthemeengine_impl_mac.h"
-#elif defined(OS_POSIX)
+#elif defined(OS_ANDROID)
+#include "webkit/glue/webthemeengine_impl_android.h"
+#elif defined(OS_POSIX) && !defined(OS_ANDROID)
#include "webkit/glue/webthemeengine_impl_linux.h"
#endif
@@ -60,6 +62,11 @@ class WEBKIT_GLUE_EXPORT WebKitPlatformSupportImpl :
const WebKit::WebURL& url);
virtual size_t memoryUsageMB();
virtual size_t actualMemoryUsageMB();
+#if defined(OS_ANDROID) // Other OSes just use the default values.
+ virtual size_t lowMemoryUsageMB() OVERRIDE;
+ virtual size_t highMemoryUsageMB() OVERRIDE;
+ virtual size_t highUsageDeltaMB() OVERRIDE;
+#endif
virtual WebKit::WebURLLoader* createURLLoader();
virtual WebKit::WebSocketStreamHandle* createSocketStreamHandle();
virtual WebKit::WebString userAgent(const WebKit::WebURL& url);

Powered by Google App Engine
This is Rietveld 408576698