Title: [177167] trunk/Source
Revision
177167
Author
[email protected]
Date
2014-12-11 11:38:56 -0800 (Thu, 11 Dec 2014)

Log Message

Call StorageThread::releaseFastMallocFreeMemoryInAllThreads from WebKit
https://bugs.webkit.org/show_bug.cgi?id=139547

Reviewed by Sam Weinig.

Source/WebCore:

This is another step towards moving StorageThread (and friends) to WebKit.

* WebCore.exp.in:
* WebCore.xcodeproj/project.pbxproj:
* platform/MemoryPressureHandler.cpp:
(WebCore::MemoryPressureHandler::releaseMemory):

Source/WebKit/mac:

* WebView/WebView.mm:
(+[WebView _handleMemoryWarning]):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (177166 => 177167)


--- trunk/Source/WebCore/ChangeLog	2014-12-11 19:35:13 UTC (rev 177166)
+++ trunk/Source/WebCore/ChangeLog	2014-12-11 19:38:56 UTC (rev 177167)
@@ -1,3 +1,17 @@
+2014-12-11  Anders Carlsson  <[email protected]>
+
+        Call StorageThread::releaseFastMallocFreeMemoryInAllThreads from WebKit
+        https://bugs.webkit.org/show_bug.cgi?id=139547
+
+        Reviewed by Sam Weinig.
+
+        This is another step towards moving StorageThread (and friends) to WebKit.
+
+        * WebCore.exp.in:
+        * WebCore.xcodeproj/project.pbxproj:
+        * platform/MemoryPressureHandler.cpp:
+        (WebCore::MemoryPressureHandler::releaseMemory):
+
 2014-12-11  Said Abou-Hallawa  <[email protected]>
 
         ASSERTION FAILED: animatedTypes[0].properties.size() == 1 in WebCore::SVGAnimatedTypeAnimator::constructFromBaseValue.

Modified: trunk/Source/WebCore/WebCore.exp.in (177166 => 177167)


--- trunk/Source/WebCore/WebCore.exp.in	2014-12-11 19:35:13 UTC (rev 177166)
+++ trunk/Source/WebCore/WebCore.exp.in	2014-12-11 19:38:56 UTC (rev 177167)
@@ -332,6 +332,7 @@
 __ZN7WebCore13ResourceErrorC1EP9__CFError
 __ZN7WebCore13SQLResultDoneE
 __ZN7WebCore13SelectionRectC1ERKNS_7IntRectEbi
+__ZN7WebCore13StorageThread39releaseFastMallocFreeMemoryInAllThreadsEv
 __ZN7WebCore13StyledElement22setInlineStylePropertyENS_13CSSPropertyIDERKN3WTF6StringEb
 __ZN7WebCore13StyledElement22setInlineStylePropertyENS_13CSSPropertyIDEdNS_17CSSPrimitiveValue9UnitTypesEb
 __ZN7WebCore13TextIndicator6createERKNS_17TextIndicatorDataE

Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (177166 => 177167)


--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2014-12-11 19:35:13 UTC (rev 177166)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2014-12-11 19:38:56 UTC (rev 177167)
@@ -1846,7 +1846,7 @@
 		511EF2D017F0FDF100E4FA16 /* JSIDBDatabaseCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 511EF2CD17F0FDF100E4FA16 /* JSIDBDatabaseCustom.cpp */; };
 		511EF2D117F0FDF100E4FA16 /* JSIDBObjectStoreCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 511EF2CE17F0FDF100E4FA16 /* JSIDBObjectStoreCustom.cpp */; };
 		511F23190DC160DA004F0032 /* StorageThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 511F23150DC160DA004F0032 /* StorageThread.cpp */; };
-		511F231A0DC160DA004F0032 /* StorageThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 511F23160DC160DA004F0032 /* StorageThread.h */; };
+		511F231A0DC160DA004F0032 /* StorageThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 511F23160DC160DA004F0032 /* StorageThread.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		5123AF181890A4CA0031CDC9 /* IDBKeyRangeData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5123AF161890A4CA0031CDC9 /* IDBKeyRangeData.cpp */; };
 		5123AF191890A4CA0031CDC9 /* IDBKeyRangeData.h in Headers */ = {isa = PBXBuildFile; fileRef = 5123AF171890A4CA0031CDC9 /* IDBKeyRangeData.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		5123AF1D18918AE40031CDC9 /* IDBGetResult.h in Headers */ = {isa = PBXBuildFile; fileRef = 5123AF1C18918AE40031CDC9 /* IDBGetResult.h */; settings = {ATTRIBUTES = (Private, ); }; };

Modified: trunk/Source/WebCore/platform/MemoryPressureHandler.cpp (177166 => 177167)


--- trunk/Source/WebCore/platform/MemoryPressureHandler.cpp	2014-12-11 19:35:13 UTC (rev 177166)
+++ trunk/Source/WebCore/platform/MemoryPressureHandler.cpp	2014-12-11 19:38:56 UTC (rev 177167)
@@ -135,7 +135,6 @@
     {
         ReliefLogger log("Release free FastMalloc memory");
         // FastMalloc has lock-free thread specific caches that can only be cleared from the thread itself.
-        StorageThread::releaseFastMallocFreeMemoryInAllThreads();
         WorkerThread::releaseFastMallocFreeMemoryInAllThreads();
 #if ENABLE(ASYNC_SCROLLING) && !PLATFORM(IOS)
         ScrollingThread::dispatch(bind(WTF::releaseFastMallocFreeMemory));

Modified: trunk/Source/WebKit/mac/ChangeLog (177166 => 177167)


--- trunk/Source/WebKit/mac/ChangeLog	2014-12-11 19:35:13 UTC (rev 177166)
+++ trunk/Source/WebKit/mac/ChangeLog	2014-12-11 19:38:56 UTC (rev 177167)
@@ -1,3 +1,13 @@
+2014-12-11  Anders Carlsson  <[email protected]>
+
+        Call StorageThread::releaseFastMallocFreeMemoryInAllThreads from WebKit
+        https://bugs.webkit.org/show_bug.cgi?id=139547
+
+        Reviewed by Sam Weinig.
+
+        * WebView/WebView.mm:
+        (+[WebView _handleMemoryWarning]):
+
 2014-12-11  Alexey Proskuryakov  <[email protected]>
 
         REGRESSION (Async Text Input): Text input method state is not reset when reloading a page

Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (177166 => 177167)


--- trunk/Source/WebKit/mac/WebView/WebView.mm	2014-12-11 19:35:13 UTC (rev 177166)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm	2014-12-11 19:38:56 UTC (rev 177167)
@@ -175,6 +175,7 @@
 #import <WebCore/SecurityOrigin.h>
 #import <WebCore/SecurityPolicy.h>
 #import <WebCore/Settings.h>
+#import <WebCore/StorageThread.h>
 #import <WebCore/StyleProperties.h>
 #import <WebCore/TextResourceDecoder.h>
 #import <WebCore/ThreadCheck.h>
@@ -1266,6 +1267,7 @@
     tileControllerMemoryHandler().trimUnparentedTilesToTarget(0);
 
     [WebStorageManager closeIdleLocalStorageDatabases];
+    StorageThread::releaseFastMallocFreeMemoryInAllThreads();
 
     [WebView _releaseMemoryNow];
 }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to