[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit e9604b1299bb430c6156f7b5ea2d77cbf1a0c10a
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 23 17:16:24 2002 +0000

    	- fixed 3032058 -- Links on local developer doc pages all broken (all local files?)
    
            * kwq/KWQKURL.mm: (KURL::getNSURL): Re-added a workaround for CFURL bug 2908969.
    	We have to hack to make NSURL take "file:/" URLs.
    
            * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::nextKeyViewInFrame): Add a nil check.
    	I ran into this because my frame failed to load.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1909 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index b040070..5d2cbb8 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,13 @@
+2002-08-23  Darin Adler  <darin at apple.com>
+
+	- fixed 3032058 -- Links on local developer doc pages all broken (all local files?)
+
+        * kwq/KWQKURL.mm: (KURL::getNSURL): Re-added a workaround for CFURL bug 2908969.
+	We have to hack to make NSURL take "file:/" URLs.
+
+        * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::nextKeyViewInFrame): Add a nil check.
+	I ran into this because my frame failed to load.
+
 2002-08-23  Maciej Stachowiak  <mjs at apple.com>
 
 	A few more KURL changes that reduce it down to background noise
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index b040070..5d2cbb8 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2002-08-23  Darin Adler  <darin at apple.com>
+
+	- fixed 3032058 -- Links on local developer doc pages all broken (all local files?)
+
+        * kwq/KWQKURL.mm: (KURL::getNSURL): Re-added a workaround for CFURL bug 2908969.
+	We have to hack to make NSURL take "file:/" URLs.
+
+        * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::nextKeyViewInFrame): Add a nil check.
+	I ran into this because my frame failed to load.
+
 2002-08-23  Maciej Stachowiak  <mjs at apple.com>
 
 	A few more KURL changes that reduce it down to background noise
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index b040070..5d2cbb8 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2002-08-23  Darin Adler  <darin at apple.com>
+
+	- fixed 3032058 -- Links on local developer doc pages all broken (all local files?)
+
+        * kwq/KWQKURL.mm: (KURL::getNSURL): Re-added a workaround for CFURL bug 2908969.
+	We have to hack to make NSURL take "file:/" URLs.
+
+        * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::nextKeyViewInFrame): Add a nil check.
+	I ran into this because my frame failed to load.
+
 2002-08-23  Maciej Stachowiak  <mjs at apple.com>
 
 	A few more KURL changes that reduce it down to background noise
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 24d446a..ff06876 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -561,7 +561,7 @@ NSView *KWQKHTMLPartImpl::nextKeyViewInFrame(NodeImpl *node, KWQSelectionDirecti
                 if (view) {
                     return view;
                 }
-            } else {
+            } else if (widget) {
                 NSView *view = widget->getView();
                 // AppKit won't be able to handle scrolling and making us the first responder
                 // well unless we are actually installed in the correct place. KHTML only does
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 24d446a..ff06876 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -561,7 +561,7 @@ NSView *KWQKHTMLPartImpl::nextKeyViewInFrame(NodeImpl *node, KWQSelectionDirecti
                 if (view) {
                     return view;
                 }
-            } else {
+            } else if (widget) {
                 NSView *view = widget->getView();
                 // AppKit won't be able to handle scrolling and making us the first responder
                 // well unless we are actually installed in the correct place. KHTML only does
diff --git a/WebCore/kwq/KWQKURL.mm b/WebCore/kwq/KWQKURL.mm
index 1e05512..d54187b 100644
--- a/WebCore/kwq/KWQKURL.mm
+++ b/WebCore/kwq/KWQKURL.mm
@@ -931,7 +931,15 @@ void KURL::parse(const char *url, const QString *originalString)
 
 NSURL *KURL::getNSURL() const
 {
-    return [NSURL URLWithString:urlString.getNSString()];
+    NSString *string = urlString.getNSString();
+    
+    // Had to re-add this hack to work around CFURL bug 2908969, and to prevent the symptoms
+    // described in bug 3032058.
+    if ([string hasPrefix:@"file:/"] && ![string hasPrefix:@"file://"]) {
+        string = [NSString stringWithFormat:@"file://%@", [string substringFromIndex:5]];
+    }
+    
+    return [NSURL URLWithString:string];
 }
 
 QString KURL::encodedHtmlRef() const

-- 
WebKit Debian packaging