WebKit:

        Reviewed by Chris.

        - added _isFrameSet as a private method, so it can be used in WebBrowser.
        This is needed to merge the fix for 3123987 to SUPanNavy.

        * WebView.subproj/WebFrame.m:
        (-[WebFrame _isFrameSet]):
        new method

        * WebView.subproj/WebFramePrivate.h:
        declare new method

WebBrowser:

        Reviewed by Chris.

        - changed implementation of -[WebFrameView isFrameset] so that it's more easily
        mergeable back to 10.3.5. This is needed to merge 3123987 to SUPanNavy.

        * BrowserWebViewExtras.m:
        (-[WebFrameView isFrameset]):
        Call private WebFrame method instead of using DOM.

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

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 0242202..772f181 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,17 @@
+2004-09-10  John Sullivan  <sullivan@apple.com>
+
+        Reviewed by Chris.
+        
+        - added _isFrameSet as a private method, so it can be used in WebBrowser.
+        This is needed to merge the fix for 3123987 to SUPanNavy.
+
+        * WebView.subproj/WebFrame.m:
+        (-[WebFrame _isFrameSet]):
+        new method
+        
+        * WebView.subproj/WebFramePrivate.h:
+        declare new method
+
 2004-09-10  Chris Blumenberg  <cblu@apple.com>
 
        Fixed previous "Reviewed by" line.

diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 6d49e15..318afa6 100644 (file)
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -476,6 +476,11 @@ NSString *WebPageCacheDocumentViewKey = @"WebPageCacheDocumentViewKey";
     return NO;
 }
 
+- (BOOL)_isFrameSet
+{
+    return [_private->bridge isFrameSet];
+}
+
 - (WebFrame *)_descendantFrameNamed:(NSString *)name
 {
     if ([[self name] isEqualToString: name]){

diff --git a/WebKit/WebView.subproj/WebFramePrivate.h b/WebKit/WebView.subproj/WebFramePrivate.h
index cccbc9e..7f023dd 100644 (file)
--- a/WebKit/WebView.subproj/WebFramePrivate.h
+++ b/WebKit/WebView.subproj/WebFramePrivate.h
@@ -211,5 +211,6 @@ extern NSString *WebPageCacheDocumentViewKey;
 - (NSArray *)_internalChildFrames;
 
 - (BOOL)_isDescendantOfFrame:(WebFrame *)frame;
+- (BOOL)_isFrameSet;
 
 @end