Changeset 69041 in webkit

Timestamp:

Oct 4, 2010 3:14:32 PM (14 years ago)

Author:

ap@apple.com

Message:

Reviewed by Adam Barth.

​https://bugs.webkit.org/show_bug.cgi?id=43506
<rdar://problem/8289284> foreign-iframe-main.html occasionally crashes (during the next test,
idempotent-update.html)

Application cache doesn't use ResourceLoader machinery (for better or worse), so we need to
abort update process explicitly.

Note that in principle, update could piggyback on any other existing frame - or even run
frameless - but currently, it's tied to the first frame that requested update.

• loader/DocumentLoader.cpp: (WebCore::DocumentLoader::stopLoading):
• loader/appcache/ApplicationCacheGroup.cpp: (WebCore::ApplicationCacheGroup::stopLoadingInFrame):
• loader/appcache/ApplicationCacheGroup.h:
• loader/appcache/ApplicationCacheHost.cpp: (WebCore::ApplicationCacheHost::~ApplicationCacheHost): (WebCore::ApplicationCacheHost::stopLoadingInFrame):
• loader/appcache/ApplicationCacheHost.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/DocumentLoader.cpp (modified) (1 diff)
• loader/appcache/ApplicationCacheGroup.cpp (modified) (1 diff)
• loader/appcache/ApplicationCacheGroup.h (modified) (1 diff)
• loader/appcache/ApplicationCacheHost.cpp (modified) (2 diffs)
• loader/appcache/ApplicationCacheHost.h (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-04  Alexey Proskuryakov  <ap@apple.com>
+
+        Reviewed by Adam Barth.
+
+        https://bugs.webkit.org/show_bug.cgi?id=43506
+        <rdar://problem/8289284> foreign-iframe-main.html occasionally crashes (during the next test,
+        idempotent-update.html)
+
+        Application cache doesn't use ResourceLoader machinery (for better or worse), so we need to
+        abort update process explicitly.
+
+        Note that in principle, update could piggyback on any other existing frame - or even run
+        frameless - but currently, it's tied to the first frame that requested update.
+
+        * loader/DocumentLoader.cpp:
+        (WebCore::DocumentLoader::stopLoading):
+        * loader/appcache/ApplicationCacheGroup.cpp:
+        (WebCore::ApplicationCacheGroup::stopLoadingInFrame):
+        * loader/appcache/ApplicationCacheGroup.h:
+        * loader/appcache/ApplicationCacheHost.cpp:
+        (WebCore::ApplicationCacheHost::~ApplicationCacheHost):
+        (WebCore::ApplicationCacheHost::stopLoadingInFrame):
+        * loader/appcache/ApplicationCacheHost.h:
+
 2010-10-04  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/loader/DocumentLoader.cpp

@@ -221 +221 @@
     cancelAll(m_multipartSubresourceLoaders);
 
+    // Appcache uses ResourceHandle directly, DocumentLoader doesn't count these loads.
+#if ENABLE(OFFLINE_WEB_APPLICATIONS)
+    m_applicationCacheHost->stopLoadingInFrame(m_frame);
+#endif
+
     if (!loading)
         return;

trunk/WebCore/loader/appcache/ApplicationCacheGroup.cpp

@@ -385 +385 @@
 }
 
+void ApplicationCacheGroup::stopLoadingInFrame(Frame* frame)
+{
+    if (frame != m_frame)
+        return;
+
+    stopLoading();
+}
+
 #if ENABLE(INSPECTOR)
 static void inspectorUpdateApplicationCacheStatus(Frame* frame)

trunk/WebCore/loader/appcache/ApplicationCacheGroup.h

@@ -81 +81 @@
     bool cacheIsBeingUpdated(const ApplicationCache* cache) const { return cache == m_cacheBeingUpdated; }
 
+    void stopLoadingInFrame(Frame*);
+
     ApplicationCache* newestCache() const { return m_newestCache.get(); }
     void setNewestCache(PassRefPtr<ApplicationCache>);

trunk/WebCore/loader/appcache/ApplicationCacheHost.cpp

@@ -56 +56 @@
 ApplicationCacheHost::~ApplicationCacheHost()
 {
+    ASSERT(!m_applicationCache || !m_candidateApplicationCacheGroup || m_applicationCache->group() == m_candidateApplicationCacheGroup);
+
     if (m_applicationCache)
         m_applicationCache->group()->disassociateDocumentLoader(m_documentLoader);
@@ -238 +240 @@
     }
     dispatchDOMEvent(id, total, done);
+}
+
+void ApplicationCacheHost::stopLoadingInFrame(Frame* frame)
+{
+    ASSERT(!m_applicationCache || !m_candidateApplicationCacheGroup || m_applicationCache->group() == m_candidateApplicationCacheGroup);
+
+    if (m_candidateApplicationCacheGroup)
+        m_candidateApplicationCacheGroup->stopLoadingInFrame(frame);
+    else if (m_applicationCache)
+        m_applicationCache->group()->stopLoadingInFrame(frame);
 }
 

trunk/WebCore/loader/appcache/ApplicationCacheHost.h

@@ -44 +44 @@
     class DOMApplicationCache;
     class DocumentLoader;
+    class Frame;
     class ResourceLoader;
     class ResourceError;
@@ -145 +146 @@
         void notifyDOMApplicationCache(EventID, int progressTotal, int progressDone);
 
+        void stopLoadingInFrame(Frame*);
+
         void stopDeferringEvents(); // Also raises the events that have been queued up.