From 3497bfe54d38992088bdb6c4bd2bb14fac40340e Mon Sep 17 00:00:00 2001 From: mjs Date: Mon, 9 Oct 2006 21:44:55 +0000 Subject: [PATCH] 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 --- WebKit/ChangeLog | 11 +++++++++++ WebKit/Loader/WebFrameLoader.m | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog index 45729d7de96d..b4c761c02edd 100644 --- a/WebKit/ChangeLog +++ b/WebKit/ChangeLog @@ -1,3 +1,14 @@ +2006-10-09 Maciej Stachowiak + + 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 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 02acb6105cfa..6462066808e5 100644 --- 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]; -- 2.36.0