Title: [88953] trunk/Source/WebKit2
- Revision
- 88953
- Author
- [email protected]
- Date
- 2011-06-15 10:12:59 -0700 (Wed, 15 Jun 2011)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (88952 => 88953)
--- trunk/Source/WebKit2/ChangeLog 2011-06-15 17:12:09 UTC (rev 88952)
+++ trunk/Source/WebKit2/ChangeLog 2011-06-15 17:12:59 UTC (rev 88953)
@@ -1,3 +1,24 @@
+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-15 Sheriff Bot <[email protected]>
Unreviewed, rolling out r88907.
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (88952 => 88953)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2011-06-15 17:12:09 UTC (rev 88952)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2011-06-15 17:12:59 UTC (rev 88953)
@@ -378,7 +378,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);
@@ -2865,6 +2865,9 @@
void WebPageProxy::processDidBecomeUnresponsive()
{
+ if (!isValid())
+ return;
+
updateBackingStoreDiscardableState();
m_loaderClient.processDidBecomeUnresponsive(this);
@@ -2872,6 +2875,9 @@
void WebPageProxy::processDidBecomeResponsive()
{
+ if (!isValid())
+ return;
+
updateBackingStoreDiscardableState();
m_loaderClient.processDidBecomeResponsive(this);
@@ -3191,6 +3197,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
