Changeset 70696 in webkit

Timestamp:

Oct 27, 2010 1:10:20 PM (13 years ago)

Author:

andersca@apple.com

Message:

WebPageProxy::isValid should return false if the page has been explicitly closed
​https://bugs.webkit.org/show_bug.cgi?id=48458

Reviewed by Sam Weinig.

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::WebPageProxy):
(WebKit::WebPageProxy::isValid):
(WebKit::WebPageProxy::relaunch):
(WebKit::WebPageProxy::close):
(WebKit::WebPageProxy::processDidCrash):

• UIProcess/WebPageProxy.h:

(WebKit::WebPageProxy::isClosed):

Location:

trunk/WebKit2

Files:

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

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-10-27  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        WebPageProxy::isValid should return false if the page has been explicitly closed
+        https://bugs.webkit.org/show_bug.cgi?id=48458
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::WebPageProxy):
+        (WebKit::WebPageProxy::isValid):
+        (WebKit::WebPageProxy::relaunch):
+        (WebKit::WebPageProxy::close):
+        (WebKit::WebPageProxy::processDidCrash):
+        * UIProcess/WebPageProxy.h:
+        (WebKit::WebPageProxy::isClosed):
+
 2010-10-27  Anders Carlsson  <andersca@apple.com>
 

trunk/WebKit2/UIProcess/WebPageProxy.cpp

@@ -84 +84 @@
     , m_textZoomFactor(1)
     , m_pageZoomFactor(1)
-    , m_valid(true)
-    , m_closed(false)
+    , m_isValid(true)
+    , m_isClosed(false)
     , m_pageID(pageID)
 {
@@ -107 +107 @@
 bool WebPageProxy::isValid()
 {
-    return m_valid;
+    // A page that has been explicitly closed is never valid.
+    if (m_isClosed)
+        return false;
+
+    return m_isValid;
 }
 
@@ -150 +154 @@
 void WebPageProxy::relaunch()
 {
-    m_valid = true;
+    m_isValid = true;
     m_pageNamespace->context()->relaunchProcessIfNecessary();
     m_pageNamespace->process()->addExistingWebPage(this, m_pageID);
@@ -182 +186 @@
         return;
 
-    m_closed = true;
+    m_isClosed = true;
 
     process()->disconnectFramesFromPage(this);
@@ -1207 +1211 @@
     ASSERT(m_pageClient);
 
-    m_valid = false;
+    m_isValid = false;
 
     if (m_mainFrame)

trunk/WebKit2/UIProcess/WebPageProxy.h

@@ -125 +125 @@
     void close();
     bool tryClose();
-    bool isClosed() const { return m_closed; }
+    bool isClosed() const { return m_isClosed; }
 
     void loadURL(const String&);
@@ -363 +363 @@
     double m_pageZoomFactor;
     
-    bool m_valid;
-    bool m_closed;
+    // If the process backing the web page is alive and kicking.
+    bool m_isValid;
+
+    // Whether WebPageProxy::close() has been called on this page.
+    bool m_isClosed;
 
     uint64_t m_pageID;