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

[hausmann at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 6f01c5d18731851e78ccb3c37fc45982a28fb728
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Sep 12 14:28:12 2010 +0000

    [Qt] Fix the compilation of V8Binding.cpp when compiling with Qt.
    
    Reviewed by Andreas Kling.
    
    * bindings/v8/V8Binding.cpp:
    (WebCore::WebCoreStringResource::WebCoreStringResource): In this
    line an AtomicString should be converted to a WTF::String. The former
    has a conversion operator to the latter, to be able to call the
    WTF::String copy constructor. When compiling with Qt, then AtomicString
    also has a conversion operator to QString _and_ WTF::String has an
    implicit constructor that takes a QString. Therefore the compiler is
    confused and not sure which conversion to prefer, the one that isn't
    actually a conversion - going to WTF::String - or the conversion from
    AtomicString to QString and then constructing the WTF::String from
    a QString. To resolve this ambiguity we explicitly call the string()
    helper function on the AtomicString, which is equivalent to the
    operator WTF::String().
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67326 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 991a846..5dda20f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,26 @@
 
         Reviewed by Andreas Kling.
 
+        [Qt] Fix the compilation of V8Binding.cpp when compiling with Qt.
+
+        * bindings/v8/V8Binding.cpp:
+        (WebCore::WebCoreStringResource::WebCoreStringResource): In this
+        line an AtomicString should be converted to a WTF::String. The former
+        has a conversion operator to the latter, to be able to call the
+        WTF::String copy constructor. When compiling with Qt, then AtomicString
+        also has a conversion operator to QString _and_ WTF::String has an
+        implicit constructor that takes a QString. Therefore the compiler is
+        confused and not sure which conversion to prefer, the one that isn't
+        actually a conversion - going to WTF::String - or the conversion from
+        AtomicString to QString and then constructing the WTF::String from
+        a QString. To resolve this ambiguity we explicitly call the string()
+        helper function on the AtomicString, which is equivalent to the
+        operator WTF::String().
+
+2010-09-12  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        Reviewed by Andreas Kling.
+
         Fix the build without JSC.
 
         Complement http://trac.webkit.org/changeset/59826 and
diff --git a/WebCore/bindings/v8/V8Binding.cpp b/WebCore/bindings/v8/V8Binding.cpp
index bfbc647..d0bf0ca 100644
--- a/WebCore/bindings/v8/V8Binding.cpp
+++ b/WebCore/bindings/v8/V8Binding.cpp
@@ -61,7 +61,7 @@ public:
     }
 
     explicit WebCoreStringResource(const AtomicString& string)
-        : m_plainString(string)
+        : m_plainString(string.string())
         , m_atomicString(string)
     {
 #ifndef NDEBUG

-- 
WebKit Debian packaging