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

barraclough at apple.com barraclough at apple.com
Wed Dec 22 11:51:54 UTC 2010


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

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e983f7c..1c530cf 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,14 @@
 2010-08-09  Gavin Barraclough  <barraclough at apple.com>
 
+        Qt build fix attempt VI.
+
+        * dom/QualifiedName.cpp:
+        (WebCore::QualifiedName::toString):
+        * dom/XMLDocumentParserQt.cpp:
+        (WebCore::handleElementNamespaces):
+
+2010-08-09  Gavin Barraclough  <barraclough at apple.com>
+
         Qt build fix attempt V.
 
         * dom/QualifiedName.cpp:
diff --git a/WebCore/css/CSSSelector.cpp b/WebCore/css/CSSSelector.cpp
index 298d5fc..03974d9 100644
--- a/WebCore/css/CSSSelector.cpp
+++ b/WebCore/css/CSSSelector.cpp
@@ -713,8 +713,11 @@ String CSSSelector::selectorText() const
     if (m_match == CSSSelector::None || !prefix.isNull() || localName != starAtom) {
         if (prefix.isNull())
             str = localName;
-        else
-            str = prefix + "|" + localName;
+        else {
+            str = prefix.string();
+            str.append("|");
+            str.append(localName);
+        }
     }
 
     const CSSSelector* cs = this;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list