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

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit 824ac76253464e56ab38e314f701c83cfbd8c8a9
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Apr 16 22:22:57 2002 +0000

    	* WebView.subproj/IFWebViewPrivate.mm:
    	(-[IFWebView _setController:]): removed a mistaken
    	retain/release pair here for Darin.
    
    	More code restructuring. BrowserDocument no longer implements
    	the IFWebController protocol; its WebController object does all
    	the progress handling now.
    
    	Also made BrowserDocument stop loading on close for Darin, which fixes
    	a problem he discovered.
    
    	* BrowserDocument.h:
    	* BrowserDocument.m: (-[BrowserDocument init]), (-[BrowserDocument dealloc]),
    	(-[BrowserDocument close]), (-[BrowserDocument _webController]),
    	(-[BrowserDocument goToURL:withFrameLoadType:]), (-[BrowserDocument isLoading]):
    	* BrowserDocumentPrivate.h:
    	* LoadProgressEntry.h:
    	* LoadProgressEntry.m: (-[LoadProgressEntry status]):
    	* LoadProgressMonitor.m: (-[LoadProgressMonitor
    	addEntryForFrame:withType:stage:isMain:]):
    	* LocationChangeHandler.h:
    	* LocationChangeHandler.m: (-[LocationChangeHandler
    	initWithFrame:forBrowserDocument:]), (-[LocationChangeHandler _webController]),
    	(-[LocationChangeHandler _saveScrollPosition]), (-[LocationChangeHandler
    	_scrollToTop]), (-[LocationChangeHandler _restoreScrollPosition]),
    	(-[LocationChangeHandler locationChangeStarted]), (-[LocationChangeHandler
    	locationChangeCommitted]), (-[LocationChangeHandler displayError:withStage:]),
    	(-[LocationChangeHandler locationChangeDone:]), (-[LocationChangeHandler
    	receivedPageTitle:forDataSource:]):
    	* WebController.h:
    	* WebController.m: (-[WebController initWithBrowserDocument:]), (-[WebController
    	dealloc]), (-[WebController resetDocument]), (-[WebController document]),
    	(-[WebController loadMonitor]), (-[WebController
    	receivedProgress:forResource:fromDataSource:]), (-[WebController
    	receivedError:forResource:partialProgress:fromDataSource:]), (-[WebController
    	setStatusText:forDataSource:]), (-[WebController
    	provideLocationChangeHandlerForFrame:]), (-[WebController
    	pluginNotFoundSheetEnded:returnCode:contextInfo:]), (-[WebController
    	pluginNotFoundForMIMEType:pluginPageURL:]), (-[WebController
    	startedDownloadWithHandler:]), (-[WebController
    	receivedProgress:forDownloadHandler:]), (-[WebController
    	receivedError:forDownloadHandler:partialProgress:]):
    	Much code moved from here to there; some code moved from there to here;
    	callers updated to call the code on this object that used to be on that
    	object, and vice-versa.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1030 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 3c8b34e..0d022da 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,9 @@
+ret2002-04-16  John Sullivan  <sullivan at apple.com>
+
+	* WebView.subproj/IFWebViewPrivate.mm: 
+	(-[IFWebView _setController:]): removed a mistaken
+	retain/release pair here for Darin.
+
 2002-04-16  Darin Adler  <darin at apple.com>
 
 	Change default font to "Times New Roman 11" rather than
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 3c8b34e..0d022da 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+ret2002-04-16  John Sullivan  <sullivan at apple.com>
+
+	* WebView.subproj/IFWebViewPrivate.mm: 
+	(-[IFWebView _setController:]): removed a mistaken
+	retain/release pair here for Darin.
+
 2002-04-16  Darin Adler  <darin at apple.com>
 
 	Change default font to "Times New Roman 11" rather than
diff --git a/WebKit/WebView.subproj/IFWebViewPrivate.mm b/WebKit/WebView.subproj/IFWebViewPrivate.mm
index 3057105..311fd6a 100644
--- a/WebKit/WebView.subproj/IFWebViewPrivate.mm
+++ b/WebKit/WebView.subproj/IFWebViewPrivate.mm
@@ -56,8 +56,7 @@
 
 - (void)_setController: (id <IFWebController>)controller
 {
-    [controller retain];
-    [_private->controller release];
+    // Not retained; the controller owns the view.
     _private->controller = controller;    
 }
 
diff --git a/WebKit/WebView.subproj/WebFrameViewPrivate.m b/WebKit/WebView.subproj/WebFrameViewPrivate.m
index 3057105..311fd6a 100644
--- a/WebKit/WebView.subproj/WebFrameViewPrivate.m
+++ b/WebKit/WebView.subproj/WebFrameViewPrivate.m
@@ -56,8 +56,7 @@
 
 - (void)_setController: (id <IFWebController>)controller
 {
-    [controller retain];
-    [_private->controller release];
+    // Not retained; the controller owns the view.
     _private->controller = controller;    
 }
 

-- 
WebKit Debian packaging