Title: [89082] branches/safari-534-branch/Source/WebKit2
Diff
Modified: branches/safari-534-branch/Source/WebKit2/ChangeLog (89081 => 89082)
--- branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-06-16 23:31:29 UTC (rev 89081)
+++ branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-06-16 23:32:58 UTC (rev 89082)
@@ -1,5 +1,30 @@
2011-06-14 Lucas Forschler <[email protected]>
+ Merged 88953.
+
+ 2011-06-15 Anders Carlsson <[email protected]>
+
+ Reviewed by Dan Bernstein.
+
+ Ignore responsiveness timer callbacks on closed pages
+ https://bugs.webkit.org/show_bug.cgi?id=62735
+ <rdar://problem/9511295>
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::close):
+ Use nullptr instead of clear.
+
+ (WebKit::WebPageProxy::processDidBecomeUnresponsive):
+ Return early if the page isn't valid.
+
+ (WebKit::WebPageProxy::processDidBecomeResponsive):
+ Ditto.
+
+ (WebKit::WebPageProxy::updateBackingStoreDiscardableState):
+ Assert that the page is valid.
+
+2011-06-14 Lucas Forschler <[email protected]>
+
Merged 88856.
2011-06-14 John Sullivan <[email protected]>
Modified: branches/safari-534-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp (89081 => 89082)
--- branches/safari-534-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2011-06-16 23:31:29 UTC (rev 89081)
+++ branches/safari-534-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2011-06-16 23:32:58 UTC (rev 89082)
@@ -353,7 +353,7 @@
m_policyClient.initialize(0);
m_uiClient.initialize(0);
- m_drawingArea.clear();
+ m_drawingArea = nullptr;
process()->send(Messages::WebPage::Close(), m_pageID);
process()->removeWebPage(m_pageID);
@@ -2836,6 +2836,9 @@
void WebPageProxy::processDidBecomeUnresponsive()
{
+ if (!isValid())
+ return;
+
updateBackingStoreDiscardableState();
m_loaderClient.processDidBecomeUnresponsive(this);
@@ -2843,6 +2846,9 @@
void WebPageProxy::processDidBecomeResponsive()
{
+ if (!isValid())
+ return;
+
updateBackingStoreDiscardableState();
m_loaderClient.processDidBecomeResponsive(this);
@@ -3162,6 +3168,8 @@
void WebPageProxy::updateBackingStoreDiscardableState()
{
+ ASSERT(isValid());
+
bool isDiscardable;
if (!process()->responsivenessTimer()->isResponsive())
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
