Changeset 142225 in webkit
- Timestamp:
- Feb 7, 2013 9:32:45 PM (11 years ago)
- Location:
- trunk/Source
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r142223 r142225 1 2013-02-07 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r142212. 4 http://trac.webkit.org/changeset/142212 5 https://bugs.webkit.org/show_bug.cgi?id=109255 6 7 Causes ASSERT(!m_installed) on launch (Requested by smfr on 8 #webkit). 9 10 * WebCore.exp.in: 11 * platform/MemoryPressureHandler.cpp: 12 (WebCore): 13 (WebCore::MemoryPressureHandler::respondToMemoryPressure): 14 * platform/MemoryPressureHandler.h: 15 (MemoryPressureHandler): 16 * platform/mac/MemoryPressureHandlerMac.mm: 17 (WebCore::MemoryPressureHandler::respondToMemoryPressure): 18 1 19 2013-02-07 Hanyee Kim <choco@company100.net> 2 20 -
trunk/Source/WebCore/WebCore.exp.in
r142212 r142225 601 601 __ZN7WebCore20SpaceSplitStringDataD1Ev 602 602 __ZN7WebCore21BackForwardController11itemAtIndexEi 603 __ZN7WebCore21MemoryPressureHandler13releaseMemoryEb604 603 __ZN7WebCore21MemoryPressureHandler7installEv 605 604 __ZN7WebCore21NetworkStorageSession28createPrivateBrowsingSessionERKN3WTF6StringE -
trunk/Source/WebCore/platform/MemoryPressureHandler.cpp
r142212 r142225 44 44 45 45 #if !PLATFORM(MAC) || PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED == 1060 46 void MemoryPressureHandler::install() { } 46 47 47 void MemoryPressureHandler::install() { }48 48 void MemoryPressureHandler::uninstall() { } 49 49 50 void MemoryPressureHandler::holdOff(unsigned) { } 51 50 52 void MemoryPressureHandler::respondToMemoryPressure() { } 51 void MemoryPressureHandler::releaseMemory(bool) { }52 53 53 #endif 54 54 -
trunk/Source/WebCore/platform/MemoryPressureHandler.h
r142212 r142225 32 32 namespace WebCore { 33 33 34 typedef void (*LowMemoryHandler)(bool critical);35 36 34 class MemoryPressureHandler { 37 35 WTF_MAKE_FAST_ALLOCATED; … … 39 37 friend MemoryPressureHandler& memoryPressureHandler(); 40 38 41 void initialize(LowMemoryHandler handler = releaseMemory)42 {43 ASSERT(!m_installed);44 m_lowMemoryHandler = handler;45 install();46 }47 48 private:49 39 void install(); 50 40 void uninstall(); … … 52 42 void holdOff(unsigned); 53 43 44 private: 54 45 MemoryPressureHandler(); 55 46 ~MemoryPressureHandler(); 56 47 57 48 void respondToMemoryPressure(); 58 staticvoid releaseMemory(bool critical);49 void releaseMemory(bool critical); 59 50 60 51 bool m_installed; 61 52 time_t m_lastRespondTime; 62 LowMemoryHandler m_lowMemoryHandler;63 53 }; 64 54 -
trunk/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm
r142212 r142225 135 135 double startTime = monotonicallyIncreasingTime(); 136 136 137 ASSERT(m_lowMemoryHandler); 138 m_lowMemoryHandler(false); 137 releaseMemory(false); 139 138 140 139 unsigned holdOffTime = (monotonicallyIncreasingTime() - startTime) * s_holdOffMultiplier; -
trunk/Source/WebKit/mac/ChangeLog
r142212 r142225 1 2013-02-07 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r142212. 4 http://trac.webkit.org/changeset/142212 5 https://bugs.webkit.org/show_bug.cgi?id=109255 6 7 Causes ASSERT(!m_installed) on launch (Requested by smfr on 8 #webkit). 9 10 * WebView/WebView.mm: 11 (-[WebView _commonInitializationWithFrameName:groupName:]): 12 (WebInstallMemoryPressureHandler): 13 1 14 2013-02-06 Gavin Barraclough <barraclough@apple.com> 2 15 -
trunk/Source/WebKit/mac/WebView/WebView.mm
r142212 r142225 820 820 [[self preferences] _postPreferencesChangedAPINotification]; 821 821 822 memoryPressureHandler().in itialize();822 memoryPressureHandler().install(); 823 823 824 824 if (!WebKitLinkedOnOrAfter(WEBKIT_FIRST_VERSION_WITH_LOCAL_RESOURCE_SECURITY_RESTRICTION)) { … … 6735 6735 void WebInstallMemoryPressureHandler(void) 6736 6736 { 6737 memoryPressureHandler().in itialize();6737 memoryPressureHandler().install(); 6738 6738 } 6739 6739 -
trunk/Source/WebKit2/ChangeLog
r142222 r142225 1 2013-02-07 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r142212. 4 http://trac.webkit.org/changeset/142212 5 https://bugs.webkit.org/show_bug.cgi?id=109255 6 7 Causes ASSERT(!m_installed) on launch (Requested by smfr on 8 #webkit). 9 10 * PluginProcess/PluginProcess.cpp: 11 (WebKit::PluginProcess::initializeProcess): 12 (WebKit::PluginProcess::shouldTerminate): 13 * PluginProcess/PluginProcess.h: 14 (PluginProcess): 15 * WebProcess/WebProcess.cpp: 16 (WebKit::WebProcess::initializeWebProcess): 17 1 18 2013-02-07 Gyuyoung Kim <gyuyoung.kim@samsung.com> 2 19 -
trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp
r142212 r142225 37 37 #include "PluginProcessProxyMessages.h" 38 38 #include "WebProcessConnection.h" 39 #include <WebCore/MemoryPressureHandler.h>40 39 #include <WebCore/NotImplemented.h> 41 40 #include <WebCore/RunLoop.h> … … 87 86 } 88 87 89 void PluginProcess::lowMemoryHandler(bool)90 {91 if (shared().shouldTerminate())92 shared().terminate();93 }94 95 88 void PluginProcess::initializeProcess(const ChildProcessInitializationParameters& parameters) 96 89 { 97 90 m_pluginPath = parameters.extraInitializationData.get("plugin-path"); 98 91 platformInitializeProcess(parameters); 99 100 memoryPressureHandler().initialize(lowMemoryHandler);101 92 } 102 93 … … 135 126 bool PluginProcess::shouldTerminate() 136 127 { 137 return m_webProcessConnections.isEmpty(); 128 ASSERT(m_webProcessConnections.isEmpty()); 129 130 return true; 138 131 } 139 132 -
trunk/Source/WebKit2/PluginProcess/PluginProcess.h
r142212 r142225 109 109 mach_port_t m_compositingRenderServerPort; 110 110 #endif 111 112 static void lowMemoryHandler(bool critical);113 111 }; 114 112 -
trunk/Source/WebKit2/WebProcess/WebProcess.cpp
r142212 r142225 245 245 platformInitializeWebProcess(parameters, decoder); 246 246 247 memoryPressureHandler().in itialize();247 memoryPressureHandler().install(); 248 248 249 249 RefPtr<APIObject> injectedBundleInitializationUserData;
Note: See TracChangeset
for help on using the changeset viewer.