Merge "Use platform bridge to control high usage delta MB." into honeycomb

3 files changed, 9 insertions, 1 deletions

diff --git a/WebKit/android/WebCoreSupport/MemoryUsage.cpp b/WebKit/android/WebCoreSupport/MemoryUsage.cpp
index f799a18..32cdebf 100644
--- a/WebKit/android/WebCoreSupport/MemoryUsage.cpp
+++ b/WebKit/android/WebCoreSupport/MemoryUsage.cpp
@@ -78,4 +78,4 @@ int MemoryUsage::memoryUsageMb(bool forceFresh)
 
 int MemoryUsage::m_lowMemoryUsageMb = 0;
 int MemoryUsage::m_highMemoryUsageMb = 0;
-
+int MemoryUsage::m_highUsageDeltaMb = 0;
diff --git a/WebKit/android/WebCoreSupport/MemoryUsage.h b/WebKit/android/WebCoreSupport/MemoryUsage.h
index 899fd08..2a3d7ed 100644
--- a/WebKit/android/WebCoreSupport/MemoryUsage.h
+++ b/WebKit/android/WebCoreSupport/MemoryUsage.h
@@ -31,12 +31,15 @@ public:
     static int memoryUsageMb(bool forceFresh);
     static int lowMemoryUsageMb() { return m_lowMemoryUsageMb; }
     static int highMemoryUsageMb() { return m_highMemoryUsageMb; }
+    static int highUsageDeltaMb() { return m_highUsageDeltaMb; }
     static void setHighMemoryUsageMb(int highMemoryUsageMb) { m_highMemoryUsageMb = highMemoryUsageMb; }
     static void setLowMemoryUsageMb(int lowMemoryUsageMb) { m_lowMemoryUsageMb = lowMemoryUsageMb; }
+    static void setHighUsageDeltaMb(int highUsageDeltaMb) { m_highUsageDeltaMb = highUsageDeltaMb; }
 
 private:
     static int m_lowMemoryUsageMb;
     static int m_highMemoryUsageMb;
+    static int m_highUsageDeltaMb;
 };
 
 #endif
diff --git a/WebKit/android/WebCoreSupport/PlatformBridge.cpp b/WebKit/android/WebCoreSupport/PlatformBridge.cpp
index baeddb2..0bc2e3c 100644
--- a/WebKit/android/WebCoreSupport/PlatformBridge.cpp
+++ b/WebKit/android/WebCoreSupport/PlatformBridge.cpp
@@ -201,6 +201,11 @@ int PlatformBridge::highMemoryUsageMB()
     return MemoryUsage::highMemoryUsageMb();
 }
 
+int PlatformBridge::highUsageDeltaMB()
+{
+    return MemoryUsage::highUsageDeltaMb();
+}
+
 int PlatformBridge::memoryUsageMB()
 {
     return MemoryUsage::memoryUsageMb(false);