2008-06-26 Anders Carlsson <andersca@apple.com>

        Reviewed by Brady.

        Don't enumerate document.applets trying to determine if a page contains applets.
        Instead, set m_containsPlugIns to true when an applet has been created.
        
        * loader/FrameLoader.cpp:
        (WebCore::FrameLoader::canCachePage):
        (WebCore::FrameLoader::createJavaAppletWidget):



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

WebCore/ChangeLog

+2008-06-26  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Brady.
+
+        Don't enumerate document.applets trying to determine if a page contains applets.
+        Instead, set m_containsPlugIns to true when an applet has been created.
+        
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::canCachePage):
+        (WebCore::FrameLoader::createJavaAppletWidget):
+
 2008-06-26  Alexey Proskuryakov  <ap@webkit.org>
 
         Reviewed by Maciej.

WebCore/loader/FrameLoader.cpp

@@ -1877,7 +1877,6 @@ bool FrameLoader::canCachePage()
         && !m_containsPlugIns
         && !m_URL.protocolIs("https")
         && m_frame->document()
-        && !m_frame->document()->applets()->length()
         && !m_frame->document()->hasWindowEventListener(unloadEvent)
 #if ENABLE(DATABASE)
         && !m_frame->document()->hasOpenDatabases()
@@ -4778,7 +4777,11 @@ Widget* FrameLoader::createJavaAppletWidget(const IntSize& size, Element* elemen
         baseURLString = m_frame->document()->baseURL().string();
     KURL baseURL = completeURL(baseURLString);
 
-    return m_client->createJavaAppletWidget(size, element, baseURL, paramNames, paramValues);
+    Widget* widget = m_client->createJavaAppletWidget(size, element, baseURL, paramNames, paramValues);
+    if (widget)
+        m_containsPlugIns = true;
+    
+    return widget;
 }
 
 void FrameLoader::didChangeTitle(DocumentLoader* loader)