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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit dfa25484ab22bb62bc10e8ad739100358239fe16
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 7 03:45:36 2003 +0000

            Remove setWebView: from WebFrame.
    
            Reviewed by chris.
    
            * WebView.subproj/WebFrame.h:
            * WebView.subproj/WebFrame.m:
            (-[WebFrame initWithName:webView:controller:]):
            (-[WebFrame name]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3774 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index e58bfee..4996d7e 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,16 @@
 2003-03-06  Richard Williamson   <rjw at apple.com>
 
+        Remove setWebView: from WebFrame.
+        
+        Reviewed by chris.
+
+        * WebView.subproj/WebFrame.h:
+        * WebView.subproj/WebFrame.m:
+        (-[WebFrame initWithName:webView:controller:]):
+        (-[WebFrame name]):
+
+2003-03-06  Richard Williamson   <rjw at apple.com>
+
         API changes.  WebCapabilities -> WebContentTypes.
         Move fileExtension from WebDataSource to WebContentTypes
         
diff --git a/WebKit/WebView.subproj/WebFrame.h b/WebKit/WebView.subproj/WebFrame.h
index 1bb0139..1569e32 100644
--- a/WebKit/WebView.subproj/WebFrame.h
+++ b/WebKit/WebView.subproj/WebFrame.h
@@ -49,12 +49,6 @@
 - (WebController *)controller;
 
 /*!
-    @method setWebView:
-    @param view The view to assign to this frame.
-*/
-- (void)setWebView: (WebView *)view;
-
-/*!
     @method webView
     @result The WebView for this frame.
 */
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index a92041a..9023c8c 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -48,8 +48,10 @@
 
     [self _setName:n];
     
-    if (v)
-        [self setWebView:v];
+    if (v) {
+        [_private setWebView: v];
+        [v _setController: [self controller]];
+    }
     
     ++WebFrameCount;
     
@@ -70,12 +72,6 @@
     return [_private name];
 }
 
-- (void)setWebView:(WebView *)v
-{
-    [_private setWebView: v];
-    [v _setController: [self controller]];
-}
-
 - (WebView *)webView
 {
     return [_private webView];

-- 
WebKit Debian packaging