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

[barraclough at apple.com]

The following commit has been merged in the debian/experimental branch:
commit e9568c2c476c8d831228e93494152a60eaff78ba
Author: barraclough at apple.com <barraclough at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 10 03:10:15 2010 +0000

    Qt build fix attempt IV.
    
    * css/CSSSelector.cpp:
    (WebCore::CSSSelector::selectorText):
    * dom/QualifiedName.cpp:
    (WebCore::QualifiedName::toString):
    * dom/XMLDocumentParserQt.cpp:
    (WebCore::handleElementNamespaces):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65040 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2ffcb40..30cffc3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,16 @@
 2010-08-09  Gavin Barraclough  <barraclough at apple.com>
 
+        Qt build fix attempt IV.
+
+        * css/CSSSelector.cpp:
+        (WebCore::CSSSelector::selectorText):
+        * dom/QualifiedName.cpp:
+        (WebCore::QualifiedName::toString):
+        * dom/XMLDocumentParserQt.cpp:
+        (WebCore::handleElementNamespaces):
+
+2010-08-09  Gavin Barraclough  <barraclough at apple.com>
+
         Speculative chromium build fix.
 
         * platform/graphics/chromium/FontCacheChromiumWin.cpp:
diff --git a/WebCore/css/CSSSelector.cpp b/WebCore/css/CSSSelector.cpp
index bd6d14f..298d5fc 100644
--- a/WebCore/css/CSSSelector.cpp
+++ b/WebCore/css/CSSSelector.cpp
@@ -746,8 +746,10 @@ String CSSSelector::selectorText() const
         } else if (cs->hasAttribute()) {
             str += "[";
             const AtomicString& prefix = cs->attribute().prefix();
-            if (!prefix.isNull())
-                str += prefix + "|";
+            if (!prefix.isNull()) {
+                str.append(prefix);
+                str.append("|");
+            }
             str += cs->attribute().localName();
             switch (cs->m_match) {
                 case CSSSelector::Exact:
diff --git a/WebCore/dom/QualifiedName.cpp b/WebCore/dom/QualifiedName.cpp
index 7cc809f..e0098f5 100644
--- a/WebCore/dom/QualifiedName.cpp
+++ b/WebCore/dom/QualifiedName.cpp
@@ -88,8 +88,12 @@ void QualifiedName::deref()
 String QualifiedName::toString() const
 {
     String local = localName();
-    if (hasPrefix())
-        return prefix() + ":" + local;
+    if (hasPrefix()) {
+        String result(prefix());
+        result.append(":");
+        result.append(local);
+        return result;
+    }
     return local;
 }
 
diff --git a/WebCore/dom/XMLDocumentParserQt.cpp b/WebCore/dom/XMLDocumentParserQt.cpp
index c702c09..4a33d57 100644
--- a/WebCore/dom/XMLDocumentParserQt.cpp
+++ b/WebCore/dom/XMLDocumentParserQt.cpp
@@ -325,7 +325,8 @@ static inline void handleElementNamespaces(Element* newElement, const QXmlStream
     for (int i = 0; i < ns.count(); ++i) {
         const QXmlStreamNamespaceDeclaration &decl = ns[i];
         String namespaceURI = decl.namespaceUri();
-        String namespaceQName = decl.prefix().isEmpty() ? String("xmlns") : String("xmlns:") + String(decl.prefix());
+        String namespaceQName = decl.prefix().isEmpty() ? String("xmlns") : String("xmlns:")
+        namespaceQName.append(decl.prefix());
         newElement->setAttributeNS("http://www.w3.org/2000/xmlns/", namespaceQName, namespaceURI, ec, scriptingPermission);
         if (ec) // exception setting attributes
             return;

-- 
WebKit Debian packaging