[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

mitz at apple.com mitz at apple.com
Fri Jan 21 15:13:16 UTC 2011


The following commit has been merged in the debian/experimental branch:
commit 77e5065c5a2612b3b92a669547b9706f51cee8b0
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Jan 9 19:36:11 2011 +0000

    Assertion failure in KURL::KURL when calling WKURLRequestCreateWithWKURL with a non-parsed URL
    https://bugs.webkit.org/show_bug.cgi?id=52132
    
    Reviewed by Simon Fraser.
    
    * Shared/API/c/WKURLRequest.cpp:
    (WKURLRequestCreateWithWKURL): Parse the URL.
    * Shared/WebString.h: Fixed a comment.
    * Shared/WebURL.h: Ditto.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75355 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 9250cc0..872669a 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-09  Dan Bernstein  <mitz at apple.com>
+
+        Reviewed by Simon Fraser.
+
+        Assertion failure in KURL::KURL when calling WKURLRequestCreateWithWKURL with a non-parsed URL
+        https://bugs.webkit.org/show_bug.cgi?id=52132
+
+        * Shared/API/c/WKURLRequest.cpp:
+        (WKURLRequestCreateWithWKURL): Parse the URL.
+        * Shared/WebString.h: Fixed a comment.
+        * Shared/WebURL.h: Ditto.
+
 2011-01-09  Amruth Raj  <amruthraj at motorola.com> and Ravi Phaneendra Kasibhatla  <ravi.kasibhatla at motorola.com>
 
         Reviewed by Martin Robinson.
diff --git a/WebKit2/Shared/API/c/WKURLRequest.cpp b/WebKit2/Shared/API/c/WKURLRequest.cpp
index 27d45b1..6ea66ec 100644
--- a/WebKit2/Shared/API/c/WKURLRequest.cpp
+++ b/WebKit2/Shared/API/c/WKURLRequest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
+ * Copyright (C) 2010, 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -27,7 +27,9 @@
 
 #include "WKAPICast.h"
 #include "WebURLRequest.h"
+#include <WebCore/KURL.h>
 
+using namespace WebCore;
 using namespace WebKit;
 
 WKTypeID WKURLRequestGetTypeID()
@@ -37,5 +39,5 @@ WKTypeID WKURLRequestGetTypeID()
 
 WKURLRequestRef WKURLRequestCreateWithWKURL(WKURLRef url)
 {
-    return toAPI(WebURLRequest::create(toImpl(url)->string()).leakRef());
+    return toAPI(WebURLRequest::create(KURL(KURL(), toImpl(url)->string())).leakRef());
 }
diff --git a/WebKit2/Shared/WebString.h b/WebKit2/Shared/WebString.h
index 4ad786b..a77293b 100644
--- a/WebKit2/Shared/WebString.h
+++ b/WebKit2/Shared/WebString.h
@@ -34,7 +34,7 @@
 
 namespace WebKit {
 
-// WebString - An string array type suitable for vending to an API.
+// WebString - A string type suitable for vending to an API.
 
 class WebString : public APIObject {
 public:
diff --git a/WebKit2/Shared/WebURL.h b/WebKit2/Shared/WebURL.h
index 7b413e0..1b0826b 100644
--- a/WebKit2/Shared/WebURL.h
+++ b/WebKit2/Shared/WebURL.h
@@ -32,7 +32,7 @@
 
 namespace WebKit {
 
-// WebURL - An string array type suitable for vending to an API.
+// WebURL - A URL type suitable for vending to an API.
 
 class WebURL : public APIObject {
 public:

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list