[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

antti.j.koivisto at nokia.com antti.j.koivisto at nokia.com
Wed Dec 22 11:44:17 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 1df6ebfeb05fd017894005d71408155db0c35755
Author: antti.j.koivisto at nokia.com <antti.j.koivisto at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 5 12:58:22 2010 +0000

    Use toCopiedRef for making WK objects
    https://bugs.webkit.org/show_bug.cgi?id=43552
    
    Reviewed by Kenneth Rohde Christiansen.
    
    * UIProcess/API/cpp/qt/WKStringQt.cpp:
    (WKStringCreateWithQString):
    * UIProcess/API/cpp/qt/WKURLQt.cpp:
    (WKURLCreateWithQUrl):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64739 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 2014c66..61bc138 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-05  Antti Koivisto  <koivisto at iki.fi>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Use toCopiedRef for making WK objects
+        https://bugs.webkit.org/show_bug.cgi?id=43552
+
+        * UIProcess/API/cpp/qt/WKStringQt.cpp:
+        (WKStringCreateWithQString):
+        * UIProcess/API/cpp/qt/WKURLQt.cpp:
+        (WKURLCreateWithQUrl):
+
 2010-08-04  Brady Eidson  <beidson at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebKit2/UIProcess/API/cpp/qt/WKStringQt.cpp b/WebKit2/UIProcess/API/cpp/qt/WKStringQt.cpp
index 2052f1e..92517eb 100644
--- a/WebKit2/UIProcess/API/cpp/qt/WKStringQt.cpp
+++ b/WebKit2/UIProcess/API/cpp/qt/WKStringQt.cpp
@@ -28,8 +28,7 @@
 WKStringRef WKStringCreateWithQString(const QString& qString)
 {
     WebCore::String string(qString);
-    RefPtr<WebCore::StringImpl> stringImpl = string.impl();
-    return toRef(stringImpl.release().releaseRef());
+    return toCopiedRef(string);
 }
 
 QString WKStringCopyQString(WKStringRef stringRef)
diff --git a/WebKit2/UIProcess/API/cpp/qt/WKURLQt.cpp b/WebKit2/UIProcess/API/cpp/qt/WKURLQt.cpp
index 22fe5d6..1887b47 100644
--- a/WebKit2/UIProcess/API/cpp/qt/WKURLQt.cpp
+++ b/WebKit2/UIProcess/API/cpp/qt/WKURLQt.cpp
@@ -28,8 +28,7 @@
 WKURLRef WKURLCreateWithQUrl(const QUrl& qURL)
 {
     WebCore::String urlString(qURL.toString());
-    RefPtr<WebCore::StringImpl> urlStringImpl = urlString.impl();
-    return toURLRef(urlStringImpl.release().releaseRef());
+    return toCopiedURLRef(urlString);
 }
 
 QUrl WKURLCopyQUrl(WKURLRef urlRef)

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list