Changeset 19803 for S60/trunk/WebCore

Timestamp:

02/22/07 13:25:54 (23 months ago)

Author:

brmorris

Message:

hongzhao, reviewed by Zalan, merged by mbradley++

DESC: merge of r19802 to s60 trunk. Cache memory collector is not initialized in 3.2 HZHO-6YMQCK
Fix: Initialize the initial size of cache memory collector after create it.
http://bugs.webkit.org/show_bug.cgi?id=12844

Location:

S60/trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• khtml/misc/loader.cpp (modified) (1 diff)

S60/trunk/WebCore/ChangeLog

@@ +1 @@
+hongzhao, reviewed by Zalan, merged by mbradley++
+ DESC: merge of r19802 to s60 trunk. Cache memory collector is not initialized in 3.2 HZHO-6YMQCK 
+ Fix: Initialize the initial size of cache memory collector after create it.
+ http://bugs.webkit.org/show_bug.cgi?id=12844
+
+        WARNING: NO TEST CASES ADDED OR CHANGED
+
+        * khtml/misc/loader.cpp:
+        (Cache::init):
+
 
 hongzhao, reviewed by Zalan

S60/trunk/WebCore/khtml/misc/loader.cpp

@@ -2060 +2060 @@
 #ifdef __OOM__
     if( !oom_collector )
+        {
         oom_collector = new CacheMemCollector();
+        oom_collector->iInitialSize = Cache::maxSize;
+       }
 #endif
 }