[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 07:49:19 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 7fe3e5be7769ffd836a287cc92f1fe04ad49f7eb
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jul 30 01:36:42 2003 +0000
Use the new KURL getNSURL() method to create an NSURL.
Reviewed by darin.
* kwq/KWQKHTMLPart.mm:
(KWQKHTMLPart::attributedString):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4729 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index e8b8d76..8ba5bc1 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2003-07-29 Richard Williamson <rjw at apple.com>
+
+ Use the new KURL getNSURL() method to create an NSURL.
+
+ Reviewed by darin.
+
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPart::attributedString):
+
2003-07-29 Darin Adler <darin at apple.com>
Reviewed by Dave.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e8b8d76..8ba5bc1 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2003-07-29 Richard Williamson <rjw at apple.com>
+
+ Use the new KURL getNSURL() method to create an NSURL.
+
+ Reviewed by darin.
+
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPart::attributedString):
+
2003-07-29 Darin Adler <darin at apple.com>
Reviewed by Dave.
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 66fa543..0449f09 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -2016,10 +2016,8 @@ NSAttributedString *KWQKHTMLPart::attributedString(NodeImpl *_startNode, int sta
if (linkStartNode && n.handle() == linkStartNode){
DOMString href = khtml::parseURL(linkStartNode->getAttribute(ATTR_HREF));
KURL kURL = KWQ(linkStartNode->getDocument()->view()->part())->completeURL(href.string());
- NSString *URLString = kURL.url().getNSString();
- // FIXME: create URL using new CFURL API when ready. see Ken.
- NSURL *URL = [NSURL URLWithString:URLString];
+ NSURL *URL = kURL.getNSURL();
[result addAttribute:NSLinkAttributeName value:URL range:NSMakeRange(linkStartLocation, [result length]-linkStartLocation)];
linkStartNode = 0;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list