Changeset 84437 in webkit

Timestamp:

Apr 20, 2011 4:50:20 PM (13 years ago)

Author:

andersca@apple.com

Message:

2011-04-20 Anders Carlsson <​andersca@apple.com>

Reviewed by Sam Weinig.

Don't discard backing stores for hung web processes
​https://bugs.webkit.org/show_bug.cgi?id=59039
<rdar://problem/9237090>

• UIProcess/WebPageProxy.cpp: (WebKit::WebPageProxy::viewStateDidChange): (WebKit::WebPageProxy::processDidBecomeUnresponsive): (WebKit::WebPageProxy::processDidBecomeResponsive): Call updateBackingStoreDiscardableState.

(WebKit::WebPageProxy::updateBackingStoreDiscardableState):
Never mark the backing store as discardable if the web process is hung

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (4 diffs)
• UIProcess/WebPageProxy.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-04-20  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Don't discard backing stores for hung web processes
+        https://bugs.webkit.org/show_bug.cgi?id=59039
+        <rdar://problem/9237090>
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::viewStateDidChange):
+        (WebKit::WebPageProxy::processDidBecomeUnresponsive):
+        (WebKit::WebPageProxy::processDidBecomeResponsive):
+        Call updateBackingStoreDiscardableState.
+
+        (WebKit::WebPageProxy::updateBackingStoreDiscardableState):
+        Never mark the backing store as discardable if the web process is hung
+
 2011-04-20  Maciej Stachowiak  <mjs@apple.com>
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -620 +620 @@
 
     if (flags & (ViewWindowIsActive | ViewIsVisible))
-        m_drawingArea->setBackingStoreIsDiscardable(!m_pageClient->isViewWindowActive() || !isViewVisible());
+        updateBackingStoreDiscardableState();
 }
 
@@ -2715 +2715 @@
 void WebPageProxy::processDidBecomeUnresponsive()
 {
+    updateBackingStoreDiscardableState();
+
     m_loaderClient.processDidBecomeUnresponsive(this);
 }
@@ -2720 +2722 @@
 void WebPageProxy::processDidBecomeResponsive()
 {
+    updateBackingStoreDiscardableState();
+
     m_loaderClient.processDidBecomeResponsive(this);
 }
@@ -3005 +3009 @@
 }
 
+void WebPageProxy::updateBackingStoreDiscardableState()
+{
+    bool isDiscardable;
+
+    if (!process()->responsivenessTimer()->isResponsive())
+        isDiscardable = false;
+    else
+        isDiscardable = !m_pageClient->isViewWindowActive() || !isViewVisible();
+
+    m_drawingArea->setBackingStoreIsDiscardable(isDiscardable);
+}
+
 Color WebPageProxy::viewUpdatesFlashColor()
 {

trunk/Source/WebKit2/UIProcess/WebPageProxy.h

@@ -705 +705 @@
     void performDragControllerAction(DragControllerAction, WebCore::DragData*, const String& dragStorageName, const SandboxExtension::Handle&);
 
+    void updateBackingStoreDiscardableState();
+
     PageClient* m_pageClient;
     WebLoaderClient m_loaderClient;