[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:50:16 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit c1e60bcd0e357398e3a3bb2166ab4ed15077944e
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Oct 16 20:40:02 2002 +0000
Fixed 3059237, which was fixed, but regressed.
Fixed regression in visited links due to change is semantics of
[dataSource request], added [dataSource _originalRequest]. Items
always need to be added to history with the original request.
* WebView.subproj/WebDataSource.m:
(-[WebDataSource initWithRequest:]):
* WebView.subproj/WebDataSourcePrivate.h:
* WebView.subproj/WebDataSourcePrivate.m:
(-[WebDataSourcePrivate dealloc]):
(-[WebDataSource _defersCallbacksChanged]):
(-[WebDataSource _originalRequest]):
* WebView.subproj/WebFramePrivate.m:
(-[WebFrame _transitionToCommitted]):
Removed bogus code.
* kwq/KWQKHistoryProvider.mm:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2340 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index a35b6dc..977b4a7 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-10-16 Richard Williamson <rjw at apple.com>
+
+ Removed bogus code.
+
+ * kwq/KWQKHistoryProvider.mm:
+
2002-10-15 Richard Williamson <rjw at apple.com>
* kwq/WebCoreBridge.mm:
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index a35b6dc..977b4a7 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,9 @@
+2002-10-16 Richard Williamson <rjw at apple.com>
+
+ Removed bogus code.
+
+ * kwq/KWQKHistoryProvider.mm:
+
2002-10-15 Richard Williamson <rjw at apple.com>
* kwq/WebCoreBridge.mm:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a35b6dc..977b4a7 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,9 @@
+2002-10-16 Richard Williamson <rjw at apple.com>
+
+ Removed bogus code.
+
+ * kwq/KWQKHistoryProvider.mm:
+
2002-10-15 Richard Williamson <rjw at apple.com>
* kwq/WebCoreBridge.mm:
diff --git a/WebCore/kwq/KWQKHistoryProvider.mm b/WebCore/kwq/KWQKHistoryProvider.mm
index aaea0e1..89dcc39 100644
--- a/WebCore/kwq/KWQKHistoryProvider.mm
+++ b/WebCore/kwq/KWQKHistoryProvider.mm
@@ -39,7 +39,6 @@ HistoryProvider *HistoryProvider::self()
void HistoryProvider::insert(const QString &s)
{
// Insertion handled by WebKit.
- return [[WebCoreHistory sharedHistory] addEntryForURLString: KURL(s).canonicalURL().getNSString()];
}
bool HistoryProvider::contains(const QString &s) const
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 48f50c4..4150613 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,19 @@
+2002-10-16 Richard Williamson <rjw at apple.com>
+
+ Fixed regression in visited links due to change is semantics of
+ [dataSource request], added [dataSource _originalRequest]. Items
+ always need to be added to history with the original request.
+
+ * WebView.subproj/WebDataSource.m:
+ (-[WebDataSource initWithRequest:]):
+ * WebView.subproj/WebDataSourcePrivate.h:
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (-[WebDataSourcePrivate dealloc]):
+ (-[WebDataSource _defersCallbacksChanged]):
+ (-[WebDataSource _originalRequest]):
+ * WebView.subproj/WebFramePrivate.m:
+ (-[WebFrame _transitionToCommitted]):
+
2002-10-16 Darin Adler <darin at apple.com>
- fixed 3017152 -- intra-page anchors not updating page address field
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 48f50c4..4150613 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,19 @@
+2002-10-16 Richard Williamson <rjw at apple.com>
+
+ Fixed regression in visited links due to change is semantics of
+ [dataSource request], added [dataSource _originalRequest]. Items
+ always need to be added to history with the original request.
+
+ * WebView.subproj/WebDataSource.m:
+ (-[WebDataSource initWithRequest:]):
+ * WebView.subproj/WebDataSourcePrivate.h:
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (-[WebDataSourcePrivate dealloc]):
+ (-[WebDataSource _defersCallbacksChanged]):
+ (-[WebDataSource _originalRequest]):
+ * WebView.subproj/WebFramePrivate.m:
+ (-[WebFrame _transitionToCommitted]):
+
2002-10-16 Darin Adler <darin at apple.com>
- fixed 3017152 -- intra-page anchors not updating page address field
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 23c66ee..c2a3be3 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -48,6 +48,7 @@
}
_private = [[WebDataSourcePrivate alloc] init];
+ _private->originalRequest = [request retain];
_private->request = [request retain];
++WebDataSourceCount;
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.h b/WebKit/WebView.subproj/WebDataSourcePrivate.h
index 45c4628..3721470 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.h
@@ -28,6 +28,7 @@
WebController *controller;
+ WebResourceRequest *originalRequest;
WebResourceRequest *request;
WebResourceResponse *response;
@@ -113,5 +114,6 @@
- (void)_finishedLoading;
- (void)_defersCallbacksChanged;
+- (WebResourceRequest *)_originalRequest;
@end
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 8229195..b688a03 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -48,6 +48,7 @@
[resourceData release];
[representation release];
[request release];
+ [originalRequest release];
[mainClient release];
[mainHandle release];
[subresourceClients release];
@@ -507,4 +508,9 @@
[[[self webFrame] children] makeObjectsPerformSelector:@selector(_defersCallbacksChanged)];
}
+- (WebResourceRequest *)_originalRequest
+{
+ return _private->originalRequest;
+}
+
@end
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 0f9ef5b..a70bfec 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -322,7 +322,7 @@ static const char * const stateNames[] = {
case WebFrameLoadTypeStandard:
// Add item to history.
- entry = [[WebHistory sharedHistory] addEntryForURL: [[[ds request] URL] _web_canonicalize]];
+ entry = [[WebHistory sharedHistory] addEntryForURL: [[[ds _originalRequest] URL] _web_canonicalize]];
if (ptitle)
[entry setTitle: ptitle];
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list