[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
rjw
rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:27:37 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 32dc79814afcb160c2590d9f573f1c91f7c58e1e
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jul 26 03:44:04 2002 +0000
More incremental changes for back/forward migration.
* BackForwardListEntry.h:
* BackForwardListEntry.m:
More incremental changes for back/forward migration.
* History.subproj/WebBackForwardList.h:
* History.subproj/WebBackForwardList.m:
(-[WebBackForwardList init]):
(-[WebBackForwardList dealloc]):
(-[WebBackForwardList addEntry:]):
(-[WebBackForwardList goBack]):
(-[WebBackForwardList goBackToIndex:]):
(-[WebBackForwardList backEntry]):
(-[WebBackForwardList currentEntry]):
(-[WebBackForwardList forwardEntry]):
(-[WebBackForwardList goForward]):
(-[WebBackForwardList goForwardToIndex:]):
(-[WebBackForwardList canGoBack]):
(-[WebBackForwardList canGoForward]):
(-[WebBackForwardList description]):
* History.subproj/WebHistoryItem.h:
* History.subproj/WebHistoryItem.m:
(-[WebHistoryItem initWithURL:title:]):
(-[WebHistoryItem initWithURL:title:image:]):
(-[WebHistoryItem initWithURL:target:title:image:]):
(-[WebHistoryItem dealloc]):
(-[WebHistoryItem target]):
(-[WebHistoryItem setTarget:]):
(-[WebHistoryItem setLastVisitedDate:]):
(-[WebHistoryItem scrollPoint]):
(-[WebHistoryItem setScrollPoint:]):
* History.subproj/WebHistoryList.m:
* WebView.subproj/WebFramePrivate.h:
* WebView.subproj/WebFramePrivate.m:
(-[WebFramePrivate setLoadType:]):
(-[WebFrame _setLoadType:]):
(-[WebFrame _loadType]):
(-[WebFrame _transitionToCommitted]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1679 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index b419dcf..7aceddb 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,41 @@
+2002-07-25 Richard Williamson (Local) <rjw at apple.com>
+
+ More incremental changes for back/forward migration.
+
+ * History.subproj/WebBackForwardList.h:
+ * History.subproj/WebBackForwardList.m:
+ (-[WebBackForwardList init]):
+ (-[WebBackForwardList dealloc]):
+ (-[WebBackForwardList addEntry:]):
+ (-[WebBackForwardList goBack]):
+ (-[WebBackForwardList goBackToIndex:]):
+ (-[WebBackForwardList backEntry]):
+ (-[WebBackForwardList currentEntry]):
+ (-[WebBackForwardList forwardEntry]):
+ (-[WebBackForwardList goForward]):
+ (-[WebBackForwardList goForwardToIndex:]):
+ (-[WebBackForwardList canGoBack]):
+ (-[WebBackForwardList canGoForward]):
+ (-[WebBackForwardList description]):
+ * History.subproj/WebHistoryItem.h:
+ * History.subproj/WebHistoryItem.m:
+ (-[WebHistoryItem initWithURL:title:]):
+ (-[WebHistoryItem initWithURL:title:image:]):
+ (-[WebHistoryItem initWithURL:target:title:image:]):
+ (-[WebHistoryItem dealloc]):
+ (-[WebHistoryItem target]):
+ (-[WebHistoryItem setTarget:]):
+ (-[WebHistoryItem setLastVisitedDate:]):
+ (-[WebHistoryItem scrollPoint]):
+ (-[WebHistoryItem setScrollPoint:]):
+ * History.subproj/WebHistoryList.m:
+ * WebView.subproj/WebFramePrivate.h:
+ * WebView.subproj/WebFramePrivate.m:
+ (-[WebFramePrivate setLoadType:]):
+ (-[WebFrame _setLoadType:]):
+ (-[WebFrame _loadType]):
+ (-[WebFrame _transitionToCommitted]):
+
2002-07-25 Chris Blumenberg <cblu at apple.com>
Made some WebPolicy API's private
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index b419dcf..7aceddb 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,41 @@
+2002-07-25 Richard Williamson (Local) <rjw at apple.com>
+
+ More incremental changes for back/forward migration.
+
+ * History.subproj/WebBackForwardList.h:
+ * History.subproj/WebBackForwardList.m:
+ (-[WebBackForwardList init]):
+ (-[WebBackForwardList dealloc]):
+ (-[WebBackForwardList addEntry:]):
+ (-[WebBackForwardList goBack]):
+ (-[WebBackForwardList goBackToIndex:]):
+ (-[WebBackForwardList backEntry]):
+ (-[WebBackForwardList currentEntry]):
+ (-[WebBackForwardList forwardEntry]):
+ (-[WebBackForwardList goForward]):
+ (-[WebBackForwardList goForwardToIndex:]):
+ (-[WebBackForwardList canGoBack]):
+ (-[WebBackForwardList canGoForward]):
+ (-[WebBackForwardList description]):
+ * History.subproj/WebHistoryItem.h:
+ * History.subproj/WebHistoryItem.m:
+ (-[WebHistoryItem initWithURL:title:]):
+ (-[WebHistoryItem initWithURL:title:image:]):
+ (-[WebHistoryItem initWithURL:target:title:image:]):
+ (-[WebHistoryItem dealloc]):
+ (-[WebHistoryItem target]):
+ (-[WebHistoryItem setTarget:]):
+ (-[WebHistoryItem setLastVisitedDate:]):
+ (-[WebHistoryItem scrollPoint]):
+ (-[WebHistoryItem setScrollPoint:]):
+ * History.subproj/WebHistoryList.m:
+ * WebView.subproj/WebFramePrivate.h:
+ * WebView.subproj/WebFramePrivate.m:
+ (-[WebFramePrivate setLoadType:]):
+ (-[WebFrame _setLoadType:]):
+ (-[WebFrame _loadType]):
+ (-[WebFrame _transitionToCommitted]):
+
2002-07-25 Chris Blumenberg <cblu at apple.com>
Made some WebPolicy API's private
diff --git a/WebKit/History.subproj/WebBackForwardList.h b/WebKit/History.subproj/WebBackForwardList.h
index 4e743ae..39ab8c7 100644
--- a/WebKit/History.subproj/WebBackForwardList.h
+++ b/WebKit/History.subproj/WebBackForwardList.h
@@ -10,7 +10,6 @@
@interface WebBackForwardList : NSObject {
WebHistoryList *uriList;
int index;
- NSLock *mutex;
int state;
}
@@ -21,7 +20,9 @@
// change position in the list
-(void)goBack;
+-(void)goBackToIndex: (int)pos;
-(void)goForward;
+-(void)goForwardToIndex: (int)pos;
// examine entries without changing position
-(WebHistoryItem *)backEntry;
diff --git a/WebKit/History.subproj/WebBackForwardList.m b/WebKit/History.subproj/WebBackForwardList.m
index e0c2fb3..c73ee63 100644
--- a/WebKit/History.subproj/WebBackForwardList.m
+++ b/WebKit/History.subproj/WebBackForwardList.m
@@ -23,7 +23,6 @@
uriList = [[WebHistoryList alloc] init];
[uriList setAllowsDuplicates:YES];
index = 0;
- mutex = [[NSLock alloc] init];
return self;
}
@@ -31,27 +30,25 @@
-(void)dealloc
{
[uriList release];
- [mutex release];
-
[super dealloc];
}
-(void)addEntry:(WebHistoryItem *)entry
{
- [mutex lock];
if (index > 0) {
[uriList removeEntriesToIndex:index];
index = 0;
}
[uriList addEntry:entry];
- [mutex unlock];
}
-(void)goBack
{
- [mutex lock];
index++;
- [mutex unlock];
+}
+
+-(void)goBackToIndex: (int)pos
+{
}
-(WebHistoryItem *)backEntry
@@ -59,14 +56,12 @@
WebHistoryItem *result;
int count;
- [mutex lock];
count = [uriList count];
if (count > 1 && index < (count - 1)) {
result = [uriList entryAtIndex:index+1];
} else {
result = nil;
}
- [mutex unlock];
return result;
}
@@ -75,9 +70,7 @@
{
WebHistoryItem *result;
- [mutex lock];
result = [uriList entryAtIndex:index];
- [mutex unlock];
return result;
}
@@ -86,22 +79,22 @@
{
WebHistoryItem *result;
- [mutex lock];
if (index > 0) {
result = [uriList entryAtIndex:index-1];
} else {
result = nil;
}
- [mutex unlock];
return result;
}
-(void)goForward
{
- [mutex lock];
index--;
- [mutex unlock];
+}
+
+-(void)goForwardToIndex: (int)pos
+{
}
-(BOOL)canGoBack
@@ -109,10 +102,8 @@
BOOL result;
int count;
- [mutex lock];
count = [uriList count];
result = (count > 1 && index < (count - 1));
- [mutex unlock];
return result;
}
@@ -121,9 +112,7 @@
{
BOOL result;
- [mutex lock];
result = (index > 0);
- [mutex unlock];
return result;
}
@@ -144,8 +133,6 @@
{
NSMutableString *result;
int i;
-
- [mutex lock];
result = [NSMutableString stringWithCapacity:512];
@@ -166,8 +153,6 @@
[result appendString:@"\n--------------------------------------------\n"];
- [mutex unlock];
-
return result;
}
diff --git a/WebKit/History.subproj/WebHistoryItem.h b/WebKit/History.subproj/WebHistoryItem.h
index 931e2a3..5efdd1f 100644
--- a/WebKit/History.subproj/WebHistoryItem.h
+++ b/WebKit/History.subproj/WebHistoryItem.h
@@ -1,41 +1,44 @@
-//
-// WebHistoryItem.h
-// WebKit
-//
-// Created by Kenneth Kocienda on Thu Nov 29 2001.
-// Copyright (c) 2001 Apple Computer, Inc. All rights reserved.
-//
+/*
+ WebHistoryItem.h
+ Copyright 2001, 2002, Apple, Inc. All rights reserved.
+*/
#import <Cocoa/Cocoa.h>
@interface WebHistoryItem : NSObject
{
NSURL *_url;
+ NSString *_target;
NSString *_title;
NSString *_displayTitle;
NSImage *_image;
NSCalendarDate *_lastVisitedDate;
+ NSPoint _scrollPoint;
}
-(id)init;
-(id)initWithURL:(NSURL *)url title:(NSString *)title;
-(id)initWithURL:(NSURL *)url title:(NSString *)title image:(NSImage *)image;
+-(id)initWithURL:(NSURL *)url target: (NSString *)target title:(NSString *)title image:(NSImage *)image;
-(NSDictionary *)dictionaryRepresentation;
-(id)initFromDictionaryRepresentation:(NSDictionary *)dict;
-(NSURL *)url;
+-(NSString *)target;
-(NSString *)title;
-(NSString *)displayTitle;
-(NSImage *)image;
-(NSCalendarDate *)lastVisitedDate;
-(void)setURL:(NSURL *)url;
+-(void)setTarget:(NSString *)target;
-(void)setTitle:(NSString *)title;
-(void)setDisplayTitle:(NSString *)displayTitle;
-(void)setImage:(NSImage *)image;
-(void)setLastVisitedDate:(NSCalendarDate *)date;
-
+-(void)setScrollPoint: (NSPoint)p;
+- (NSPoint)scrollPoint;
-(unsigned)hash;
-(BOOL)isEqual:(id)anObject;
diff --git a/WebKit/History.subproj/WebHistoryItem.m b/WebKit/History.subproj/WebHistoryItem.m
index 55c0962..42c5403 100644
--- a/WebKit/History.subproj/WebHistoryItem.m
+++ b/WebKit/History.subproj/WebHistoryItem.m
@@ -1,10 +1,7 @@
-//
-// WebHistoryItem.m
-// WebKit
-//
-// Created by Kenneth Kocienda on Thu Nov 29 2001.
-// Copyright (c) 2001, 2002 Apple Computer, Inc. All rights reserved.
-//
+/*
+ WebHistoryItem.m
+ Copyright 2001, 2002, Apple, Inc. All rights reserved.
+*/
#import <WebKit/WebHistoryItem.h>
#import <WebKit/WebIconLoader.h>
@@ -21,17 +18,23 @@
-(id)initWithURL:(NSURL *)url title:(NSString *)title
{
- return [self initWithURL:url title:title image:nil];
+ return [self initWithURL:url target: nil title:title image:nil];
}
-(id)initWithURL:(NSURL *)url title:(NSString *)title image:(NSImage *)image
{
+ return [self initWithURL:url target: nil title:title image:image];
+}
+
+-(id)initWithURL:(NSURL *)url target: (NSString *)target title:(NSString *)title image:(NSImage *)image
+{
if (self != [super init])
{
return nil;
}
_url = [url retain];
+ _target = [target copy];
_title = [title copy];
_image = [image retain];
_lastVisitedDate = [[NSCalendarDate alloc] init];
@@ -42,6 +45,7 @@
- (void)dealloc
{
[_url release];
+ [_target release];
[_title release];
[_displayTitle release];
[_image release];
@@ -55,6 +59,11 @@
return _url;
}
+-(NSString *)target
+{
+ return _target;
+}
+
-(NSString *)title
{
return _title;
@@ -95,6 +104,14 @@
}
}
+-(void)setTarget:(NSString *)target
+{
+ if (target != _target) {
+ [_target release];
+ _target = [target copy];
+ }
+}
+
-(void)setDisplayTitle:(NSString *)displayTitle
{
if (displayTitle != _displayTitle) {
@@ -119,6 +136,16 @@
}
}
+-(NSPoint)scrollPoint
+{
+ return _scrollPoint;
+}
+
+-(void)setScrollPoint: (NSPoint)scrollPoint
+{
+ _scrollPoint = scrollPoint;
+}
+
-(unsigned)hash
{
return [_url hash];
diff --git a/WebKit/History.subproj/WebHistoryList.m b/WebKit/History.subproj/WebHistoryList.m
index 819926e..e1c6eca 100644
--- a/WebKit/History.subproj/WebHistoryList.m
+++ b/WebKit/History.subproj/WebHistoryList.m
@@ -1,5 +1,6 @@
-/* WebHistoryList.m
- Copyright 2001, Apple, Inc. All rights reserved.
+/*
+ WebHistoryList.m
+ Copyright 2001, Apple, Inc. All rights reserved.
*/
#import "WebHistoryList.h"
diff --git a/WebKit/WebView.subproj/WebFramePrivate.h b/WebKit/WebView.subproj/WebFramePrivate.h
index 0b12485..57c1952 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.h
+++ b/WebKit/WebView.subproj/WebFramePrivate.h
@@ -29,6 +29,15 @@ typedef enum {
WebFrameStateComplete = 5
} WebFrameState;
+typedef enum {
+ WebFrameLoadTypeStandard,
+ WebFrameLoadTypeBack,
+ WebFrameLoadTypeForward,
+ WebFrameLoadTypeIndexedBack,
+ WebFrameLoadTypeIndexedForward,
+ WebFrameLoadTypeRefresh,
+} WebFrameLoadType;
+
#define WebFrameStateChangedNotification @"WebFrameStateChangedNotification"
#define WebPreviousFrameState @"WebPreviousFrameState"
@@ -44,6 +53,7 @@ typedef enum {
WebController *controller;
WebFrameState state;
NSTimer *scheduledLayoutTimer;
+ WebFrameLoadType loadType;
}
- (void)setName: (NSString *)n;
@@ -56,6 +66,8 @@ typedef enum {
- (WebDataSource *)dataSource;
- (void)setProvisionalDataSource: (WebDataSource *)d;
- (WebDataSource *)provisionalDataSource;
+- (WebFrameLoadType)loadType;
+- (void)setLoadType: (WebFrameLoadType)loadType;
@end
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 322b269..8c3c9fa 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -6,20 +6,22 @@
#import <WebKit/WebFramePrivate.h>
+#import <WebKit/WebBackForwardList.h>
+#import <WebKit/WebBridge.h>
+#import <WebKit/WebController.h>
+#import <WebKit/WebControllerPrivate.h>
+#import <WebKit/WebDataSource.h>
+#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebDocument.h>
#import <WebKit/WebDynamicScrollBarsView.h>
+#import <WebKit/WebHistoryItem.h>
#import <WebKit/WebHTMLView.h>
#import <WebKit/WebHTMLViewPrivate.h>
+#import <WebKit/WebKitDebug.h>
+#import <WebKit/WebKitErrors.h>
#import <WebKit/WebLocationChangeHandler.h>
#import <WebKit/WebPreferencesPrivate.h>
-#import <WebKit/WebController.h>
-#import <WebKit/WebControllerPrivate.h>
-#import <WebKit/WebBridge.h>
-#import <WebKit/WebDataSource.h>
-#import <WebKit/WebDataSourcePrivate.h>
-#import <WebKit/WebKitErrors.h>
#import <WebKit/WebViewPrivate.h>
-#import <WebKit/WebKitDebug.h>
#import <WebFoundation/WebFoundation.h>
@@ -91,6 +93,13 @@ static const char * const stateNames[6] = {
provisionalDataSource = d;
}
+- (WebFrameLoadType)loadType { return loadType; }
+- (void)setLoadType: (WebFrameLoadType)t
+{
+ loadType = t;
+}
+
+
@end
@implementation WebFrame (WebPrivate)
@@ -113,6 +122,17 @@ static const char * const stateNames[6] = {
[ds _setController: [self controller]];
}
+- (void)_setLoadType: (WebFrameLoadType)t
+{
+ [_private setLoadType: t];
+}
+
+
+- (WebFrameLoadType)_loadType
+{
+ return [_private loadType];
+}
+
- (void)_scheduleLayout:(NSTimeInterval)inSeconds
{
// FIXME: Maybe this should have the code to move up the deadline if the new interval brings the time even closer.
@@ -243,6 +263,14 @@ static const char * const stateNames[6] = {
[self _setState: WebFrameStateCommittedPage];
+ // Handle adding the URL to the back/forward list.
+ if ([self _loadType] == WebFrameLoadTypeStandard){
+ WebHistoryItem *item = [[WebHistoryItem alloc] initWithURL:[[self dataSource] inputURL] target: [self name] title:[[self dataSource] pageTitle] image: nil];
+ [[[self controller] backForwardList] addEntry: item];
+ [item release];
+ }
+
+ // Tell the client we've committed this URL.
[[[self dataSource] _locationChangeHandler] locationChangeCommittedForDataSource:[self dataSource]];
// If we have a title let the controller know about it.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list