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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 4dc132747cb23146add55fc939d24197464f3b02
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Mar 30 21:40:25 2002 +0000

            Added log to note cases of NSURL (CFURL) being unable to
            correctly initialize from URLs.  This log will likely indicate
            bugs in CFURL.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@906 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 0a89f0f..007a3ed 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,13 @@
 2002-03-30  Richard Williamson  <rjw at apple.com>
 
+        Added log to note cases of NSURL (CFURL) being unable to
+        correctly initialize from URLs.  This log will likely indicate
+        bugs in CFURL.
+        
+	* src/kwq/KWQKHTMLPart.mm: (KHTMLPart::requestFrame):
+
+2002-03-30  Richard Williamson  <rjw at apple.com>
+
         Twiddling with baselines.  kde 2.2 appears to not line up baselines correctly.
         Need to experiment with kde 3.
         
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 0a89f0f..007a3ed 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,13 @@
 2002-03-30  Richard Williamson  <rjw at apple.com>
 
+        Added log to note cases of NSURL (CFURL) being unable to
+        correctly initialize from URLs.  This log will likely indicate
+        bugs in CFURL.
+        
+	* src/kwq/KWQKHTMLPart.mm: (KHTMLPart::requestFrame):
+
+2002-03-30  Richard Williamson  <rjw at apple.com>
+
         Twiddling with baselines.  kde 2.2 appears to not line up baselines correctly.
         Need to experiment with kde 3.
         
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 0a89f0f..007a3ed 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,13 @@
 2002-03-30  Richard Williamson  <rjw at apple.com>
 
+        Added log to note cases of NSURL (CFURL) being unable to
+        correctly initialize from URLs.  This log will likely indicate
+        bugs in CFURL.
+        
+	* src/kwq/KWQKHTMLPart.mm: (KHTMLPart::requestFrame):
+
+2002-03-30  Richard Williamson  <rjw at apple.com>
+
         Twiddling with baselines.  kde 2.2 appears to not line up baselines correctly.
         Need to experiment with kde 3.
         
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index b2e884c..557f62c 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -840,9 +840,16 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const QString &url, cons
         NSURL *childURL;
         IFWebFrame *newFrame;
         id <IFWebController> controller;
-
+        NSString *urlString;
+        
+        urlString = QSTRING_TO_NSSTRING (completeURL( url ).url() );
         childURL = [NSURL URLWithString: QSTRING_TO_NSSTRING (completeURL( url ).url() )];
         
+        if (childURL == nil){
+            NSLog (@"ERROR (probably need to fix CFURL):  unable to create URL for %@\n", urlString);
+            return false;
+        }
+        
         oldDataSource = getDataSource();
         controller = [oldDataSource controller];
         newFrame = [controller createFrameNamed: nsframeName for: nil inParent: oldDataSource];
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index b2e884c..557f62c 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -840,9 +840,16 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const QString &url, cons
         NSURL *childURL;
         IFWebFrame *newFrame;
         id <IFWebController> controller;
-
+        NSString *urlString;
+        
+        urlString = QSTRING_TO_NSSTRING (completeURL( url ).url() );
         childURL = [NSURL URLWithString: QSTRING_TO_NSSTRING (completeURL( url ).url() )];
         
+        if (childURL == nil){
+            NSLog (@"ERROR (probably need to fix CFURL):  unable to create URL for %@\n", urlString);
+            return false;
+        }
+        
         oldDataSource = getDataSource();
         controller = [oldDataSource controller];
         newFrame = [controller createFrameNamed: nsframeName for: nil inParent: oldDataSource];
diff --git a/WebCore/src/kwq/KWQKHTMLPart.mm b/WebCore/src/kwq/KWQKHTMLPart.mm
index b2e884c..557f62c 100644
--- a/WebCore/src/kwq/KWQKHTMLPart.mm
+++ b/WebCore/src/kwq/KWQKHTMLPart.mm
@@ -840,9 +840,16 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const QString &url, cons
         NSURL *childURL;
         IFWebFrame *newFrame;
         id <IFWebController> controller;
-
+        NSString *urlString;
+        
+        urlString = QSTRING_TO_NSSTRING (completeURL( url ).url() );
         childURL = [NSURL URLWithString: QSTRING_TO_NSSTRING (completeURL( url ).url() )];
         
+        if (childURL == nil){
+            NSLog (@"ERROR (probably need to fix CFURL):  unable to create URL for %@\n", urlString);
+            return false;
+        }
+        
         oldDataSource = getDataSource();
         controller = [oldDataSource controller];
         newFrame = [controller createFrameNamed: nsframeName for: nil inParent: oldDataSource];

-- 
WebKit Debian packaging