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

[rniwa at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 87558bfc433cf2f1e2f7e6796f6ab1d4ec840209
Author: rniwa at webkit.org <rniwa at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 22 05:56:52 2010 +0000

    2010-09-21  Ryosuke Niwa  <rniwa at webkit.org>
    
            Reviewed by Kent Tamura.
    
            Each EntityMaskIn* needs explanation
            https://bugs.webkit.org/show_bug.cgi?id=44833
    
            Added a description as to why we escape nbsp when serializing HTML documents but not when serializing XML documents.
    
            * editing/markup.cpp:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68016 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9446503..4adabd6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,17 @@
 
         Reviewed by Kent Tamura.
 
+        Each EntityMaskIn* needs explanation
+        https://bugs.webkit.org/show_bug.cgi?id=44833
+
+        Added a description as to why we escape nbsp when serializing HTML documents but not when serializing XML documents.
+
+        * editing/markup.cpp:
+
+2010-09-21  Ryosuke Niwa  <rniwa at webkit.org>
+
+        Reviewed by Kent Tamura.
+
         cleanup: removeInlineStyleFromElement and extractInlineStyleToPushDown should be merged
         https://bugs.webkit.org/show_bug.cgi?id=46205
 
diff --git a/WebCore/editing/markup.cpp b/WebCore/editing/markup.cpp
index a279808..82499bf 100644
--- a/WebCore/editing/markup.cpp
+++ b/WebCore/editing/markup.cpp
@@ -93,14 +93,15 @@ private:
 };
     
 enum EntityMask {
-    EntityNone = 0x0000,
     EntityAmp = 0x0001,
     EntityLt = 0x0002,
     EntityGt = 0x0004,
     EntityQuot = 0x0008,
     EntityNbsp = 0x0010,
 
-    EntityMaskInCDATA = EntityNone,
+    // Non-breaking space needs to be escaped in innerHTML for compatibility reason. See http://trac.webkit.org/changeset/32879
+    // However, we cannot do this in a XML document because it does not have the entity reference defined (See the bug 19215).
+    EntityMaskInCDATA = 0,
     EntityMaskInPCDATA = EntityAmp | EntityLt | EntityGt,
     EntityMaskInHTMLPCDATA = EntityMaskInPCDATA | EntityNbsp,
     EntityMaskInAttributeValue = EntityAmp | EntityLt | EntityGt | EntityQuot,

-- 
WebKit Debian packaging