Changeset 29679 in webkit

Timestamp:

Jan 20, 2008 6:01:26 PM (16 years ago)

Author:

mitz@apple.com

Message:

Reviewed by Darin Adler.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=16951

Assertion failure in FrameView::scheduleRelayout (!m_frame->document()

!m_frame->document()->inPageCache()) when going back from a page with a focused popup

• dom/Document.cpp: (WebCore::Document::setFocusedNode): Bail out if the document is in the page cache. Documents in the back/forward cache are "frozen" and should not change state.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-01-20  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=16951
+          Assertion failure in FrameView::scheduleRelayout (!m_frame->document() || !m_frame->document()->inPageCache()) when going back from a page with a focused popup
+
+        * dom/Document.cpp:
+        (WebCore::Document::setFocusedNode): Bail out if the document is in the
+        page cache. Documents in the back/forward cache are "frozen" and should
+        not change state.
+
 2008-01-20  Collin Jackson  <webkit@collinjackson.com>
 

trunk/WebCore/dom/Document.cpp

@@ -2263 +2263 @@
     if (m_focusedNode == newFocusedNode)
         return true;
-        
+
+    if (m_inPageCache)
+        return false;
+
     bool focusChangeBlocked = false;
     RefPtr<Node> oldFocusedNode = m_focusedNode;