Reviewed by Darin.

        Bug 6658: World leak when closing inspected window
        http://bugs.webkit.org/show_bug.cgi?id=6658 and <rdar://problem/4411863>

        Removes over-retains of the inspector WebView, WebInspector and WebInspectorPanel.

        * WebInspector/WebInspector.m:
        (+[WebInspector sharedWebInspector]): Return the global sharedWebInspector variable.
        (-[WebInspector window]): Release the window after calling setWindow:.
        (-[WebInspector windowWillClose:]): Set the JavaScript Inspector variable to null and expire the current highlight.
          Also clear the global sharedWebInspector variable and release it if self equals sharedWebInspector.
        (-[WebInspector showWindow:]): Set the JavaScript Inspector variable back to self.
        * WebInspector/WebInspectorInternal.h: Remove the isSharedInspector member variable.
        * WebView/WebView.mm:
        (-[WebView windowScriptObject]): Return nil if core([self mainFrame]) is NULL.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@21028 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 3b42503c873f433619c51989352f8fd648cc03d6..c20b07033cf6c2d9fd6abfd943d3c72f792e5404 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,22 @@
+2007-04-23  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Darin.
+
+        Bug 6658: World leak when closing inspected window
+        http://bugs.webkit.org/show_bug.cgi?id=6658 and <rdar://problem/4411863>
+
+        Removes over-retains of the inspector WebView, WebInspector and WebInspectorPanel.
+
+        * WebInspector/WebInspector.m:
+        (+[WebInspector sharedWebInspector]): Return the global sharedWebInspector variable.
+        (-[WebInspector window]): Release the window after calling setWindow:.
+        (-[WebInspector windowWillClose:]): Set the JavaScript Inspector variable to null and expire the current highlight.
+          Also clear the global sharedWebInspector variable and release it if self equals sharedWebInspector.
+        (-[WebInspector showWindow:]): Set the JavaScript Inspector variable back to self.
+        * WebInspector/WebInspectorInternal.h: Remove the isSharedInspector member variable.
+        * WebView/WebView.mm:
+        (-[WebView windowScriptObject]): Return nil if core([self mainFrame]) is NULL.
+
 2007-04-23  Darin Adler  <darin@apple.com>
 
         Reviewed by Hyatt.

diff --git a/WebKit/WebInspector/WebInspector.m b/WebKit/WebInspector/WebInspector.m
index 8040d3eec3edc6c93feca0d8590d6919e7345dec..63cadc4e434cd84f442396a43d111e9744e6d98c 100644 (file)
--- a/WebKit/WebInspector/WebInspector.m
+++ b/WebKit/WebInspector/WebInspector.m
@@ -48,17 +48,14 @@
 
 #pragma mark -
 
-@implementation WebInspector
+static WebInspector *sharedWebInspector = nil;
 
+@implementation WebInspector
 + (WebInspector *)sharedWebInspector
 {
-    static WebInspector *_sharedWebInspector = nil;
-    if (!_sharedWebInspector) {
-        _sharedWebInspector = [[self alloc] init];
-        _sharedWebInspector->_private->isSharedInspector = YES;
-    }
-
-    return _sharedWebInspector;
+    if (!sharedWebInspector)
+        sharedWebInspector = [[self alloc] init];
+    return sharedWebInspector;
 }
 
 #pragma mark -
@@ -154,6 +151,8 @@
         [window setContentView:_private->webView];
 
         [self setWindow:window];
+        [window release];
+
         return window;
     }
 
@@ -162,8 +161,11 @@
 
 - (void)windowWillClose:(NSNotification *)notification
 {
+    [_private->currentHighlight expire];
+
     [[NSNotificationCenter defaultCenter] removeObserver:self name:NSApplicationWillResignActiveNotification object:nil];
     [[NSNotificationCenter defaultCenter] removeObserver:self name:NSApplicationDidBecomeActiveNotification object:nil];
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:NSApplicationWillTerminateNotification object:nil];
     [[NSNotificationCenter defaultCenter] removeObserver:self name:WebNodeHighlightExpiredNotification object:nil];
     [[NSNotificationCenter defaultCenter] removeObserver:self name:NSViewFrameDidChangeNotification object:nil];
     [[NSNotificationCenter defaultCenter] removeObserver:self name:NSSystemColorsDidChangeNotification object:nil];
@@ -172,8 +174,12 @@
     [self setFocusedDOMNode:nil];
     [self setWebFrame:nil];
 
-    if (!_private->isSharedInspector)
+    [[_private->webView windowScriptObject] setValue:[NSNull null] forKey:@"Inspector"];
+
+    if (self == sharedWebInspector) {
         [self release];
+        sharedWebInspector = nil;
+    }
 }
 
 - (IBAction)showWindow:(id)sender
@@ -182,6 +188,9 @@
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_updateSystemColors) name:NSSystemColorsDidChangeNotification object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_applicationWillResignActive) name:NSApplicationWillResignActiveNotification object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_applicationDidBecomeActive) name:NSApplicationDidBecomeActiveNotification object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_applicationWillTerminate) name:NSApplicationWillTerminateNotification object:nil];
+
+    [[_private->webView windowScriptObject] setValue:self forKey:@"Inspector"];
 
     [super showWindow:sender];
 }
@@ -398,6 +407,11 @@
     [(NSPanel *)[self window] setFloatingPanel:YES];
 }
 
+- (void)_applicationWillTerminate
+{
+    [_private->webView close];
+}
+
 - (void)_webFrameDetached:(WebFrame *)frame
 {
     [self setRootDOMNode:nil];

diff --git a/WebKit/WebInspector/WebInspectorInternal.h b/WebKit/WebInspector/WebInspectorInternal.h
index 643aef52f646dd0e7856c2ec860d12d6f86b33bd..5479bdd9d18112174aa77d8c983728ab2028f753 100644 (file)
--- a/WebKit/WebInspector/WebInspectorInternal.h
+++ b/WebKit/WebInspector/WebInspectorInternal.h
@@ -48,7 +48,6 @@
 #endif
     BOOL webViewLoaded;
     BOOL preventHighlight;
-    BOOL isSharedInspector;
 }
 @end
 

diff --git a/WebKit/WebKit.xcodeproj/project.pbxproj b/WebKit/WebKit.xcodeproj/project.pbxproj
index 1e5c3703fed8106db232daf4dbb669f1e29d6dd0..465b92627e564d95585ee051c2dd70701e938faf 100644 (file)
--- a/WebKit/WebKit.xcodeproj/project.pbxproj
+++ b/WebKit/WebKit.xcodeproj/project.pbxproj
@@ -1331,6 +1331,7 @@
                0867D690FE84028FC02AAC07 /* Project object */ = {
                        isa = PBXProject;
                        buildConfigurationList = 149C283208902B0F008A9EFC /* Build configuration list for PBXProject "WebKit" */;
+                       compatibilityVersion = "Xcode 2.4";
                        hasScannedForEncodings = 1;
                        knownRegions = (
                                English,
@@ -1345,6 +1346,7 @@
                        productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
                        projectDirPath = "";
                        projectRoot = "";
+                       shouldCheckCompatibility = 1;
                        targets = (
                                9398100A0824BF01008DF038 /* WebKit */,
                        );

diff --git a/WebKit/WebView/WebView.mm b/WebKit/WebView/WebView.mm
index 7308fda7d2151a05fab867ec6a70558a2dcf16e1..eb8b3efa4a937b4b30f286fd212bd06fbfe48fa4 100644 (file)
--- a/WebKit/WebView/WebView.mm
+++ b/WebKit/WebView/WebView.mm
@@ -2123,7 +2123,10 @@ NS_ENDHANDLER
 
 - (WebScriptObject *)windowScriptObject
 {
-    return core([self mainFrame])->windowScriptObject();
+    Frame* coreFrame = core([self mainFrame]);
+    if (!coreFrame)
+        return nil;
+    return coreFrame->windowScriptObject();
 }
 
 // Get the appropriate user-agent string for a particular URL.