Changeset 79842 in webkit

Timestamp:

Feb 27, 2011 10:53:41 PM (13 years ago)

Author:

Patrick Gansterer

Message:

2011-02-27 Patrick Gansterer <Patrick Gansterer>

Reviewed by Darin Adler.

Remove registerBaseEncodingNames and registerBaseCodecs from TextCodecWinCE
​https://bugs.webkit.org/show_bug.cgi?id=55317

This functions are obsolete, since r78499 added TextCodecUTF8.
Also remove the "fast path" for UTF-8 data, because we now have a separate TextCodec.

• platform/text/TextEncodingRegistry.cpp: (WebCore::buildBaseTextCodecMaps):
• platform/text/wince/TextCodecWinCE.cpp:
• platform/text/wince/TextCodecWinCE.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/text/TextEncodingRegistry.cpp (modified) (1 diff)
• platform/text/wince/TextCodecWinCE.cpp (modified) (10 diffs)
• platform/text/wince/TextCodecWinCE.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-02-27  Patrick Gansterer  <paroga@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        Remove registerBaseEncodingNames and registerBaseCodecs from TextCodecWinCE
+        https://bugs.webkit.org/show_bug.cgi?id=55317
+
+        This functions are obsolete, since r78499 added TextCodecUTF8.
+        Also remove the "fast path" for UTF-8 data, because we now have a separate TextCodec.
+
+        * platform/text/TextEncodingRegistry.cpp:
+        (WebCore::buildBaseTextCodecMaps):
+        * platform/text/wince/TextCodecWinCE.cpp:
+        * platform/text/wince/TextCodecWinCE.h:
+
 2011-02-27  Benjamin Poulain  <benjamin.poulain@nokia.com>
 

trunk/Source/WebCore/platform/text/TextEncodingRegistry.cpp

@@ -240 +240 @@
     TextCodecGtk::registerBaseCodecs(addToTextCodecMap);
 #endif
-
-#if OS(WINCE) && !PLATFORM(QT)
-    // FIXME: This is not needed. The code above covers all the base codecs.
-    TextCodecWinCE::registerBaseEncodingNames(addToTextEncodingNameMap);
-    TextCodecWinCE::registerBaseCodecs(addToTextCodecMap);
-#endif
 }
 

trunk/Source/WebCore/platform/text/wince/TextCodecWinCE.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2007-2009 Torch Mobile, Inc. All rights reserved.
- * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
+ * Copyright (C) 2010-2011 Patrick Gansterer <paroga@paroga.com>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36 +36 @@
 #include <wtf/text/StringConcatenate.h>
 #include <wtf/text/StringHash.h>
-#include <wtf/unicode/UTF8.h>
 
 namespace WebCore {
@@ -123 +122 @@
 static UINT getCodePage(const char* name)
 {
-    if (!strcmp(name, "UTF-8"))
-        return CP_UTF8;
-
     // Explicitly use a "const" reference to fix the silly VS build error
     // saying "==" is not found for const_iterator and iterator
@@ -145 +141 @@
 TextCodecWinCE::~TextCodecWinCE()
 {
-}
-
-void TextCodecWinCE::registerBaseEncodingNames(EncodingNameRegistrar registrar)
-{
-    registrar("UTF-8", "UTF-8");
-}
-
-void TextCodecWinCE::registerBaseCodecs(TextCodecRegistrar registrar)
-{
-    registrar("UTF-8", newTextCodecWinCE, 0);
 }
 
@@ -182 +168 @@
 static DWORD getCodePageFlags(UINT codePage)
 {
-    if (codePage == CP_UTF8)
-        return MB_ERR_INVALID_CHARS;
-
     if (codePage == 42) // Symbol
         return 0;
@@ -214 +197 @@
 }
 
-static void decode(Vector<UChar, 8192>& result, UINT codePage, const char* bytes, size_t length, size_t* left, bool canBeFirstTime, bool& sawInvalidChar)
+static void decodeInternal(Vector<UChar, 8192>& result, UINT codePage, const char* bytes, size_t length, size_t* left)
 {
     *left = length;
@@ -222 +205 @@
     DWORD flags = getCodePageFlags(codePage);
 
-    if (codePage == CP_UTF8) {
-        if (canBeFirstTime) {
-            // Handle BOM.
-            if (length > 3) {
-                if (bytes[0] == (char)0xEF && bytes[1] == (char)0xBB && bytes[2] == (char)0xBF) {
-                    // BOM found!
-                    length -= 3;
-                    bytes += 3;
-                    *left = length;
-                }
-            } else if (bytes[0] == 0xEF && (length < 2 || bytes[1] == (char)0xBB) && (length < 3 || bytes[2] == (char)0xBF)) {
-                if (length == 3)
-                    *left = 0;
-                return;
+    int testLength = length;
+    int untestedLength = length;
+    for (;;) {
+        int resultLength = MultiByteToWideChar(codePage, flags, bytes, testLength, 0, 0);
+
+        if (resultLength > 0) {
+            int oldSize = result.size();
+            result.resize(oldSize + resultLength);
+
+            MultiByteToWideChar(codePage, flags, bytes, testLength, result.data() + oldSize, resultLength);
+
+            if (testLength == untestedLength) {
+                *left = length - testLength;
+                break;
+            }
+            untestedLength -= testLength;
+            length -= testLength;
+            bytes += testLength;
+        } else {
+            untestedLength = testLength - 1;
+            if (!untestedLength) {
+                *left = length;
+                break;
             }
         }
-
-        // Process ASCII characters at beginning.
-        const char* firstNonAsciiChar = findFirstNonAsciiCharacter(bytes, length);
-        int numAsciiCharacters = firstNonAsciiChar - bytes;
-        if (numAsciiCharacters) {
-            result.append(bytes, numAsciiCharacters);
-            length -= numAsciiCharacters;
-            if (!length) {
-                *left = 0;
-                return;
-            }
-            bytes = firstNonAsciiChar;
-        }
-
-        int oldSize = result.size();
-        result.resize(oldSize + length);
-        UChar* resultStart = result.data() + oldSize;
-        const char* sourceStart = bytes;
-        const char* const sourceEnd = bytes + length;
-        for (;;) {
-            using namespace WTF::Unicode;
-            ConversionResult convRes = convertUTF8ToUTF16(&sourceStart
-                , sourceEnd
-                , &resultStart
-                , result.data() + result.size()
-                , true);
-
-            // FIXME: is it possible?
-            if (convRes == targetExhausted && sourceStart < sourceEnd) {
-                oldSize = result.size();
-                result.resize(oldSize + 256);
-                resultStart = result.data() + oldSize;
-                continue;
-            }
-
-            if (convRes != conversionOK)
-                sawInvalidChar = true;
-
-            break;
-        }
-
-        *left = sourceEnd - sourceStart;
-        result.resize(resultStart - result.data());
-    } else {
-        int testLength = length;
-        int untestedLength = length;
-        for (;;) {
-            int resultLength = MultiByteToWideChar(codePage, flags, bytes, testLength, 0, 0);
-
-            if (resultLength > 0) {
-                int oldSize = result.size();
-                result.resize(oldSize + resultLength);
-
-                MultiByteToWideChar(codePage, flags, bytes, testLength, result.data() + oldSize, resultLength);
-
-                if (testLength == untestedLength) {
-                    *left = length - testLength;
-                    break;
-                }
-                untestedLength -= testLength;
-                length -= testLength;
-                bytes += testLength;
-            } else {
-                untestedLength = testLength - 1;
-                if (!untestedLength) {
-                    *left = length;
-                    break;
-                }
-            }
-            testLength = (untestedLength + 1) / 2;
-        }
+        testLength = (untestedLength + 1) / 2;
     }
 }
@@ -323 +245 @@
     Vector<UChar, 8192> result;
     for (;;) {
-        bool sawInvalidChar = false;
-        WebCore::decode(result, m_codePage, bytes, length, &left, m_decodeBuffer.isEmpty(), sawInvalidChar);
+        decodeInternal(result, m_codePage, bytes, length, &left);
         if (!left)
             break;
 
-        if (!sawInvalidChar && !flush && left < 16)
+        if (!flush && left < 16)
             break;
 
@@ -360 +281 @@
         return CString();
 
-    DWORD flags = m_codePage == CP_UTF8 ? 0 : WC_COMPOSITECHECK;
-
-    int resultLength = WideCharToMultiByte(m_codePage, flags, characters, length, 0, 0, 0, 0);
+    int resultLength = WideCharToMultiByte(m_codePage, WC_COMPOSITECHECK, characters, length, 0, 0, 0, 0);
 
     // FIXME: We need to implement UnencodableHandling: QuestionMarksForUnencodables, EntitiesForUnencodables, and URLEncodedEntitiesForUnencodables.
@@ -372 +291 @@
     CString result = CString::newUninitialized(resultLength, characterBuffer);
 
-    WideCharToMultiByte(m_codePage, flags, characters, length, characterBuffer, resultLength, 0, 0);
+    WideCharToMultiByte(m_codePage, WC_COMPOSITECHECK, characters, length, characterBuffer, resultLength, 0, 0);
 
     return result;

trunk/Source/WebCore/platform/text/wince/TextCodecWinCE.h

@@ -40 +40 @@
 class TextCodecWinCE : public TextCodec {
 public:
-    static void registerBaseEncodingNames(EncodingNameRegistrar);
-    static void registerBaseCodecs(TextCodecRegistrar);
-
     static void registerExtendedEncodingNames(EncodingNameRegistrar);
     static void registerExtendedCodecs(TextCodecRegistrar);