Changeset 20206 in webkit

Timestamp:

Mar 14, 2007 9:00:06 PM (17 years ago)

Author:

andersca

Message:

Reviewed by Geoff.

​http://bugs.webkit.org/show_bug.cgi?id=13076
REGRESSION: Multiple loading tabs cause assertion in WebDocumentLoaderMac::decreaseLoadCount(unsigned long)

Store the identifier set in the document loader since identifiers are per-webview and not global.

• WebView/WebDocumentLoaderMac.h:
• WebView/WebDocumentLoaderMac.mm: (WebDocumentLoaderMac::WebDocumentLoaderMac): (WebDocumentLoaderMac::attachToFrame): (WebDocumentLoaderMac::increaseLoadCount): (WebDocumentLoaderMac::decreaseLoadCount):

Location:

trunk/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebView/WebDocumentLoaderMac.h (modified) (2 diffs)
• WebView/WebDocumentLoaderMac.mm (modified) (3 diffs)

trunk/WebKit/ChangeLog

@@ +1 @@
+2007-03-14  Anders Carlsson  <acarlsson@apple.com>
+
+        Reviewed by Geoff.
+
+        http://bugs.webkit.org/show_bug.cgi?id=13076
+        REGRESSION: Multiple loading tabs cause assertion in WebDocumentLoaderMac::decreaseLoadCount(unsigned long)
+
+        Store the identifier set in the document loader since identifiers are per-webview and not global.
+        
+        * WebView/WebDocumentLoaderMac.h:
+        * WebView/WebDocumentLoaderMac.mm:
+        (WebDocumentLoaderMac::WebDocumentLoaderMac):
+        (WebDocumentLoaderMac::attachToFrame):
+        (WebDocumentLoaderMac::increaseLoadCount):
+        (WebDocumentLoaderMac::decreaseLoadCount):
+
 2007-03-14  David Harrison  <harrison@apple.com>
 

trunk/WebKit/WebView/WebDocumentLoaderMac.h

@@ -28 +28 @@
 
 #import <WebCore/DocumentLoader.h>
+#import <wtf/HashSet.h>
 
 @class WebDataSource;
@@ -51 +52 @@
     WebDataSource *m_dataSource;
     bool m_hasEverBeenDetached;
-    unsigned m_loadCount;
+    HashSet<unsigned long> m_loadingResources;
 };

trunk/WebKit/WebView/WebDocumentLoaderMac.mm

@@ -35 +35 @@
 using namespace WebCore;
 
-static HashSet<unsigned long>& loadingResources()
-{
-    static HashSet<unsigned long> resources;
-    
-    return resources;
-}
-
 WebDocumentLoaderMac::WebDocumentLoaderMac(const ResourceRequest& request, const SubstituteData& substituteData)
     : DocumentLoader(request, substituteData)
     , m_dataSource(nil)
     , m_hasEverBeenDetached(false)
-    , m_loadCount(0)
 {
 }
@@ -65 +57 @@
 {
     DocumentLoader::attachToFrame();
-    ASSERT(m_loadCount == 0);
+    ASSERT(m_loadingResources.isEmpty());
 
     if (m_hasEverBeenDetached)
@@ -83 +75 @@
     ASSERT(m_dataSource);
     
-    if (loadingResources().contains(identifier))
+    if (m_loadingResources.contains(identifier))
         return;
-    
-    loadingResources().add(identifier);
-       
-    if (m_loadCount == 0)
+
+    if (m_loadingResources.isEmpty() == 0)
         HardRetain(m_dataSource);
-    
-    m_loadCount++;
+
+    m_loadingResources.add(identifier);
 }
 
 void WebDocumentLoaderMac::decreaseLoadCount(unsigned long identifier)
 {
-    ASSERT(m_loadCount > 0);
-
-    loadingResources().remove(identifier);
+    ASSERT(m_loadingResources.contains(identifier));
     
-    m_loadCount--;
-
-    if (m_loadCount == 0)
+    m_loadingResources.remove(identifier);
+    
+    if (m_loadingResources.isEmpty())
         HardRelease(m_dataSource);
 }