[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit fb1d17ab5a88811f95b0587a51081082137320ae
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 29 05:37:29 2002 +0000

    	- fixed 3036440 -- Crash running PLT with "Check for 'world leaks'" enabled
    
            * WebView.subproj/WebDataSourcePrivate.h: Add defersCallbacks boolean.
            * WebView.subproj/WebDataSourcePrivate.m:
            (-[WebDataSource _setController:]): Don't try to look at the controller before,
    	it might already be deallocated.
            (-[WebDataSource _defersCallbacksChanged]): Use a boolean to record whether the
    	"defers callbacks" state changed since last time and do no work if it didn't.
    	This replaces the check in _setController:.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1934 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 8b75599..de69e5c 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2002-08-28  Darin Adler  <darin at apple.com>
+
+	- fixed 3036440 -- Crash running PLT with "Check for 'world leaks'" enabled
+
+        * WebView.subproj/WebDataSourcePrivate.h: Add defersCallbacks boolean.
+        * WebView.subproj/WebDataSourcePrivate.m:
+        (-[WebDataSource _setController:]): Don't try to look at the controller before,
+	it might already be deallocated.
+        (-[WebDataSource _defersCallbacksChanged]): Use a boolean to record whether the
+	"defers callbacks" state changed since last time and do no work if it didn't.
+	This replaces the check in _setController:.
+
 2002-08-28  Richard Williamson (Local)  <rjw at apple.com>
 
         Tell CG to not use time expiration of glyph cache and increase it's
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 8b75599..de69e5c 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,15 @@
+2002-08-28  Darin Adler  <darin at apple.com>
+
+	- fixed 3036440 -- Crash running PLT with "Check for 'world leaks'" enabled
+
+        * WebView.subproj/WebDataSourcePrivate.h: Add defersCallbacks boolean.
+        * WebView.subproj/WebDataSourcePrivate.m:
+        (-[WebDataSource _setController:]): Don't try to look at the controller before,
+	it might already be deallocated.
+        (-[WebDataSource _defersCallbacksChanged]): Use a boolean to record whether the
+	"defers callbacks" state changed since last time and do no work if it didn't.
+	This replaces the check in _setController:.
+
 2002-08-28  Richard Williamson (Local)  <rjw at apple.com>
 
         Tell CG to not use time expiration of glyph cache and increase it's
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.h b/WebKit/WebView.subproj/WebDataSourcePrivate.h
index f91177b..64a6621 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.h
@@ -76,6 +76,8 @@
     
     NSURL *iconURL;
     WebIconLoader *iconLoader;
+    
+    BOOL defersCallbacks;
 }
 
 @end
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 703438d..e3f0e45 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -133,17 +133,13 @@
 
 - (void)_setController: (WebController *)controller
 {
-    BOOL defers = [_private->controller _defersCallbacks];
-    
     if (_private->loading) {
         [controller retain];
         [_private->controller release];
     }
     _private->controller = controller;
     
-    if (defers != [_private->controller _defersCallbacks]) {
-        [self _defersCallbacksChanged];
-    }
+    [self _defersCallbacksChanged];
 }
 
 - (void)_setParent: (WebDataSource *)p
@@ -504,7 +500,12 @@
 - (void)_defersCallbacksChanged
 {
     BOOL defers = [_private->controller _defersCallbacks];
+    
+    if (defers == _private->defersCallbacks) {
+        return;
+    }
 
+    _private->defersCallbacks = defers;
     [_private->mainHandle setDefersCallbacks:defers];
     NSEnumerator *e = [_private->resourceHandles objectEnumerator];
     WebResourceHandle *handle;

-- 
WebKit Debian packaging