Diff
Modified: trunk/Source/WebCore/ChangeLog (142224 => 142225)
--- trunk/Source/WebCore/ChangeLog 2013-02-08 05:03:44 UTC (rev 142224)
+++ trunk/Source/WebCore/ChangeLog 2013-02-08 05:32:45 UTC (rev 142225)
@@ -1,3 +1,21 @@
+2013-02-07 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r142212.
+ http://trac.webkit.org/changeset/142212
+ https://bugs.webkit.org/show_bug.cgi?id=109255
+
+ Causes ASSERT(!m_installed) on launch (Requested by smfr on
+ #webkit).
+
+ * WebCore.exp.in:
+ * platform/MemoryPressureHandler.cpp:
+ (WebCore):
+ (WebCore::MemoryPressureHandler::respondToMemoryPressure):
+ * platform/MemoryPressureHandler.h:
+ (MemoryPressureHandler):
+ * platform/mac/MemoryPressureHandlerMac.mm:
+ (WebCore::MemoryPressureHandler::respondToMemoryPressure):
+
2013-02-07 Hanyee Kim <[email protected]>
NamedFlowCollection should be a ContextDestructionObserver
Modified: trunk/Source/WebCore/WebCore.exp.in (142224 => 142225)
--- trunk/Source/WebCore/WebCore.exp.in 2013-02-08 05:03:44 UTC (rev 142224)
+++ trunk/Source/WebCore/WebCore.exp.in 2013-02-08 05:32:45 UTC (rev 142225)
@@ -600,7 +600,6 @@
__ZN7WebCore20protocolIsJavaScriptERKN3WTF6StringE
__ZN7WebCore20SpaceSplitStringDataD1Ev
__ZN7WebCore21BackForwardController11itemAtIndexEi
-__ZN7WebCore21MemoryPressureHandler13releaseMemoryEb
__ZN7WebCore21MemoryPressureHandler7installEv
__ZN7WebCore21NetworkStorageSession28createPrivateBrowsingSessionERKN3WTF6StringE
__ZN7WebCore21PlatformKeyboardEvent24disambiguateKeyDownEventENS_13PlatformEvent4TypeEb
Modified: trunk/Source/WebCore/platform/MemoryPressureHandler.cpp (142224 => 142225)
--- trunk/Source/WebCore/platform/MemoryPressureHandler.cpp 2013-02-08 05:03:44 UTC (rev 142224)
+++ trunk/Source/WebCore/platform/MemoryPressureHandler.cpp 2013-02-08 05:32:45 UTC (rev 142225)
@@ -43,13 +43,13 @@
}
#if !PLATFORM(MAC) || PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED == 1060
+void MemoryPressureHandler::install() { }
-void MemoryPressureHandler::install() { }
void MemoryPressureHandler::uninstall() { }
+
void MemoryPressureHandler::holdOff(unsigned) { }
+
void MemoryPressureHandler::respondToMemoryPressure() { }
-void MemoryPressureHandler::releaseMemory(bool) { }
-
#endif
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/MemoryPressureHandler.h (142224 => 142225)
--- trunk/Source/WebCore/platform/MemoryPressureHandler.h 2013-02-08 05:03:44 UTC (rev 142224)
+++ trunk/Source/WebCore/platform/MemoryPressureHandler.h 2013-02-08 05:32:45 UTC (rev 142225)
@@ -31,35 +31,25 @@
namespace WebCore {
-typedef void (*LowMemoryHandler)(bool critical);
-
class MemoryPressureHandler {
WTF_MAKE_FAST_ALLOCATED;
public:
friend MemoryPressureHandler& memoryPressureHandler();
- void initialize(LowMemoryHandler handler = releaseMemory)
- {
- ASSERT(!m_installed);
- m_lowMemoryHandler = handler;
- install();
- }
-
-private:
void install();
void uninstall();
void holdOff(unsigned);
+private:
MemoryPressureHandler();
~MemoryPressureHandler();
void respondToMemoryPressure();
- static void releaseMemory(bool critical);
+ void releaseMemory(bool critical);
bool m_installed;
time_t m_lastRespondTime;
- LowMemoryHandler m_lowMemoryHandler;
};
// Function to obtain the global memory pressure object.
Modified: trunk/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm (142224 => 142225)
--- trunk/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm 2013-02-08 05:03:44 UTC (rev 142224)
+++ trunk/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm 2013-02-08 05:32:45 UTC (rev 142225)
@@ -134,8 +134,7 @@
double startTime = monotonicallyIncreasingTime();
- ASSERT(m_lowMemoryHandler);
- m_lowMemoryHandler(false);
+ releaseMemory(false);
unsigned holdOffTime = (monotonicallyIncreasingTime() - startTime) * s_holdOffMultiplier;
Modified: trunk/Source/WebKit/mac/ChangeLog (142224 => 142225)
--- trunk/Source/WebKit/mac/ChangeLog 2013-02-08 05:03:44 UTC (rev 142224)
+++ trunk/Source/WebKit/mac/ChangeLog 2013-02-08 05:32:45 UTC (rev 142225)
@@ -1,3 +1,16 @@
+2013-02-07 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r142212.
+ http://trac.webkit.org/changeset/142212
+ https://bugs.webkit.org/show_bug.cgi?id=109255
+
+ Causes ASSERT(!m_installed) on launch (Requested by smfr on
+ #webkit).
+
+ * WebView/WebView.mm:
+ (-[WebView _commonInitializationWithFrameName:groupName:]):
+ (WebInstallMemoryPressureHandler):
+
2013-02-06 Gavin Barraclough <[email protected]>
PluginProcess should quit immediately if idle in response to low-memory notifications
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (142224 => 142225)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2013-02-08 05:03:44 UTC (rev 142224)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2013-02-08 05:32:45 UTC (rev 142225)
@@ -819,7 +819,7 @@
[self _preferencesChanged:[self preferences]];
[[self preferences] _postPreferencesChangedAPINotification];
- memoryPressureHandler().initialize();
+ memoryPressureHandler().install();
if (!WebKitLinkedOnOrAfter(WEBKIT_FIRST_VERSION_WITH_LOCAL_RESOURCE_SECURITY_RESTRICTION)) {
// Originally, we allowed all local loads.
@@ -6734,7 +6734,7 @@
void WebInstallMemoryPressureHandler(void)
{
- memoryPressureHandler().initialize();
+ memoryPressureHandler().install();
}
#if __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
Modified: trunk/Source/WebKit2/ChangeLog (142224 => 142225)
--- trunk/Source/WebKit2/ChangeLog 2013-02-08 05:03:44 UTC (rev 142224)
+++ trunk/Source/WebKit2/ChangeLog 2013-02-08 05:32:45 UTC (rev 142225)
@@ -1,3 +1,20 @@
+2013-02-07 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r142212.
+ http://trac.webkit.org/changeset/142212
+ https://bugs.webkit.org/show_bug.cgi?id=109255
+
+ Causes ASSERT(!m_installed) on launch (Requested by smfr on
+ #webkit).
+
+ * PluginProcess/PluginProcess.cpp:
+ (WebKit::PluginProcess::initializeProcess):
+ (WebKit::PluginProcess::shouldTerminate):
+ * PluginProcess/PluginProcess.h:
+ (PluginProcess):
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::initializeWebProcess):
+
2013-02-07 Gyuyoung Kim <[email protected]>
[EFL][WK2] Remove dead code after r142169
Modified: trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp (142224 => 142225)
--- trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp 2013-02-08 05:03:44 UTC (rev 142224)
+++ trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp 2013-02-08 05:32:45 UTC (rev 142225)
@@ -36,7 +36,6 @@
#include "PluginProcessCreationParameters.h"
#include "PluginProcessProxyMessages.h"
#include "WebProcessConnection.h"
-#include <WebCore/MemoryPressureHandler.h>
#include <WebCore/NotImplemented.h>
#include <WebCore/RunLoop.h>
@@ -86,18 +85,10 @@
{
}
-void PluginProcess::lowMemoryHandler(bool)
-{
- if (shared().shouldTerminate())
- shared().terminate();
-}
-
void PluginProcess::initializeProcess(const ChildProcessInitializationParameters& parameters)
{
m_pluginPath = parameters.extraInitializationData.get("plugin-path");
platformInitializeProcess(parameters);
-
- memoryPressureHandler().initialize(lowMemoryHandler);
}
void PluginProcess::removeWebProcessConnection(WebProcessConnection* webProcessConnection)
@@ -134,7 +125,9 @@
bool PluginProcess::shouldTerminate()
{
- return m_webProcessConnections.isEmpty();
+ ASSERT(m_webProcessConnections.isEmpty());
+
+ return true;
}
void PluginProcess::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
Modified: trunk/Source/WebKit2/PluginProcess/PluginProcess.h (142224 => 142225)
--- trunk/Source/WebKit2/PluginProcess/PluginProcess.h 2013-02-08 05:03:44 UTC (rev 142224)
+++ trunk/Source/WebKit2/PluginProcess/PluginProcess.h 2013-02-08 05:32:45 UTC (rev 142225)
@@ -108,8 +108,6 @@
// The Mach port used for accelerated compositing.
mach_port_t m_compositingRenderServerPort;
#endif
-
- static void lowMemoryHandler(bool critical);
};
} // namespace WebKit
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (142224 => 142225)
--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2013-02-08 05:03:44 UTC (rev 142224)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2013-02-08 05:32:45 UTC (rev 142225)
@@ -244,7 +244,7 @@
platformInitializeWebProcess(parameters, decoder);
- memoryPressureHandler().initialize();
+ memoryPressureHandler().install();
RefPtr<APIObject> injectedBundleInitializationUserData;
InjectedBundleUserMessageDecoder messageDecoder(injectedBundleInitializationUserData);
