Changeset 142225 in webkit

Timestamp:

Feb 7, 2013 9:32:45 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

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).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2013-02-07

Source/WebCore:

• WebCore.exp.in:
• platform/MemoryPressureHandler.cpp:

(WebCore):
(WebCore::MemoryPressureHandler::respondToMemoryPressure):

• platform/MemoryPressureHandler.h:

(MemoryPressureHandler):

• platform/mac/MemoryPressureHandlerMac.mm:

(WebCore::MemoryPressureHandler::respondToMemoryPressure):

Source/WebKit/mac:

• WebView/WebView.mm:

(-[WebView _commonInitializationWithFrameName:groupName:]):
(WebInstallMemoryPressureHandler):

Source/WebKit2:

• PluginProcess/PluginProcess.cpp:

(WebKit::PluginProcess::initializeProcess):
(WebKit::PluginProcess::shouldTerminate):

• PluginProcess/PluginProcess.h:

(PluginProcess):

• WebProcess/WebProcess.cpp:

(WebKit::WebProcess::initializeWebProcess):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp.in (modified) (1 diff)
• WebCore/platform/MemoryPressureHandler.cpp (modified) (1 diff)
• WebCore/platform/MemoryPressureHandler.h (modified) (3 diffs)
• WebCore/platform/mac/MemoryPressureHandlerMac.mm (modified) (1 diff)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebView/WebView.mm (modified) (2 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/PluginProcess/PluginProcess.cpp (modified) (3 diffs)
• WebKit2/PluginProcess/PluginProcess.h (modified) (1 diff)
• WebKit2/WebProcess/WebProcess.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-07  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        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  <choco@company100.net>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -601 +601 @@
 __ZN7WebCore20SpaceSplitStringDataD1Ev
 __ZN7WebCore21BackForwardController11itemAtIndexEi
-__ZN7WebCore21MemoryPressureHandler13releaseMemoryEb
 __ZN7WebCore21MemoryPressureHandler7installEv
 __ZN7WebCore21NetworkStorageSession28createPrivateBrowsingSessionERKN3WTF6StringE

trunk/Source/WebCore/platform/MemoryPressureHandler.cpp

@@ -44 +44 @@
 
 #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
  

trunk/Source/WebCore/platform/MemoryPressureHandler.h

@@ -32 +32 @@
 namespace WebCore {
 
-typedef void (*LowMemoryHandler)(bool critical);
-
 class MemoryPressureHandler {
     WTF_MAKE_FAST_ALLOCATED;
@@ -39 +37 @@
     friend MemoryPressureHandler& memoryPressureHandler();
 
-    void initialize(LowMemoryHandler handler = releaseMemory)
-    {
-        ASSERT(!m_installed);
-        m_lowMemoryHandler = handler;
-        install();
-    }
-
-private:
     void install();
     void uninstall();
@@ -52 +42 @@
     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;
 };
  

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

@@ -135 +135 @@
     double startTime = monotonicallyIncreasingTime();
 
-    ASSERT(m_lowMemoryHandler);
-    m_lowMemoryHandler(false);
+    releaseMemory(false);
 
     unsigned holdOffTime = (monotonicallyIncreasingTime() - startTime) * s_holdOffMultiplier;

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2013-02-07  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        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  <barraclough@apple.com>
 

trunk/Source/WebKit/mac/WebView/WebView.mm

@@ -820 +820 @@
     [[self preferences] _postPreferencesChangedAPINotification];
 
-    memoryPressureHandler().initialize();
+    memoryPressureHandler().install();
 
     if (!WebKitLinkedOnOrAfter(WEBKIT_FIRST_VERSION_WITH_LOCAL_RESOURCE_SECURITY_RESTRICTION)) {
@@ -6735 +6735 @@
 void WebInstallMemoryPressureHandler(void)
 {
-    memoryPressureHandler().initialize();
+    memoryPressureHandler().install();
 }
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-02-07  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        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  <gyuyoung.kim@samsung.com>
 

trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp

@@ -37 +37 @@
 #include "PluginProcessProxyMessages.h"
 #include "WebProcessConnection.h"
-#include <WebCore/MemoryPressureHandler.h>
 #include <WebCore/NotImplemented.h>
 #include <WebCore/RunLoop.h>
@@ -87 +86 @@
 }
 
-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);
 }
 
@@ -135 +126 @@
 bool PluginProcess::shouldTerminate()
 {
-    return m_webProcessConnections.isEmpty();
+    ASSERT(m_webProcessConnections.isEmpty());
+
+    return true;
 }
 

trunk/Source/WebKit2/PluginProcess/PluginProcess.h

@@ -109 +109 @@
     mach_port_t m_compositingRenderServerPort;
 #endif
-
-    static void lowMemoryHandler(bool critical);
 };
 

trunk/Source/WebKit2/WebProcess/WebProcess.cpp

@@ -245 +245 @@
     platformInitializeWebProcess(parameters, decoder);
 
-    memoryPressureHandler().initialize();
+    memoryPressureHandler().install();
 
     RefPtr<APIObject> injectedBundleInitializationUserData;