[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[trey]

The following commit has been merged in the debian/unstable branch:
commit 672b78c8ecf1438c64bad8b3ecc10b66b55b2fd4
Author: trey <trey at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jun 25 22:53:02 2004 +0000

    WebKit:
    
    	Added new utility method.
    
            Reviewed by John.
    
            * WebView.subproj/WebFrame.m:
            (-[WebFrame _isDescendantOfFrame:]):   New code.
            * WebView.subproj/WebFramePrivate.h:
    
    WebBrowser:
    
    	3562182	- repro Safari crash when altering specific form field
    
    	The basic problem was that JS would disable the search field on submit, which prevents
    	AK from sending a proper endEditing notification, which left the FormCompletionControler
    	hung out to dry.  We now watch for page transitions, and clear the FormCC then.
    
    	Reviewed by John
    
            * BrowserWebController.h:
            * BrowserWebController.m:
            (-[BrowserWebView dataSourceHasChanged:forFrame:]):  New callback from
    	LocationChangeHandler, just pass through to FormDelegate.
            (-[FormDelegate controlTextDidBeginEditing:inFrame:]):  Add ASSERT to catch similiar
    	trouble in the figure.
            (-[FormDelegate controlTextDidEndEditing:inFrame:]):  Ditto.
            (-[FormDelegate controlTextDidChange:inFrame:]):  Ditto
            (-[FormDelegate control:textView:doCommandBySelector:inFrame:]):  Ditto.
            (-[FormDelegate frameHasChanged:]):  Clear state when page transitions out from under us.
            * CompletionController.m:
            (+[CompletionController setCurrentCompletionController:]):  Make the current comp controller a
    	non-retained reference.  Side pointers like this do not want to keep around objects with pointers
    	into UI widgetry.
            (-[CompletionController dealloc]):  Clear the current comp controller if we're going away.
            * FormCompletionController.h:
            * FormCompletionController.m:
            (-[FormCompletionController webFrame]):  New getter.
            * LocationChangeHandler.m:  Cleaned up a bunch of silly code due to old rote conversion.
            (-[LocationChangeHandler webView:didStartProvisionalLoadForFrame:]):
            (-[LocationChangeHandler webView:didReceiveServerRedirectForProvisionalLoadForFrame:]):
            (-[LocationChangeHandler webView:didCommitLoadForFrame:]):  Let WebView know of commit.
            (-[LocationChangeHandler webView:didReceiveTitle:forFrame:]):
            (-[LocationChangeHandler webView:didReceiveIcon:forFrame:]):
            (-[LocationChangeHandler webView:didChangeLocationWithinPageForFrame:]):
            (-[LocationChangeHandler webView:willCloseFrame:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6950 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 6fa734a..942b4df 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2004-06-25  Trey Matteson  <trey at apple.com>
+
+	Added new utility method.
+
+        Reviewed by John.
+
+        * WebView.subproj/WebFrame.m:
+        (-[WebFrame _isDescendantOfFrame:]):   New code.
+        * WebView.subproj/WebFramePrivate.h:
+
 2004-06-24  Richard Williamson   <rjw at apple.com>
 
 		Fixed <rdar://problem/3710313>: CGContext not zeroed when WebImageRenderer is copied
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index eb0cf8a..2fb6ddb 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -453,6 +453,22 @@ NSString *WebPageCacheDocumentViewKey = @"WebPageCacheDocumentViewKey";
     }
 }
 
+- (BOOL)_isDescendantOfFrame:(WebFrame *)frame
+{
+    if (self == frame)
+        return YES;
+    
+    NSArray *children = [frame _internalChildFrames];
+    unsigned i;
+    for (i = 0; i < [children count]; i++) {
+        WebFrame *child = [children objectAtIndex:i];
+        if (self == child || [self _isDescendantOfFrame:child]) {
+            return YES;
+        }
+    }
+    return NO;
+}
+
 - (WebFrame *)_descendantFrameNamed:(NSString *)name
 {
     if ([[self name] isEqualToString: name]){
diff --git a/WebKit/WebView.subproj/WebFramePrivate.h b/WebKit/WebView.subproj/WebFramePrivate.h
index ff7036b..17e8d4d 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.h
+++ b/WebKit/WebView.subproj/WebFramePrivate.h
@@ -210,4 +210,6 @@ extern NSString *WebPageCacheDocumentViewKey;
 
 - (NSArray *)_internalChildFrames;
 
+- (BOOL)_isDescendantOfFrame:(WebFrame *)frame;
+
 @end

-- 
WebKit Debian packaging