Changeset 25395 in webkit

Timestamp:

Sep 6, 2007 12:39:32 PM (17 years ago)

Author:

darin

Message:

Reviewed by Hyatt.

• <rdar://problem/5457865> REGRESSION (9A527): Safari crashes when opening a page that immediately redirects to a PDF

I don't know how to make an automated test that trips over this.

The immediate cause of this regression was making a back/forward list entry in
this case. Earlier, the quick redirect would not results in a separate entry.
That's possibly a bug too, but it's better to fix the crash first.

The page cache was putting the document into a strange state: Still attached but
with the renderer set to 0. There was no good reason to do this, so got rid of it.
Moved the responsibility to the caller of not calling detach() when moving into
the page cache. This is more of a frame loader thing than a document thing.

• dom/Document.cpp: (WebCore::Document::detach): Added assertions that this is only called on a document that's attached and not in the page cache. Also moved the call to willRemove in here, so that callers can't make the mistake of not calling that function. Removed the incorrectly-positioned code that made this function do less if it was called on a document in the page cache.

• history/CachedPage.cpp: (WebCore::CachedPage::clear): Removed the code to handle a document with a renderer of 0. There was no need to put the document into this state. Any document in the page cache will always be "attached".

• loader/FrameLoader.cpp: (WebCore::FrameLoader::clear): Added a check to prevent from calling an unnecessary cancelParsing() on a document that's in the page cache and guard the call to detach() with a check of attached(), like all other calls to detach() on DOM objects.

• page/Frame.cpp: (WebCore::Frame::setView): Added a missing check of attached(), like all other calls to detach() on DOM objects. Also added code to not call detach() on the document when it's in the page cache. (WebCore::Frame::setDocument): This call site already had the attached() check, but was missing the page cache check.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (2 diffs)
• history/CachedPage.cpp (modified) (1 diff)
• loader/FrameLoader.cpp (modified) (1 diff)
• page/Frame.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-09-06  Darin Adler  <darin@apple.com>
+
+        Reviewed by Hyatt.
+
+        - <rdar://problem/5457865> REGRESSION (9A527): Safari crashes when opening a page
+          that immediately redirects to a PDF
+
+        I don't know how to make an automated test that trips over this.
+
+        The immediate cause of this regression was making a back/forward list entry in
+        this case. Earlier, the quick redirect would not results in a separate entry.
+        That's possibly a bug too, but it's better to fix the crash first.
+
+        The page cache was putting the document into a strange state: Still attached but
+        with the renderer set to 0. There was no good reason to do this, so got rid of it.
+        Moved the responsibility to the caller of not calling detach() when moving into
+        the page cache. This is more of a frame loader thing than a document thing.
+
+        * dom/Document.cpp: (WebCore::Document::detach): Added assertions that this is
+        only called on a document that's attached and not in the page cache. Also moved
+        the call to willRemove in here, so that callers can't make the mistake of not
+        calling that function. Removed the incorrectly-positioned code that made this
+        function do less if it was called on a document in the page cache.
+
+        * history/CachedPage.cpp: (WebCore::CachedPage::clear): Removed the code to handle
+        a document with a renderer of 0. There was no need to put the document into this
+        state. Any document in the page cache will always be "attached".
+
+        * loader/FrameLoader.cpp: (WebCore::FrameLoader::clear): Added a check to prevent
+        from calling an unnecessary cancelParsing() on a document that's in the page cache
+        and guard the call to detach() with a check of attached(), like all other calls to
+        detach() on DOM objects.
+
+        * page/Frame.cpp:
+        (WebCore::Frame::setView): Added a missing check of attached(), like all other
+        calls to detach() on DOM objects. Also added code to not call detach() on the
+        document when it's in the page cache.
+        (WebCore::Frame::setDocument): This call site already had the attached() check,
+        but was missing the page cache check.
+
 2007-09-05  David Harrison  <harrison@apple.com>
 

trunk/WebCore/dom/Document.cpp

@@ -1138 +1138 @@
 void Document::detach()
 {
+    ASSERT(attached());
+    ASSERT(!m_inPageCache);
+
+    willRemove();
+
     RenderObject* render = renderer();
 
@@ -1143 +1148 @@
     setRenderer(0);
     
-    if (m_inPageCache) {
-        if (render)
-            axObjectCache()->remove(render);
-        return;
-    }
-
     // Empty out these lists as a performance optimization, since detaching
     // all the individual render objects will cause all the RenderImage

trunk/WebCore/history/CachedPage.cpp

@@ -163 +163 @@
         Frame::clearTimers(m_view.get());
 
-        bool detached = !m_document->renderer();
         m_document->setInPageCache(false);
-        if (detached) {
-            m_document->detach();
-            m_document->removeAllEventListenersFromAllNodes();
-        }
+        m_document->detach();
+        m_document->removeAllEventListenersFromAllNodes();
 
         m_view->clearFrame();

trunk/WebCore/loader/FrameLoader.cpp

@@ -780 +780 @@
     m_needsClear = false;
     
-    if (m_frame->document()) {
+    if (m_frame->document() && !m_frame->document()->inPageCache()) {
         m_frame->document()->cancelParsing();
-        m_frame->document()->willRemove();
-        m_frame->document()->detach();
+        if (m_frame->document()->attached())
+            m_frame->document()->detach();
     }
 

trunk/WebCore/page/Frame.cpp

@@ -232 +232 @@
     // we wait until the view is destroyed, then things won't be
     // hooked up enough for some JavaScript calls to work.
-    if (d->m_doc && view == 0) {
+    if (!view && d->m_doc && d->m_doc->attached() && !d->m_doc->inPageCache()) {
         d->m_doc->detach();
         if (d->m_view)
@@ -268 +268 @@
 void Frame::setDocument(PassRefPtr<Document> newDoc)
 {
-    if (d->m_doc && d->m_doc->attached())
+    if (d->m_doc && d->m_doc->attached() && !d->m_doc->inPageCache())
         d->m_doc->detach();