Changeset 46566 in webkit

Timestamp:

Jul 29, 2009 5:08:34 PM (15 years ago)

Author:

staikos@webkit.org

Message:

2009-07-29 Yong Li <​yong.li@torchmobile.com>

Reviewed by George Staikos.

WINCE PORT: changes to platform/text files
​https://bugs.webkit.org/show_bug.cgi?id=27715

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/text/String.cpp (modified) (2 diffs)
• platform/text/TextEncoding.cpp (modified) (2 diffs)
• platform/text/TextEncodingRegistry.cpp (modified) (4 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-07-29  Yong Li  <yong.li@torchmobile.com>
+
+        Reviewed by George Staikos.
+
+        WINCE PORT: changes to platform/text files
+        https://bugs.webkit.org/show_bug.cgi?id=27715
+
+        * platform/text/String.cpp:
+        (WebCore::String::format):
+        * platform/text/TextEncoding.cpp:
+        (WebCore::TextEncoding::encode):
+        * platform/text/TextEncodingRegistry.cpp:
+        (WebCore::buildBaseTextCodecMaps):
+        (WebCore::extendTextCodecMaps):
+
 2009-07-29  Yong Li  <yong.li@torchmobile.com>
 

trunk/WebCore/platform/text/String.cpp

@@ -2 +2 @@
  * (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2007-2009 Torch Mobile, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -354 +355 @@
 
     return buffer;
+
+#elif PLATFORM(WINCE)
+    va_list args;
+    va_start(args, format);
+
+    Vector<char, 256> buffer;
+
+    int bufferSize = 256;
+    buffer.resize(bufferSize);
+    for (;;) {
+        int written = vsnprintf(buffer.data(), bufferSize, format, args);
+        va_end(args);
+
+        if (written == 0)
+            return String("");
+        if (written > 0)
+            return StringImpl::create(buffer.data(), written);
+        
+        bufferSize <<= 1;
+        buffer.resize(bufferSize);
+        va_start(args, format);
+    }
+
 #else
     va_list args;

trunk/WebCore/platform/text/TextEncoding.cpp

@@ -2 +2 @@
  * Copyright (C) 2004, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Alexey Proskuryakov <ap@nypop.com>
+ * Copyright (C) 2007-2009 Torch Mobile, Inc.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -114 +115 @@
     str = str.normalized(QString::NormalizationForm_C);
     return newTextCodec(*this)->encode(reinterpret_cast<const UChar *>(str.utf16()), str.length(), handling);
+#elif PLATFORM(WINCE)
+    // normalization will be done by Windows CE API
+    OwnPtr<TextCodec> textCodec = newTextCodec(*this);
+    return textCodec.get() ? textCodec->encode(characters, length, handling) : CString();
 #endif
 }

trunk/WebCore/platform/text/TextEncodingRegistry.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
+ * Copyright (C) 2007-2009 Torch Mobile, Inc.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -48 +49 @@
 #include "qt/TextCodecQt.h"
 #endif
+#if PLATFORM(WINCE)
+#include "TextCodecWince.h"
+#endif
 
 using namespace WTF;
@@ -190 +194 @@
     TextCodecICU::registerBaseCodecs(addToTextCodecMap);
 #endif
+
+#if PLATFORM(WINCE)
+    TextCodecWince::registerBaseEncodingNames(addToTextEncodingNameMap);
+    TextCodecWince::registerBaseCodecs(addToTextCodecMap);
+#endif
 }
 
@@ -207 +216 @@
     TextCodecMac::registerEncodingNames(addToTextEncodingNameMap);
     TextCodecMac::registerCodecs(addToTextCodecMap);
+#endif
+
+#if PLATFORM(WINCE)
+    TextCodecWince::registerExtendedEncodingNames(addToTextEncodingNameMap);
+    TextCodecWince::registerExtendedCodecs(addToTextCodecMap);
 #endif
 }