From bec39347bb3bb5bf1187ccaf471d26247f28b585 Mon Sep 17 00:00:00 2001
From: Kristian Monsen <kristianm@google.com>
Date: Thu, 30 Sep 2010 15:42:16 +0100
Subject: Merge WebKit at r68651 : Initial merge by git.

Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12
---
 WebCore/editing/markup.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'WebCore/editing/markup.cpp')

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,
-- 
cgit v1.1