Reviewed by Darin.

        (Was reviewed as part of a larger patch but it looks like Darin already did the rest of it)

        - avoid a needless use of WebFrame

        * Loader/WebFrameLoader.m:
        (-[WebFrameLoader loadDocumentLoader:withLoadType:formState:]):

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

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 45729d7de96d406546c2945d45d511da961aabab..b4c761c02eddf62a2b9d3a540bcb8233cb046c3a 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2006-10-09  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Darin.
+        
+        (Was reviewed as part of a larger patch but it looks like Darin already did the rest of it)
+        
+        - avoid a needless use of WebFrame
+
+        * Loader/WebFrameLoader.m:
+        (-[WebFrameLoader loadDocumentLoader:withLoadType:formState:]):
+
 2006-10-09  Brady Eidson  <beidson@apple.com>
 
         A *real* fake fix for the layouttest problem until the real fix

diff --git a/WebKit/Loader/WebFrameLoader.m b/WebKit/Loader/WebFrameLoader.m
index 02acb6105cfa0ec9cc6b94dcc0761c4d69afbdd8..6462066808e553c7490615904b0f6b49aba047aa 100644 (file)
--- a/WebKit/Loader/WebFrameLoader.m
+++ b/WebKit/Loader/WebFrameLoader.m
@@ -1495,9 +1495,9 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
 
     policyLoadType = type;
 
-    WebFrame *parentFrame = [client parentFrame];
+    WebCoreFrameBridge *parentFrame = [[self bridge] parent];
     if (parentFrame)
-        [loader setOverrideEncoding:[[[parentFrame _frameLoader] documentLoader] overrideEncoding]];
+        [loader setOverrideEncoding:[[[(WebFrameBridge *)parentFrame frameLoader] documentLoader] overrideEncoding]];
 
     [loader setFrameLoader:self];