Reviewed by Adele.

        - fix assertion which I accidentally changed to one that sometimes fails
        http://bugzilla.opendarwin.org/show_bug.cgi?id=10531

        * Loader/WebDocumentLoadState.m:
        (-[WebDocumentLoadState dealloc]):
        * WebView/WebDataSource.m:
        (-[WebDataSourcePrivate dealloc]):
        (-[WebDataSource dealloc]):

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

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 7279951dbf1f3e792011e7dbbb5b03a146ca91fc..b2b34cc4ee9976f79a718582d2ca777ffde971bf 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2006-08-23  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Adele.
+        
+        - fix assertion which I accidentally changed to one that sometimes fails
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=10531
+        
+        * Loader/WebDocumentLoadState.m:
+        (-[WebDocumentLoadState dealloc]):
+        * WebView/WebDataSource.m:
+        (-[WebDataSourcePrivate dealloc]):
+        (-[WebDataSource dealloc]):
+
 2006-08-23  Maciej Stachowiak  <mjs@apple.com>
 
         Reviewed by Brady.

diff --git a/WebKit/Loader/WebDocumentLoadState.m b/WebKit/Loader/WebDocumentLoadState.m
index 7496b0defd118985f6117e28a00e6d9a9ce09738..b28b98ede5244e3b57d49d93863b0b2834d44018 100644 (file)
--- a/WebKit/Loader/WebDocumentLoadState.m
+++ b/WebKit/Loader/WebDocumentLoadState.m
@@ -49,8 +49,6 @@
 
 - (void)dealloc
 {
-    ASSERT(![frameLoader isLoading]);
-
     [mainResourceData release];
 
     [super dealloc];

diff --git a/WebKit/WebView/WebDataSource.m b/WebKit/WebView/WebDataSource.m
index 2058b5023fc862be21d16d95ef4102658bf49716..9d59d3da35625a13ef045a3f45c1fdbec2c61f4b 100644 (file)
--- a/WebKit/WebView/WebDataSource.m
+++ b/WebKit/WebView/WebDataSource.m
@@ -149,8 +149,6 @@
 
 - (void)dealloc
 {
-    ASSERT(![[webFrame _frameLoader] isLoading]);
-
     [loadState release];
     
     [representation release];
@@ -1055,6 +1053,8 @@ static inline void addTypesFromClass(NSMutableDictionary *allTypes, Class class,
 
 - (void)dealloc
 {
+    ASSERT([[_private->webFrame _frameLoader] activeDataSource] != self || ![[_private->webFrame _frameLoader] isLoading]);
+
     --WebDataSourceCount;
     
     [_private release];