Reviewed by Anders.

        - quick fix to loader problem causing layout test failures

        * Loader/WebFrameLoader.m:
        (-[WebFrameLoader _finishedLoading]): Use a local variable for the bridge
        that we retain/release.
        (-[WebFrameLoader continueLoadRequestAfterNewWindowPolicy:frameName:formState:]):
        Same here.

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

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 549b2cbcbcf244358e75c0fc51ce492f6671ab99..6e9cb5449bca537d99e60d250d5cd062a7d8b0fa 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2006-10-08  Darin Adler  <darin@apple.com>
+
+        Reviewed by Anders.
+        
+        - quick fix to loader problem causing layout test failures
+
+        * Loader/WebFrameLoader.m:
+        (-[WebFrameLoader _finishedLoading]): Use a local variable for the bridge
+        that we retain/release.
+        (-[WebFrameLoader continueLoadRequestAfterNewWindowPolicy:frameName:formState:]):
+        Same here.
+
 2006-10-08  Maciej Stachowiak  <mjs@apple.com>
 
         Reviewed by Adam.

diff --git a/WebKit/Loader/WebFrameLoader.m b/WebKit/Loader/WebFrameLoader.m
index 6a43b0146187d9c17d6cc8692839d2c19019efab..eff248b8add7fbb7a47bcf7c381036555661fc87 100644 (file)
--- a/WebKit/Loader/WebFrameLoader.m
+++ b/WebKit/Loader/WebFrameLoader.m
@@ -892,11 +892,13 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
 {
     WebDataSource *ds = [self activeDataSource];
     
-    [[self bridge] retain];
+    WebFrameBridge *bridge = [self bridge];
+
+    [bridge retain];
     [[self activeDocumentLoader] finishedLoading];
 
     if ([ds _mainDocumentError] || ![ds webFrame]) {
-        [[self bridge] release];
+        [bridge release];
         return;
     }
 
@@ -905,7 +907,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
         [[WebScriptDebugServer sharedScriptDebugServer] webView:[client webView] didLoadMainResourceForDataSource:[self activeDataSource]];
     [client _checkLoadComplete];
 
-    [[self bridge] release];
+    [bridge release];
 }
 
 - (void)_notifyIconChanged:(NSURL *)iconURL
@@ -1916,7 +1918,8 @@ keepGoing:
     if (!request)
         return;
 
-    [[self bridge] retain];
+    WebFrameBridge *bridge = [self bridge];
+    [bridge retain];
 
     WebView *webView = nil;
     WebView *currentWebView = [client webView];
@@ -1928,23 +1931,24 @@ keepGoing:
     if (!webView)
         goto exit;
 
-    WebFrame *frame = [webView mainFrame];
-    if (!frame)
+    WebFrame *mainFrame = [webView mainFrame];
+    if (!mainFrame)
         goto exit;
 
-    [[frame _bridge] retain];
+    WebFrameBridge *mainBridge = [mainFrame _bridge];
+    [mainBridge retain];
 
-    [[frame _bridge] setName:frameName];
+    [mainBridge setName:frameName];
 
     [[webView _UIDelegateForwarder] webViewShow:webView];
 
-    [[frame _bridge] setOpener:[client _bridge]];
-    [[frame _frameLoader] _loadRequest:request triggeringAction:nil loadType:WebFrameLoadTypeStandard formState:formState];
+    [mainBridge setOpener:bridge];
+    [[mainFrame _frameLoader] _loadRequest:request triggeringAction:nil loadType:WebFrameLoadTypeStandard formState:formState];
 
-    [[frame _bridge] release];
+    [mainBridge release];
 
 exit:
-    [[self bridge] release];
+    [bridge release];
 }
 
 - (void)sendRemainingDelegateMessagesWithIdentifier:(id)identifier response:(NSURLResponse *)response length:(unsigned)length error:(NSError *)error