[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 06:48:30 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 833f53fae0db2fc0e4fa4476264a69b5e59e9a09
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 9 21:43:52 2002 +0000

            Implemented string conversion functions.
    
            * kwq/WebCoreDOMDocument.mm:
            (domStringToNSString):
            (NSStringToDOMString):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2294 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index daca6b9..2e6ea9d 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-10-09  Richard Williamson  <rjw at apple.com>
+
+        Implemented string conversion functions.
+        
+        * kwq/WebCoreDOMDocument.mm:
+        (domStringToNSString):
+        (NSStringToDOMString):
+
 2002-10-09  Darin Adler  <darin at apple.com>
 
 	- fixed 3069264 -- REGRESSION: windows created for links with
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index daca6b9..2e6ea9d 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,11 @@
+2002-10-09  Richard Williamson  <rjw at apple.com>
+
+        Implemented string conversion functions.
+        
+        * kwq/WebCoreDOMDocument.mm:
+        (domStringToNSString):
+        (NSStringToDOMString):
+
 2002-10-09  Darin Adler  <darin at apple.com>
 
 	- fixed 3069264 -- REGRESSION: windows created for links with
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index daca6b9..2e6ea9d 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,11 @@
+2002-10-09  Richard Williamson  <rjw at apple.com>
+
+        Implemented string conversion functions.
+        
+        * kwq/WebCoreDOMDocument.mm:
+        (domStringToNSString):
+        (NSStringToDOMString):
+
 2002-10-09  Darin Adler  <darin at apple.com>
 
 	- fixed 3069264 -- REGRESSION: windows created for links with
diff --git a/WebCore/kwq/WebCoreDOMDocument.mm b/WebCore/kwq/WebCoreDOMDocument.mm
index 1a7a4cf..6660879 100644
--- a/WebCore/kwq/WebCoreDOMDocument.mm
+++ b/WebCore/kwq/WebCoreDOMDocument.mm
@@ -21,12 +21,16 @@ DOM::Document DOM::DocumentImpl::createInstance (DOM::DocumentImpl *impl)
 
 NSString *domStringToNSString(DOM::DOMString &aString)
 {
-    return @"";
+    return [NSString stringWithCharacters: (unichar *)aString.unicode() length: aString.length()];
 }
 
 DOM::DOMString NSStringToDOMString(NSString *aString)
 {
-    return DOM::DOMString();
+    QChar *chars = (QChar *)malloc([aString length] * sizeof(QChar));
+    [aString getCharacters:(unichar *)chars];
+    DOM::DOMString ret(chars, [aString length]);
+    free (chars);
+    return ret;
 }
 
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list