[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 2b39cad20c285fb958c45693afd8508407066f10
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Mar 20 02:55:41 2003 +0000

    WebKit:
            Removed initWithView:* constructors from WebView.
            New designated initializer for WebView is initWithFrame:frameName:groupName:
    
            Reviewed by cblu & ed.
    
            * Carbon.subproj/HIWebView.m:
            * WebView.subproj/WebView.h:
            * WebView.subproj/WebView.m:
            (-[WebView init]):
            (-[WebView initWithFrame:]):
    
    WebBrowser:
            Updated Safari to use the new designated initializer for WebView.  Simplified
            many places that used to reference the WebFrameView.
    
            Reviewed by cblu.
    
            * BrowserTabViewItem.m:
            (-[BrowserTabViewItem webController]):
            * BrowserWebController.m:
            (-[BrowserWebController initWithDocument:request:frameName:]):
            * BrowserWindowController.m:
            (-[BrowserWindowController mainWebFrameView]):
            (-[BrowserWindowController updateLabelForTab:]):
            (-[BrowserWindowController setUpTabForController:]):
            (-[BrowserWindowController closeTab:]):
            (-[BrowserWindowController didSelectTabViewItem]):
            (-[BrowserWindowController findTabForWebController:]):
            (-[BrowserWindowController reloadTab:]):
            (-[BrowserWindowController releaseTabSwitcher:]):
            (-[BrowserWindowController replaceTabURLs:usingTabLabelsFromBookmarks:]):
            (-[BrowserWindowController orderedTabs]):
            (-[BrowserWindowController canReloadTab:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3870 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Carbon.subproj/HIWebView.m b/WebKit/Carbon.subproj/HIWebView.m
index 4f78b65..d4a7117 100644
--- a/WebKit/Carbon.subproj/HIWebView.m
+++ b/WebKit/Carbon.subproj/HIWebView.m
@@ -249,6 +249,7 @@ HIWebFrameViewGetController( HIViewRef inControl )
 extern WebView*
 WebControllerCreateWithHIView( HIViewRef inView, CFStringRef inName )
 {
+#ifdef XXXX
 	NSView*			view = HIWebFrameViewGetNSView( inView );
 	WebView*	result = NULL;
 	
@@ -256,6 +257,9 @@ WebControllerCreateWithHIView( HIViewRef inView, CFStringRef inName )
 		result = [[WebView alloc] initWithView: (WebFrameView*)view frameName:nil groupName:(NSString*)inName];
 
 	return result;
+#else
+        return NULL;
+#endif
 }
 
 //----------------------------------------------------------------------------------
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 94f66b3..eed245c 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,18 @@
 2003-03-19  Richard Williamson   <rjw at apple.com>
 
+        Removed initWithView:* constructors from WebView.
+        New designated initializer for WebView is initWithFrame:frameName:groupName:
+        
+        Reviewed by cblu & ed.
+
+        * Carbon.subproj/HIWebView.m:
+        * WebView.subproj/WebView.h:
+        * WebView.subproj/WebView.m:
+        (-[WebView init]):
+        (-[WebView initWithFrame:]):
+
+2003-03-19  Richard Williamson   <rjw at apple.com>
+
         Rename WebControllerPolicyDelegate*.[hm] to WebPolicyDelegate*.[hm]
         
         Reviewed by trey.
diff --git a/WebKit/WebView.subproj/WebView.h b/WebKit/WebView.subproj/WebView.h
index 7439952..1a4e699 100644
--- a/WebKit/WebView.subproj/WebView.h
+++ b/WebKit/WebView.subproj/WebView.h
@@ -85,27 +85,19 @@ extern NSString *WebElementLinkLabelKey;	// NSString of the text within the anch
 */
 + (BOOL)canShowMIMEType:(NSString *)MIMEType;
 
-
-/*!
-    @method initWithView:
-    @abstract This method is a convenience equivalent to initWithView:view frameName:nil groupName:nil
-    @param view The view to use.
-*/
-- initWithView: (WebFrameView *)view;
-
 /*!
-    @method initWithView:frameName:setName:
+    @method initWithFrame:frameName:groupName:
     @abstract The designated initializer for WebView.
     @discussion Initialize a WebView with the supplied parameters. This method will 
     create a main WebFrame with the view. Passing a top level frame name is useful if you
     handle a targetted frame navigation that would normally open a window in some other 
     way that still ends up creating a new WebView.
-    @param view The main view to be associated with the controller.  May be nil.
+    @param frame The frame used to create the view.
     @param frameName The name to use for the top level frame. May be nil.
     @param groupName The name of the controller set to which this controller will be added.  May be nil.
     @result Returns an initialized WebView.
 */
-- initWithView: (WebFrameView *)view frameName: (NSString *)frameName groupName: (NSString *)name ;
+- initWithFrame: (NSRect)frame frameName: (NSString *)frameName groupName: (NSString *)groupName;
 
 /*!
     @method setWindowOperationsDelegate:
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index 548363e..88420b4 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -88,29 +88,22 @@ NSString *WebElementLinkTitleKey = 		@"WebElementLinkTitle";
 
 - init
 {
-    return [self initWithView: nil frameName: nil groupName: nil];
+    return [self initWithFrame: NSZeroRect frameName: nil groupName: nil];
 }
 
 - initWithFrame: (NSRect)f
 {
-    [super initWithFrame: f];
-    WebFrameView *wv = [[WebFrameView alloc] initWithFrame: NSMakeRect(0,0,f.size.width,f.size.height)];
-    [wv setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
-    [self addSubview: wv];
-    [self _commonInitialization: wv frameName:nil groupName:nil];
+    [self initWithFrame: f frameName:nil groupName:nil];
     return self;
 }
 
-- initWithView: (WebFrameView *)view
-{
-    return [self initWithView: view frameName: nil groupName: nil];
-}
-
-
-- initWithView: (WebFrameView *)view frameName: (NSString *)frameName groupName: (NSString *)groupName;
+- initWithFrame: (NSRect)f frameName: (NSString *)frameName groupName: (NSString *)groupName;
 {
-    [super initWithFrame: NSZeroRect];
-    [self _commonInitialization: view frameName:frameName groupName:groupName];
+    [super initWithFrame: f];
+    WebFrameView *wv = [[WebFrameView alloc] initWithFrame: NSMakeRect(0,0,f.size.width,f.size.height)];
+    [wv setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
+    [self addSubview: wv];
+    [self _commonInitialization: wv frameName:frameName groupName:groupName];
     return self;
 }
 

-- 
WebKit Debian packaging