2006-01-19 Eric Seidel <eseidel@apple.com>
authoreseidel <eseidel@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 20 Jan 2006 01:22:30 +0000 (01:22 +0000)
committereseidel <eseidel@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 20 Jan 2006 01:22:30 +0000 (01:22 +0000)
        Reviewed by darin.

        <embed> and <object> tags show up blank when going back/forward.
        http://bugzilla.opendarwin.org/show_bug.cgi?id=6679

        No test currently possible.

        * page/Frame.cpp:
        (Frame::canCachePage):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@12250 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/page/Frame.cpp

index bc30a26..31069db 100644 (file)
@@ -2,6 +2,18 @@
 
         Reviewed by darin.
 
+        <embed> and <object> tags show up blank when going back/forward.
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=6679
+
+        No test currently possible.
+
+        * page/Frame.cpp:
+        (Frame::canCachePage):
+
+2006-01-19  Eric Seidel  <eseidel@apple.com>
+
+        Reviewed by darin.
+
         Split html_miscimpl.* into separate files and move html_elementimpl
         http://bugzilla.opendarwin.org/show_bug.cgi?id=6670
 
index 74767d9..5c4f2f9 100644 (file)
@@ -3331,7 +3331,7 @@ bool Frame::canCachePage()
     // 3.  The page has no password fields.
     // 4.  The URL for the page is not https.
     // 5.  The page has no applets.
-    if (d->m_frames.count() ||
+    if (d->m_frames.count() || d->m_objects.count() ||
         parentFrame() ||
         m_url.protocol().startsWith("https") || 
         (d->m_doc && (d->m_doc->applets()->length() != 0 ||