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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit a9e7eb5faa2a41337905bdaebbbd7443a9a3052f
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 19 04:37:38 2002 +0000

            Rename some methods for clarity. These two methods are defined by
    	the end state, not the start state (in fact,
    	transitionToLayoutAcceptable does most of it's work when it starts
    	in the cimmitted state, not provisional).
    
    	* WebView.subproj/WebFramePrivate.h, WebView.subproj/WebFramePrivate.m:
    	(-[WebFrame _transitionToLayoutAcceptable]): Renamed from
    	_transitionProvisionalToLayoutAcceptable.
            (-[WebFrame _transitionToCommitted]): Renamed from
    	_transitionProvisionalToLayoutAcceptable.
    
    	And adjust all the calls to them:
    
            * WebView.subproj/WebControllerPrivate.m:
            (-[WebController _receivedProgress:forResourceHandle:fromDataSource:complete:]):
            (-[WebController _mainReceivedProgress:forResourceHandle:fromDataSource:complete:]):
            * WebView.subproj/WebDataSourcePrivate.m:
            (-[WebDataSource _commitIfReady]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1593 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index f6884fe..9c0bd68 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,26 @@
 2002-07-18  Maciej Stachowiak  <mjs at apple.com>
 
+        Rename some methods for clarity. These two methods are defined by
+	the end state, not the start state (in fact,
+	transitionToLayoutAcceptable does most of it's work when it starts
+	in the cimmitted state, not provisional).
+
+	* WebView.subproj/WebFramePrivate.h, WebView.subproj/WebFramePrivate.m:
+	(-[WebFrame _transitionToLayoutAcceptable]): Renamed from
+	_transitionProvisionalToLayoutAcceptable.
+        (-[WebFrame _transitionToCommitted]): Renamed from
+	_transitionProvisionalToLayoutAcceptable.
+
+	And adjust all the calls to them:
+	
+        * WebView.subproj/WebControllerPrivate.m:
+        (-[WebController _receivedProgress:forResourceHandle:fromDataSource:complete:]):
+        (-[WebController _mainReceivedProgress:forResourceHandle:fromDataSource:complete:]):
+        * WebView.subproj/WebDataSourcePrivate.m:
+        (-[WebDataSource _commitIfReady]):
+
+2002-07-18  Maciej Stachowiak  <mjs at apple.com>
+
 	Even more exciting refactoring. Change the rules for committing
 	the data source and creating the representation so that both
 	happen when the first byte has been received _and_ the content
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index f6884fe..9c0bd68 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,26 @@
 2002-07-18  Maciej Stachowiak  <mjs at apple.com>
 
+        Rename some methods for clarity. These two methods are defined by
+	the end state, not the start state (in fact,
+	transitionToLayoutAcceptable does most of it's work when it starts
+	in the cimmitted state, not provisional).
+
+	* WebView.subproj/WebFramePrivate.h, WebView.subproj/WebFramePrivate.m:
+	(-[WebFrame _transitionToLayoutAcceptable]): Renamed from
+	_transitionProvisionalToLayoutAcceptable.
+        (-[WebFrame _transitionToCommitted]): Renamed from
+	_transitionProvisionalToLayoutAcceptable.
+
+	And adjust all the calls to them:
+	
+        * WebView.subproj/WebControllerPrivate.m:
+        (-[WebController _receivedProgress:forResourceHandle:fromDataSource:complete:]):
+        (-[WebController _mainReceivedProgress:forResourceHandle:fromDataSource:complete:]):
+        * WebView.subproj/WebDataSourcePrivate.m:
+        (-[WebDataSource _commitIfReady]):
+
+2002-07-18  Maciej Stachowiak  <mjs at apple.com>
+
 	Even more exciting refactoring. Change the rules for committing
 	the data source and creating the representation so that both
 	happen when the first byte has been received _and_ the content
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.m b/WebKit/WebView.subproj/WebControllerPrivate.m
index a32ea07..793c77f 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.m
+++ b/WebKit/WebView.subproj/WebControllerPrivate.m
@@ -75,7 +75,7 @@
     // This resource has completed, so check if the load is complete for all frames.
     if (isComplete) {
         if (frame != nil) {
-            [frame _transitionProvisionalToLayoutAcceptable];
+            [frame _transitionToLayoutAcceptable];
             [frame _checkLoadComplete];
         }
     }
@@ -107,7 +107,7 @@
         // just indicates that an early layout can be performed.
         int timedLayoutSize = [[WebPreferences standardPreferences] _initialTimedLayoutSize];
         if ([progress bytesSoFar] > timedLayoutSize)
-            [frame _transitionProvisionalToLayoutAcceptable];
+            [frame _transitionToLayoutAcceptable];
     }
 }
 
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index e26cd57..f6afbc3 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -418,7 +418,7 @@
         WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "committed resource = %s\n", [[[self inputURL] absoluteString] cString]);
 	_private->committed = TRUE;
 	[self _makeRepresentation];
-        [[self webFrame] _transitionProvisionalToCommitted];
+        [[self webFrame] _transitionToCommitted];
     }
 }
 
diff --git a/WebKit/WebView.subproj/WebFramePrivate.h b/WebKit/WebView.subproj/WebFramePrivate.h
index 5e8b8a2..acb0910 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.h
+++ b/WebKit/WebView.subproj/WebFramePrivate.h
@@ -63,8 +63,8 @@ typedef enum {
 - (void)_parentDataSourceWillBeDeallocated;
 - (void)_setController: (WebController *)controller;
 - (void)_setDataSource: (WebDataSource *)d;
-- (void)_transitionProvisionalToCommitted;
-- (void)_transitionProvisionalToLayoutAcceptable;
+- (void)_transitionToCommitted;
+- (void)_transitionToLayoutAcceptable;
 - (WebFrameState)_state;
 - (void)_setState: (WebFrameState)newState;
 + (void)_recursiveCheckCompleteFromFrame: (WebFrame *)fromFrame;
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index dadecc9..d733fb8 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -162,7 +162,7 @@ static const char * const stateNames[6] = {
 }
 
 
-- (void)_transitionProvisionalToLayoutAcceptable
+- (void)_transitionToLayoutAcceptable
 {
     switch ([self _state]) {
     	case WebFrameStateCommittedPage:
@@ -211,7 +211,7 @@ static const char * const stateNames[6] = {
 }
 
 
-- (void)_transitionProvisionalToCommitted
+- (void)_transitionToCommitted
 {
     WEBKIT_ASSERT ([self controller] != nil);
     NSView <WebDocumentView> *documentView = [[self webView] documentView];
diff --git a/WebKit/WebView.subproj/WebViewPrivate.m b/WebKit/WebView.subproj/WebViewPrivate.m
index a32ea07..793c77f 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.m
+++ b/WebKit/WebView.subproj/WebViewPrivate.m
@@ -75,7 +75,7 @@
     // This resource has completed, so check if the load is complete for all frames.
     if (isComplete) {
         if (frame != nil) {
-            [frame _transitionProvisionalToLayoutAcceptable];
+            [frame _transitionToLayoutAcceptable];
             [frame _checkLoadComplete];
         }
     }
@@ -107,7 +107,7 @@
         // just indicates that an early layout can be performed.
         int timedLayoutSize = [[WebPreferences standardPreferences] _initialTimedLayoutSize];
         if ([progress bytesSoFar] > timedLayoutSize)
-            [frame _transitionProvisionalToLayoutAcceptable];
+            [frame _transitionToLayoutAcceptable];
     }
 }
 

-- 
WebKit Debian packaging