[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 85d3112e0a0fe651d76b5d57608354c4a8986b20
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 1 19:02:31 2002 +0000

    	Added call to examine the entry at the current index in
    	the back/forward list without modifying the list. I needed
    	this to save context data (in my case, scroll position)
    	on the currently-viewed entry.
    
    	* History.subproj/WKBackForwardList.h:
    	* History.subproj/WKBackForwardList.m:
    	(-[WKBackForwardList currentEntry]):
    	Just returns the entry at the current index.
    
    	Added useful mechanism and hideous hack for using remembered scroll positions
    	with the back/forward list. There's no way to do this cleanly at this level;
    	we have to get WebKit involved. Most of this code is fine though, only the
    	restoring part should have to be redone.
    
    	* BackForwardListEntry.h:
    	* BackForwardListEntry.m: (+[BackForwardListEntry entryWithURL:]),
    	(-[BackForwardListEntry scrollPoint]), (-[BackForwardListEntry setScrollPoint:]):
    	New subclass of WKURIEntry; remembers a scroll point with each entry, and adds
    	a convenience constructor. Some or all of this may move into WebKit later.
    
    	* BrowserDocument.m:
    	(-[BrowserDocument saveScrollPosition]):
    	New method, reads the current scroll position from the view and stores it
    	into the current back/forward list entry.
    
    	(-[BrowserDocument restoreScrollPosition]):
    	New method, reads the previously-saved scroll position from the current
    	back/forward list entry and scrolls the view to match.
    
    	(-[BrowserDocument restoreScrollPositionFromTimerHack:]),
    	(-[BrowserDocument restoreScrollPositionLaterHack]):
    	Timer-based hackery to wait a little while before calling restoreScrollPosition
    	since calling it before the new page has loaded has no effect. This will have
    	to be replaced with a WebKit-based mechanism for telling the webView what the
    	incoming page's initial scroll point should be.
    
    	(-[BrowserDocument goToURLBypassingBackForwardList:]),
    	(-[BrowserDocument goToURL:]),
    	(-[BrowserDocument goBack]),
    	(-[BrowserDocument goForward]):
    	Call the save/restore methods at the right places.
    
    	* WebBrowser.pbproj/project.pbxproj: Updated for new files
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@581 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index fdeb159..e753383 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2002-02-01  John Sullivan  <sullivan at apple.com>
+
+	Added call to examine the entry at the current index in
+	the back/forward list without modifying the list. I needed
+	this to save context data (in my case, scroll position)
+	on the currently-viewed entry.
+
+	* History.subproj/WKBackForwardList.h:
+	* History.subproj/WKBackForwardList.m: 
+	(-[WKBackForwardList currentEntry]):
+	Just returns the entry at the current index.
+
 2002-01-31  John Sullivan  <sullivan at apple.com>
 
 	* History.subproj/WKURIList.m: (newURIListNode):
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index fdeb159..e753383 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,15 @@
+2002-02-01  John Sullivan  <sullivan at apple.com>
+
+	Added call to examine the entry at the current index in
+	the back/forward list without modifying the list. I needed
+	this to save context data (in my case, scroll position)
+	on the currently-viewed entry.
+
+	* History.subproj/WKBackForwardList.h:
+	* History.subproj/WKBackForwardList.m: 
+	(-[WKBackForwardList currentEntry]):
+	Just returns the entry at the current index.
+
 2002-01-31  John Sullivan  <sullivan at apple.com>
 
 	* History.subproj/WKURIList.m: (newURIListNode):
diff --git a/WebKit/History.subproj/IFBackForwardList.h b/WebKit/History.subproj/IFBackForwardList.h
index 0168490..c117329 100644
--- a/WebKit/History.subproj/IFBackForwardList.h
+++ b/WebKit/History.subproj/IFBackForwardList.h
@@ -16,9 +16,12 @@
 -(id)init;
 
 -(void)addEntry:(WKURIEntry *)entry;
+
 -(WKURIEntry *)back;
 -(WKURIEntry *)forward;
 
+-(WKURIEntry *)currentEntry;
+
 -(NSArray *)backList;
 -(NSArray *)forwardList;
 
diff --git a/WebKit/History.subproj/IFBackForwardList.m b/WebKit/History.subproj/IFBackForwardList.m
index f6df3d0..6ebc75a 100644
--- a/WebKit/History.subproj/IFBackForwardList.m
+++ b/WebKit/History.subproj/IFBackForwardList.m
@@ -56,6 +56,11 @@
     return result;
 }
 
+-(WKURIEntry *)currentEntry
+{
+    return [uriList entryAtIndex:index];
+}
+
 -(WKURIEntry *)forward
 {
     WKURIEntry *result;
diff --git a/WebKit/History.subproj/WKBackForwardList.h b/WebKit/History.subproj/WKBackForwardList.h
index 0168490..c117329 100644
--- a/WebKit/History.subproj/WKBackForwardList.h
+++ b/WebKit/History.subproj/WKBackForwardList.h
@@ -16,9 +16,12 @@
 -(id)init;
 
 -(void)addEntry:(WKURIEntry *)entry;
+
 -(WKURIEntry *)back;
 -(WKURIEntry *)forward;
 
+-(WKURIEntry *)currentEntry;
+
 -(NSArray *)backList;
 -(NSArray *)forwardList;
 
diff --git a/WebKit/History.subproj/WKBackForwardList.m b/WebKit/History.subproj/WKBackForwardList.m
index f6df3d0..6ebc75a 100644
--- a/WebKit/History.subproj/WKBackForwardList.m
+++ b/WebKit/History.subproj/WKBackForwardList.m
@@ -56,6 +56,11 @@
     return result;
 }
 
+-(WKURIEntry *)currentEntry
+{
+    return [uriList entryAtIndex:index];
+}
+
 -(WKURIEntry *)forward
 {
     WKURIEntry *result;
diff --git a/WebKit/History.subproj/WebBackForwardList.h b/WebKit/History.subproj/WebBackForwardList.h
index 0168490..c117329 100644
--- a/WebKit/History.subproj/WebBackForwardList.h
+++ b/WebKit/History.subproj/WebBackForwardList.h
@@ -16,9 +16,12 @@
 -(id)init;
 
 -(void)addEntry:(WKURIEntry *)entry;
+
 -(WKURIEntry *)back;
 -(WKURIEntry *)forward;
 
+-(WKURIEntry *)currentEntry;
+
 -(NSArray *)backList;
 -(NSArray *)forwardList;
 
diff --git a/WebKit/History.subproj/WebBackForwardList.m b/WebKit/History.subproj/WebBackForwardList.m
index f6df3d0..6ebc75a 100644
--- a/WebKit/History.subproj/WebBackForwardList.m
+++ b/WebKit/History.subproj/WebBackForwardList.m
@@ -56,6 +56,11 @@
     return result;
 }
 
+-(WKURIEntry *)currentEntry
+{
+    return [uriList entryAtIndex:index];
+}
+
 -(WKURIEntry *)forward
 {
     WKURIEntry *result;

-- 
WebKit Debian packaging