[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[darin at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 88b292b1f4b07e4f22840da198f4a151df495649
Author: darin at apple.com <darin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 9 01:08:56 2010 +0000

    Roll out a file I checked in by accident.
    
    * WebView/WebView.mm: Back to previous version.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55700 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index bfbfcd5..bbed317 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-08  Darin Adler  <darin at apple.com>
+
+        Roll out a file I checked in by accident.
+
+        * WebView/WebView.mm: Back to previous version.
+
 2010-03-08  Chris Marrin  <cmarrin at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebKit/mac/WebView/WebView.mm b/WebKit/mac/WebView/WebView.mm
index d3d7334..1700742 100644
--- a/WebKit/mac/WebView/WebView.mm
+++ b/WebKit/mac/WebView/WebView.mm
@@ -975,6 +975,8 @@ static bool shouldEnableLoadDeferring()
     WTF::RefCountedLeakCounter::suppressMessages("At least one WebView was closed with fast teardown.");
 #endif
 
+    _private->closed = YES;
+    
     [[NSDistributedNotificationCenter defaultCenter] removeObserver:self];
     [[NSNotificationCenter defaultCenter] removeObserver:self];
 
@@ -1007,8 +1009,6 @@ static bool fastDocumentTeardownEnabled()
     if (!_private || _private->closed)
         return;
 
-    _private->closed = YES;
-
     [self _closingEventHandling];
 
 #ifndef NDEBUG
@@ -1042,6 +1042,9 @@ static bool fastDocumentTeardownEnabled()
 
     [_private->inspector webViewClosed];
 
+    // setHostWindow:nil must be called before this value is set (see 5408186)
+    _private->closed = YES;
+
     // To avoid leaks, call removeDragCaret in case it wasn't called after moveDragCaretToPoint.
     [self removeDragCaret];
 
@@ -3336,7 +3339,7 @@ static bool needsWebViewInitThreadWorkaround()
 
 - (void)setHostWindow:(NSWindow *)hostWindow
 {
-    if (_private->closed && hostWindow)
+    if (_private->closed)
         return;
     if (hostWindow == _private->hostWindow)
         return;

-- 
WebKit Debian packaging