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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 5b18090e2448f24f634edfffb4bc33f4b5559a4d
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jul 28 21:24:48 2003 +0000

    	Fixed 3341859.
        	Check that the WebHTMLView is initialized in viewWillMoveToWindow: and
    	viewDidMoveToWindow.  Don't do anything if we aren't initialized.  This
    	happens when decoding a WebView.  When WebViews are decoded their subviews
        	are created by initWithCoder: and so won't be normally initialized.  The
    	stub views are discarded by WebView.
    
            Reviewed by John.
    
            * WebView.subproj/WebHTMLView.m:
            (-[WebHTMLView viewWillMoveToWindow:]):
            (-[WebHTMLView viewDidMoveToWindow]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4722 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 4ec871c..5f1c2de 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,18 @@
+2003-07-28  Richard Williamson   <rjw at apple.com>
+
+	Fixed 3341859. 
+    	Check that the WebHTMLView is initialized in viewWillMoveToWindow: and
+	viewDidMoveToWindow.  Don't do anything if we aren't initialized.  This
+	happens when decoding a WebView.  When WebViews are decoded their subviews
+    	are created by initWithCoder: and so won't be normally initialized.  The 
+	stub views are discarded by WebView.
+
+        Reviewed by John.
+
+        * WebView.subproj/WebHTMLView.m:
+        (-[WebHTMLView viewWillMoveToWindow:]):
+        (-[WebHTMLView viewDidMoveToWindow]):
+
 2003-07-28  Darin Adler  <darin at apple.com>
 
         Reviewed by John.
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 578d7df..d657421 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -75,8 +75,6 @@
 //083
 //084
 		0867D690FE84028FC02AAC07 = {
-			buildSettings = {
-			};
 			buildStyles = (
 				014CEA440018CDF011CA2923,
 				014CEA450018CDF011CA2923,
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index acb7752..e7004f3 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -239,34 +239,46 @@
 
 - (void)viewWillMoveToWindow:(NSWindow *)window
 {
-    // FIXME: Some of these calls may not work because this view may be already removed from it's superview.
-    [self removeMouseMovedObserver];
-    [self removeWindowObservers];
-    [self removeSuperviewObservers];
-    [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(_updateMouseoverWithFakeEvent) object:nil];
-
-    [[self _pluginController] stopAllPlugins];
+    // Don't do anything if we aren't initialized.  This happens
+    // when decoding a WebView.  When WebViews are decoded their subviews
+    // are created by initWithCoder: and so won't be normally
+    // initialized.  The stub views are discarded by WebView.
+    if (_private){
+        // FIXME: Some of these calls may not work because this view may be already removed from it's superview.
+        [self removeMouseMovedObserver];
+        [self removeWindowObservers];
+        [self removeSuperviewObservers];
+        [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(_updateMouseoverWithFakeEvent) object:nil];
+    
+        [[self _pluginController] stopAllPlugins];
+    }
 }
 
 - (void)viewDidMoveToWindow
 {
-    if ([self window]) {
-        [self addWindowObservers];
-        [self addSuperviewObservers];
-        [self addMouseMovedObserver];
-        [self updateTextBackgroundColor];
-
-        [[self _pluginController] startAllPlugins];
-
-        _private->inWindow = YES;
-    } else {
-        // Reset when we are moved out of a window after being moved into one.
-        // Without this check, we reset ourselves before we even start.
-        // This is only needed because viewDidMoveToWindow is called even when
-        // the window is not changing (bug in AppKit).
-        if (_private->inWindow) {
-            [self _reset];
-            _private->inWindow = NO;
+    // Don't do anything if we aren't initialized.  This happens
+    // when decoding a WebView.  When WebViews are decoded their subviews
+    // are created by initWithCoder: and so won't be normally
+    // initialized.  The stub views are discarded by WebView.
+    if (_private){
+        if ([self window]) {
+            [self addWindowObservers];
+            [self addSuperviewObservers];
+            [self addMouseMovedObserver];
+            [self updateTextBackgroundColor];
+    
+            [[self _pluginController] startAllPlugins];
+    
+            _private->inWindow = YES;
+        } else {
+            // Reset when we are moved out of a window after being moved into one.
+            // Without this check, we reset ourselves before we even start.
+            // This is only needed because viewDidMoveToWindow is called even when
+            // the window is not changing (bug in AppKit).
+            if (_private->inWindow) {
+                [self _reset];
+                _private->inWindow = NO;
+            }
         }
     }
 }

-- 
WebKit Debian packaging