Use v8::V8::LowMemoryNotification() instead of the non-really-existibg v8::V8::CollectAllGarbage()

3 files changed, 9 insertions, 5 deletions

diff --git a/WebCore/bindings/v8/ScriptController.cpp b/WebCore/bindings/v8/ScriptController.cpp
index 86533f4..48c5115 100644
--- a/WebCore/bindings/v8/ScriptController.cpp
+++ b/WebCore/bindings/v8/ScriptController.cpp
@@ -271,11 +271,12 @@ void ScriptController::collectGarbage()
         return;
 
     v8::Context::Scope scope(v8Context);
-#if PLATFORM(ANDROID)
-    v8::V8::CollectAllGarbage();
-#else
     m_proxy->evaluate(ScriptSourceCode("if (window.gc) void(gc());"), 0);
-#endif
+}
+
+void ScriptController::lowMemoryNotification()
+{
+    v8::V8::LowMemoryNotification();
 }
 
 bool ScriptController::haveInterpreter() const
diff --git a/WebCore/bindings/v8/ScriptController.h b/WebCore/bindings/v8/ScriptController.h
index 47acf35..d614619 100644
--- a/WebCore/bindings/v8/ScriptController.h
+++ b/WebCore/bindings/v8/ScriptController.h
@@ -92,6 +92,9 @@ namespace WebCore {
 
         void collectGarbage();
 
+        // Notify V8 that the system is running low on memory.
+        void lowMemoryNotification();
+
         // Creates a property of the global object of a frame.
         void bindToWindowObject(Frame*, const String& key, NPObject*);
 
diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp
index 17b908d..5145a85 100644
--- a/WebKit/android/jni/WebCoreFrameBridge.cpp
+++ b/WebKit/android/jni/WebCoreFrameBridge.cpp
@@ -1139,7 +1139,7 @@ static void ClearCache(JNIEnv *env, jobject obj)
     WebCore::gcController().garbageCollectSoon();
 #elif USE(V8)
     WebCore::Frame* pFrame = GET_NATIVE_FRAME(env, obj);
-    pFrame->script()->collectGarbage(); 
+    pFrame->script()->lowMemoryNotification(); 
 #endif  // USE(JSC)
 }