[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[steveblock at google.com]

The following commit has been merged in the webkit-1.2 branch:
commit 021719e44c6ef9c1c2d39e8ca261e344ef733fc7
Author: steveblock at google.com <steveblock at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 30 10:39:23 2009 +0000

    Adds PLATFORM(CHROMIUM) guards around memory usage code in V8GCController.
    https://bugs.webkit.org/show_bug.cgi?id=31925
    
    Reviewed by Eric Seidel.
    
    This code uses ChromiumBridge and Chromium-specific constant values not
    appropriate for other platforms such as Android.
    
    Build fix only, no new tests.
    
    * bindings/v8/V8GCController.cpp: Modified. Adds PLATFORM(CHROMIUM) around Chromium-specific code.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51483 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 8561b20..b944094 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2009-11-30  Steve Block  <steveblock at google.com>
+
+        Reviewed by Eric Seidel.
+
+        Adds PLATFORM(CHROMIUM) guards around memory usage code in V8GCController.
+        https://bugs.webkit.org/show_bug.cgi?id=31925
+
+        This code uses ChromiumBridge and Chromium-specific constant values not
+        appropriate for other platforms such as Android.
+
+        Build fix only, no new tests.
+
+        * bindings/v8/V8GCController.cpp: Modified. Adds PLATFORM(CHROMIUM) around Chromium-specific code.
+
 2009-11-29  Brent Fulgham  <bfulgham at webkit.org>
 
         Build fix.
diff --git a/WebCore/bindings/v8/V8GCController.cpp b/WebCore/bindings/v8/V8GCController.cpp
index b71b11d..74f879e 100644
--- a/WebCore/bindings/v8/V8GCController.cpp
+++ b/WebCore/bindings/v8/V8GCController.cpp
@@ -396,7 +396,11 @@ namespace {
 
 int getMemoryUsageInMB()
 {
+#if PLATFORM(CHROMIUM)
     return ChromiumBridge::memoryUsageMB();
+#else
+    return 0;
+#endif
 }
 
 }  // anonymous namespace
@@ -427,6 +431,8 @@ void V8GCController::gcEpilogue()
 
 void V8GCController::checkMemoryUsage()
 {
+#if PLATFORM(CHROMIUM)
+    // These values are appropriate for Chromium only.
     const int lowUsageMB = 256;  // If memory usage is below this threshold, do not bother forcing GC.
     const int highUsageMB = 1024;  // If memory usage is above this threshold, force GC more aggresively.
     const int highUsageDeltaMB = 128;  // Delta of memory usage growth (vs. last workingSetEstimateMB) to force GC when memory usage is high.
@@ -434,6 +440,7 @@ void V8GCController::checkMemoryUsage()
     int memoryUsageMB = getMemoryUsageInMB();
     if ((memoryUsageMB > lowUsageMB && memoryUsageMB > 2 * workingSetEstimateMB) || (memoryUsageMB > highUsageMB && memoryUsageMB > workingSetEstimateMB + highUsageDeltaMB))
         v8::V8::LowMemoryNotification();
+#endif
 }
 
 

-- 
WebKit Debian packaging