diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2011-01-25 10:27:36 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-25 10:27:36 -0800 |
| commit | 47e08d2ef91489605378dab64166163ceb454fc7 (patch) | |
| tree | 284fe27c8a6406ff9aa97b3c7e54768ac1cb3707 /WebKit/android/WebCoreSupport/MemoryUsage.cpp | |
| parent | 7cf14d751364973cc8ce88fe9b822008ef83d2a5 (diff) | |
| parent | 6e8da6e69536dd9fd167ad0f7a429c43cea6e6d2 (diff) | |
| download | external_webkit-47e08d2ef91489605378dab64166163ceb454fc7.zip external_webkit-47e08d2ef91489605378dab64166163ceb454fc7.tar.gz external_webkit-47e08d2ef91489605378dab64166163ceb454fc7.tar.bz2 | |
Merge "Use platform bridge to control high usage delta MB." into honeycomb
Diffstat (limited to 'WebKit/android/WebCoreSupport/MemoryUsage.cpp')
| -rw-r--r-- | WebKit/android/WebCoreSupport/MemoryUsage.cpp | 2 |
1 files changed, 1 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; |