1 files changed, 15 insertions, 58 deletions

diff --git a/WebKit/chromium/src/WebEntities.cpp b/WebKit/chromium/src/WebEntities.cpp
index b9143d9..4e37dde 100644
--- a/WebKit/chromium/src/WebEntities.cpp
+++ b/WebKit/chromium/src/WebEntities.cpp
@@ -31,69 +31,26 @@
 #include "config.h"
 #include "WebEntities.h"
 
-#include <string.h>
-
-#include "PlatformString.h"
-#include "StringBuilder.h"
-#include <wtf/HashMap.h>
-
 #include "WebString.h"
 
-using namespace WebCore;
-
-namespace {
-// Note that this file is also included by HTMLTokenizer.cpp so we are getting
-// two copies of the data in memory.  We can fix this by changing the script
-// that generated the array to create a static const that is its length, but
-// this is low priority since the data is less than 4K. We use anonymous
-// namespace to prevent name collisions.
-#include "HTMLEntityNames.c" // NOLINT
-}
+#include <string.h>
+#include <wtf/HashMap.h>
+#include <wtf/text/StringBuilder.h>
+#include <wtf/text/WTFString.h>
 
 namespace WebKit {
 
-void populateMap(WTF::HashMap<int, WebCore::String>& map,
-                 const Entity* entities,
-                 size_t entitiesCount,
-                 bool standardHTML)
-{
-    ASSERT(map.isEmpty());
-    const Entity* entity = &entities[0];
-    for (size_t i = 0; i < entitiesCount; i++, entity++) {
-        int code = entity->code;
-        String name = entity->name;
-        // For consistency, use the lowe case for entities that have both.
-        if (map.contains(code) && map.get(code) == name.lower())
-            continue;
-        // Don't register &percnt;, &nsup; and &supl;.
-        if (standardHTML && (code == '%' || code == 0x2285 || code == 0x00b9))
-            continue;
-        map.set(code, name);
-    }
-    if (standardHTML)
-        map.set(static_cast<int>(0x0027), String("#39"));
-}
-
-static const Entity xmlBuiltInEntityCodes[] = {
-    { "lt", 0x003c },
-    { "gt", 0x003e },
-    { "amp", 0x0026 },
-    { "apos", 0x0027 },
-    { "quot", 0x0022 }
-};
-
 WebEntities::WebEntities(bool xmlEntities)
 {
-    if (xmlEntities)
-        populateMap(m_entitiesMap,
-                    xmlBuiltInEntityCodes,
-                    sizeof(xmlBuiltInEntityCodes) / sizeof(Entity),
-                    false);
-    else
-        populateMap(m_entitiesMap,
-                    wordlist,
-                    sizeof(wordlist) / sizeof(Entity),
-                    true);
+    ASSERT(m_entitiesMap.isEmpty());
+    m_entitiesMap.set(0x003c, "lt");
+    m_entitiesMap.set(0x003e, "gt");
+    m_entitiesMap.set(0x0026, "amp");
+    m_entitiesMap.set(0x0027, "apos");
+    m_entitiesMap.set(0x0022, "quot");
+    // We add #39 for test-compatibility reason.
+    if (!xmlEntities)
+        m_entitiesMap.set(0x0027, String("#39"));
 }
 
 String WebEntities::entityNameByCode(int code) const
@@ -116,9 +73,9 @@ String WebEntities::convertEntitiesInString(const String& value) const
             // Append content before entity code.
             if (curPos > startPos)
                 result.append(String(startPos, curPos - startPos));
-            result.append("&");
+            result.append('&');
             result.append(m_entitiesMap.get(*curPos));
-            result.append(";");
+            result.append(';');
             startPos = ++curPos;
         } else
             curPos++;