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

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit a20eb05b7733ef84d09d7e78ad024f76e8bd8e18
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 2 00:24:38 2003 +0000

            Reviewed by Darin
    
            * WebView.subproj/WebHTMLView.m:
            (-[WebHTMLView viewDidMoveToSuperview]):
    	skip some work when when we've been removed. This wasn't
    	causing any trouble before, but was at least conceptually
    	inefficient.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5112 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index edd91dc..5a02b87 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,15 @@
 2003-10-01  John Sullivan  <sullivan at apple.com>
 
+        Reviewed by Darin
+
+        * WebView.subproj/WebHTMLView.m:
+        (-[WebHTMLView viewDidMoveToSuperview]):
+	skip some work when when we've been removed. This wasn't
+	causing any trouble before, but was at least conceptually
+	inefficient.
+
+2003-10-01  John Sullivan  <sullivan at apple.com>
+
 	- fixed 3441372: REGRESSION (107+): Plain text document is 
 	initially drawn with proportional font
 
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 7f06850..c1450ef 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -245,8 +245,10 @@
 {
     // Do this here in case the text size multiplier changed when a non-HTML
     // view was installed.
-    [self _updateTextSizeMultiplier];
-    [self addSuperviewObservers];
+    if ([self superview] != nil) {
+        [self _updateTextSizeMultiplier];
+        [self addSuperviewObservers];
+    }
 }
 
 - (void)viewWillMoveToWindow:(NSWindow *)window

-- 
WebKit Debian packaging