[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:30:08 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 55f2972cbd98d5aefd2189af4d594cc9d86cd288
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Aug 7 19:03:28 2002 +0000
top level:
* Tests/WebFoundation-Misc/ifnsurlextensions-test.m:
New test that tests more of the code in WebNSExtras.
* Tests/WebFoundation-Misc/ifnsurlextensions-test.chk:
New output for new test. Matches the old for canonicalize test cases.
WebFoundation:
- fixed 3017633 -- IPv6 URL support needed
- fixed 2876174 -- Some URL functions should be moved to IFNSURLExtensions
and have test cases added
* Misc.subproj/WebNSURLExtras.h: Removed _web_extractHTTPBaseURLString and
_web_URLWithScheme:user:password:host:port:path:parameter:query:fragment:,
renamed _web_URLWithoutFragment to _web_URLByRemovingFragment.
* Misc.subproj/WebNSURLExtras.m:
(ReleaseIfNotNULL): Added. Used by the component-related functions.
(StringByAddingPercentEscapes): Broken out from URLStringByAddingPercentEscapes.
(URLStringByAddingPercentEscapes): Add code to handle the IPv6 case but make sure
we escape any other bracket characters in the string.
(+[NSURL _web_URLWithComponents:]): Added.
(-[NSURL _web_URLComponents]): Added. These use the CFURL functions for breaking URLs
into components, but makes them easier to use from AppKit by using autoreleased NSString
objects and also fixes some anomalies in the CFURL functions.
(-[NSURL _web_URLByRemovingFragment]): Simpler implementation, new name.
(-[NSURL _web_URLByRemovingUserAndQueryAndFragment]): Added. Replaces
WebNSURLRemoveUserAndSubresourceInfo.
(-[NSURL _web_URLByRemovingPasswordAndPath]): Added. Replaces WebNSURLCanonicalRoot.
(-[NSURL _web_URLByRemovingLastPathComponent]): Added. Replaces WebNSURLGetParent.
(-[NSURL _web_canonicalize]): Rewrote to use _web_URLComponents.
* CacheLoader.subproj/WebFileProtocolHandler.m:
(+[WebFileProtocolHandler canonicalizeURL:]): Rewrite to use _web_URLComponents.
* CacheLoader.subproj/WebHTTPProtocolHandler.m:
(+[WebHTTPProtocolHandler canonicalizeURL:]): Rewrite to use _web_URLComponents.
* AuthenticationManager.subproj/WebAuthenticationManager.m:
Remove WebNSURLRemoveUserAndSubresourceInfo, WebNSURLCanonicalRoot, and
WebNSURLGetParent, and use equivalent functions from WebNSURLExtras.
* Misc.subproj/WebNSStringExtras.h:
* Misc.subproj/WebNSStringExtras.m:
(-[NSString _web_hasCaseInsensitivePrefix:]): Added.
WebCore:
* kwq/KWQKURL.mm: (KURL::KWQKURLPrivate::decompose): Use CFURLCopyPath
instead calling _NSParseStringToGenericURLComponents.
WebKit:
* WebView.subproj/WebFrame.m: (-[WebFrame setProvisionalDataSource:]):
* WebView.subproj/WebFramePrivate.m: (-[WebFrame _goToItem:withFrameLoadType:]):
Call _web_URLWithoutFragment by its new name _web_URLByRemovingFragment.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1768 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 63ff90c..76cb765 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,8 @@
+2002-08-07 Darin Adler <darin at apple.com>
+
+ * kwq/KWQKURL.mm: (KURL::KWQKURLPrivate::decompose): Use CFURLCopyPath
+ instead calling _NSParseStringToGenericURLComponents.
+
2002-08-07 Richard Williamson (Home) <rjw at apple.com>
Turned off temporary debugging I accidentally checked in.
@@ -50,7 +55,7 @@
* kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::overURL):
Fix crash in overURL, another case just like bug 3006336.
-2002-08-06 Richard Williamson (Local) <rjw at apple.com>
+2002-08-06 Richard Williamson <rjw at apple.com>
Frame resizing related changes. Frames are now resizable
w/ a resize bar. Still need to draw frame borders.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 63ff90c..76cb765 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,8 @@
+2002-08-07 Darin Adler <darin at apple.com>
+
+ * kwq/KWQKURL.mm: (KURL::KWQKURLPrivate::decompose): Use CFURLCopyPath
+ instead calling _NSParseStringToGenericURLComponents.
+
2002-08-07 Richard Williamson (Home) <rjw at apple.com>
Turned off temporary debugging I accidentally checked in.
@@ -50,7 +55,7 @@
* kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::overURL):
Fix crash in overURL, another case just like bug 3006336.
-2002-08-06 Richard Williamson (Local) <rjw at apple.com>
+2002-08-06 Richard Williamson <rjw at apple.com>
Frame resizing related changes. Frames are now resizable
w/ a resize bar. Still need to draw frame borders.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 63ff90c..76cb765 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,8 @@
+2002-08-07 Darin Adler <darin at apple.com>
+
+ * kwq/KWQKURL.mm: (KURL::KWQKURLPrivate::decompose): Use CFURLCopyPath
+ instead calling _NSParseStringToGenericURLComponents.
+
2002-08-07 Richard Williamson (Home) <rjw at apple.com>
Turned off temporary debugging I accidentally checked in.
@@ -50,7 +55,7 @@
* kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::overURL):
Fix crash in overURL, another case just like bug 3006336.
-2002-08-06 Richard Williamson (Local) <rjw at apple.com>
+2002-08-06 Richard Williamson <rjw at apple.com>
Frame resizing related changes. Frames are now resizable
w/ a resize bar. Still need to draw frame borders.
diff --git a/WebCore/kwq/KWQKURL.mm b/WebCore/kwq/KWQKURL.mm
index 1a645cb..f66b6bb 100644
--- a/WebCore/kwq/KWQKURL.mm
+++ b/WebCore/kwq/KWQKURL.mm
@@ -159,16 +159,6 @@ static bool pathEndsWithSlash(const QString &sURL)
}
}
-static CFStringRef copyEscapedPath(CFURLRef anURL)
-{
- NSRange path;
- CFStringRef urlString = CFURLGetString(anURL);
-
- _NSParseStringToGenericURLComponents((NSString *)urlString, NULL, NULL, NULL, NULL, NULL, &path, NULL, NULL, NULL);
-
- return CFStringCreateWithSubstring(NULL, urlString, CFRangeMake(path.location, path.length));
-}
-
void KURL::KWQKURLPrivate::decompose()
{
makeRef();
@@ -209,7 +199,7 @@ void KURL::KWQKURLPrivate::decompose()
escapedPath = "";
} else {
sPath = CFStringToQString(CFURLCopyFileSystemPath(urlRef, kCFURLPOSIXPathStyle));
- escapedPath = CFStringToQString(copyEscapedPath(urlRef));
+ escapedPath = CFStringToQString(CFURLCopyPath(urlRef));
}
// Remove "../" or "./" from the start of the path.
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index f74eaa6..984fba4 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,9 @@
+2002-08-07 Darin Adler <darin at apple.com>
+
+ * WebView.subproj/WebFrame.m: (-[WebFrame setProvisionalDataSource:]):
+ * WebView.subproj/WebFramePrivate.m: (-[WebFrame _goToItem:withFrameLoadType:]):
+ Call _web_URLWithoutFragment by its new name _web_URLByRemovingFragment.
+
2002-08-07 Chris Blumenberg <cblu at apple.com>
Fixed: 3018632 - the show javascript files inline bug
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index f74eaa6..984fba4 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-08-07 Darin Adler <darin at apple.com>
+
+ * WebView.subproj/WebFrame.m: (-[WebFrame setProvisionalDataSource:]):
+ * WebView.subproj/WebFramePrivate.m: (-[WebFrame _goToItem:withFrameLoadType:]):
+ Call _web_URLWithoutFragment by its new name _web_URLByRemovingFragment.
+
2002-08-07 Chris Blumenberg <cblu at apple.com>
Fixed: 3018632 - the show javascript files inline bug
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 4eb3dee..ccae2e2 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -132,7 +132,7 @@
WebHistoryItem *entry;
entry = (WebHistoryItem *)[[[self controller] backForwardList] currentEntry];
- if ([[[entry URL] _web_URLWithoutFragment] isEqual: [[[self dataSource] originalURL] _web_URLWithoutFragment]]) {
+ if ([[[entry URL] _web_URLByRemovingFragment] isEqual: [[[self dataSource] originalURL] _web_URLByRemovingFragment]]) {
NSPoint point = [[[[self webView] documentView] superview] bounds].origin;
[entry setScrollPoint: point];
}
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index dca44d3..9ca2231 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -665,7 +665,7 @@ static const char * const stateNames[] = {
WebDataSource *dataSource;
NSURL *originalURL = [[self dataSource] originalURL];
- if ([item anchor] && [[itemURL _web_URLWithoutFragment] isEqual: [originalURL _web_URLWithoutFragment]]){
+ if ([item anchor] && [[itemURL _web_URLByRemovingFragment] isEqual: [originalURL _web_URLByRemovingFragment]]) {
WebBackForwardList *backForwardList = [[self controller] backForwardList];
if (type == WebFrameLoadTypeForward)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list