[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 7db67e12dab335cb534076ebd235693aa78603f4
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 1 01:10:51 2002 +0000

            * WebView.subproj/WebFrame.m: (-[WebFrame setController:]): Add an assert,
    	hoping to catch a reported bug earlier or disprove one theory.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2526 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index ef4d843..7a33ffe 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-31  Darin Adler  <darin at apple.com>
+
+        * WebView.subproj/WebFrame.m: (-[WebFrame setController:]): Add an assert,
+	hoping to catch a reported bug earlier or disprove one theory.
+
 2002-10-31  Trey Matteson  <trey at apple.com>
 
 	Added API to support 3072505 - SnapBack for user-entered page address
@@ -46,7 +51,7 @@
         * WebCoreSupport.subproj/WebTextRenderer.m:
         (+[WebTextRenderer initialize]):
 
-=== 30 ===
+=== Alexander-30 ===
 
 2002-10-30  Richard Williamson  <rjw at apple.com>
 
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index ef4d843..7a33ffe 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,8 @@
+2002-10-31  Darin Adler  <darin at apple.com>
+
+        * WebView.subproj/WebFrame.m: (-[WebFrame setController:]): Add an assert,
+	hoping to catch a reported bug earlier or disprove one theory.
+
 2002-10-31  Trey Matteson  <trey at apple.com>
 
 	Added API to support 3072505 - SnapBack for user-entered page address
@@ -46,7 +51,7 @@
         * WebCoreSupport.subproj/WebTextRenderer.m:
         (+[WebTextRenderer initialize]):
 
-=== 30 ===
+=== Alexander-30 ===
 
 2002-10-30  Richard Williamson  <rjw at apple.com>
 
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 4e5195d..255c046 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -91,6 +91,8 @@
 
 - (void)setController: (WebController *)controller
 {
+    // To set controller to nil, we have to use _controllerWillBeDeallocated, not this.
+    ASSERT(controller);
     [_private setController: controller];
 }
 

-- 
WebKit Debian packaging