Changeset 87330 in webkit

Timestamp:

May 25, 2011 4:05:29 PM (13 years ago)

Author:

msaboff@apple.com

Message:

2011-05-25 Michael Saboff <​msaboff@apple.com>

Reviewed by Sam Weinig.

Cleanup of commented items from ​https://bugs.webkit.org/show_bug.cgi?id=61222
​https://bugs.webkit.org/show_bug.cgi?id=61478

Cleanup of further comments after patch was landed. Changes include
using /2 instead of >>1, adding a blank line after class include,
making method names start with lower case and adding clarifying
comments.

No new tests as the changes are stylistic and not functional.

• loader/cache/MemoryCache.cpp: (WebCore::MemoryCache::pruneLiveResourcesToPercentage): (WebCore::MemoryCache::pruneDeadResourcesToPercentage):
• loader/cache/MemoryCache.h: (WebCore::MemoryCache::pruneToPercentage):
• platform/mac/MemoryPressureHandlerMac.mm: (WebCore::MemoryPressureHandler::respondToMemoryPressure):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/cache/MemoryCache.cpp (modified) (2 diffs)
• loader/cache/MemoryCache.h (modified) (2 diffs)
• platform/mac/MemoryPressureHandlerMac.mm (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-25  Michael Saboff  <msaboff@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Cleanup of commented items from https://bugs.webkit.org/show_bug.cgi?id=61222
+        https://bugs.webkit.org/show_bug.cgi?id=61478
+
+        Cleanup of further comments after patch was landed.  Changes include
+        using /2 instead of >>1, adding a blank line after class include,
+        making method names start with lower case and adding clarifying
+        comments.
+
+        No new tests as the changes are stylistic and not functional.
+
+        * loader/cache/MemoryCache.cpp:
+        (WebCore::MemoryCache::pruneLiveResourcesToPercentage):
+        (WebCore::MemoryCache::pruneDeadResourcesToPercentage):
+        * loader/cache/MemoryCache.h:
+        (WebCore::MemoryCache::pruneToPercentage):
+        * platform/mac/MemoryPressureHandlerMac.mm:
+        (WebCore::MemoryPressureHandler::respondToMemoryPressure):
+
 2011-05-25  Stephanie Lewis  <slewis@apple.com>
 

trunk/Source/WebCore/loader/cache/MemoryCache.cpp

@@ -177 +177 @@
 }
 
-void MemoryCache::PruneLiveResourcesToPercentage(float prunePercentage)
+void MemoryCache::pruneLiveResourcesToPercentage(float prunePercentage)
 {
     if (!m_pruneEnabled)
@@ -240 +240 @@
 }
 
-void MemoryCache::PruneDeadResourcesToPercentage(float prunePercentage)
+void MemoryCache::pruneDeadResourcesToPercentage(float prunePercentage)
 {
     if (!m_pruneEnabled)

trunk/Source/WebCore/loader/cache/MemoryCache.h

@@ -142 +142 @@
     void pruneToPercentage(float targetPercentLive)
     {
-        PruneDeadResourcesToPercentage(targetPercentLive); // Prune dead first, in case it was "borrowing" capacity from live.
-        PruneLiveResourcesToPercentage(targetPercentLive);
+        pruneDeadResourcesToPercentage(targetPercentLive); // Prune dead first, in case it was "borrowing" capacity from live.
+        pruneLiveResourcesToPercentage(targetPercentLive);
     }
 
@@ -194 +194 @@
     void pruneDeadResources(); // Automatically decide how much to prune.
     void pruneLiveResources();
-    void PruneDeadResourcesToPercentage(float prunePercentage);
-    void PruneLiveResourcesToPercentage(float prunePercentage);
+    void pruneDeadResourcesToPercentage(float prunePercentage); // Prune to % current size
+    void pruneLiveResourcesToPercentage(float prunePercentage);
     void pruneDeadResourcesToSize(unsigned targetSize);
     void pruneLiveResourcesToSize(unsigned targetSize);

trunk/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm

@@ -26 +26 @@
 #import "config.h"
 #import "MemoryPressureHandler.h"
+
 #import <WebCore/GCController.h>
 #import <WebCore/MemoryCache.h>
@@ -87 +88 @@
 {
     int savedPageCacheCapacity = pageCache()->capacity();
-    pageCache()->setCapacity(pageCache()->pageCount()>>1);
+    pageCache()->setCapacity(pageCache()->pageCount()/2);
     pageCache()->setCapacity(savedPageCacheCapacity);
     pageCache()->releaseAutoreleasedPagesNow();
@@ -93 +94 @@
     NSURLCache *nsurlCache = [NSURLCache sharedURLCache];
     NSUInteger savedNsurlCacheMemoryCapacity = [nsurlCache memoryCapacity];
-    [nsurlCache setMemoryCapacity:[nsurlCache currentMemoryUsage]>>1];
+    [nsurlCache setMemoryCapacity:[nsurlCache currentMemoryUsage]/2];
     [nsurlCache setMemoryCapacity:savedNsurlCacheMemoryCapacity];