[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
paroga at webkit.org
paroga at webkit.org
Wed Dec 22 17:58:06 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit a71aa04b0e9f65f186db6baeca141fd89eb1f25f
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Dec 3 18:08:13 2010 +0000
2010-12-03 Patrick Gansterer <paroga at webkit.org>
Reviewed by Andreas Kling.
Move StringWx.cpp into wtf directory
https://bugs.webkit.org/show_bug.cgi?id=50060
* wtf/wx/StringWx.cpp: Renamed from WebCore/platform/text/wx/StringWx.cpp.
(WTF::String::String):
2010-12-03 Patrick Gansterer <paroga at webkit.org>
Reviewed by Andreas Kling.
Move StringWx.cpp into wtf directory
https://bugs.webkit.org/show_bug.cgi?id=50060
* WebCore.gypi:
* platform/text/wx/StringWx.cpp: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73272 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 295c64a..7712a68 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -2,6 +2,16 @@
Reviewed by Andreas Kling.
+ Move StringWx.cpp into wtf directory
+ https://bugs.webkit.org/show_bug.cgi?id=50060
+
+ * wtf/wx/StringWx.cpp: Renamed from WebCore/platform/text/wx/StringWx.cpp.
+ (WTF::String::String):
+
+2010-12-03 Patrick Gansterer <paroga at webkit.org>
+
+ Reviewed by Andreas Kling.
+
Move StringBrew.cpp into wtf directory
https://bugs.webkit.org/show_bug.cgi?id=50058
diff --git a/JavaScriptCore/wtf/wx/StringWx.cpp b/JavaScriptCore/wtf/wx/StringWx.cpp
new file mode 100644
index 0000000..665587d
--- /dev/null
+++ b/JavaScriptCore/wtf/wx/StringWx.cpp
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2007 Vaclav Slavik, Kevin Ollivier <kevino at theolliviers.com>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "PlatformString.h"
+
+#include <unicode/ustring.h>
+#include <wtf/text/CString.h>
+#include <wx/defs.h>
+#include <wx/string.h>
+
+namespace WTF {
+
+// String conversions
+String::String(const wxString& wxstr)
+{
+#if !wxUSE_UNICODE
+ #error "This code only works in Unicode build of wxWidgets"
+#endif
+
+ // ICU's UChar is 16bit wide, UTF-16, and the code below counts on it, so
+ // it would break if the definition changed:
+ wxCOMPILE_TIME_ASSERT(sizeof(UChar) == 2, UCharSizeMustBe16Bit);
+
+#if SIZEOF_WCHAR_T == 2 // wchar_t==UChar
+
+ const UChar* str = wxstr.wc_str();
+ const size_t len = wxstr.length();
+
+#else // SIZEOF_WCHAR_T == 4
+
+ // NB: we can't simply use wxstr.mb_str(wxMBConvUTF16()) here because
+ // the number of characters in UTF-16 encoding of the string may differ
+ // from the number of UTF-32 values and we can't get the length from
+ // returned buffer:
+
+#if defined(wxUSE_UNICODE_UTF8) && wxUSE_UNICODE_UTF8
+ // in wx3's UTF8 mode, wc_str() returns a buffer, not raw pointer
+ wxWCharBuffer widestr(wxstr.wc_str());
+#else
+ const wxChar *widestr = wxstr.wc_str();
+#endif
+ const size_t widelen = wxstr.length();
+
+ // allocate buffer for the UTF-16 string:
+ wxMBConvUTF16 conv;
+ const size_t utf16bufLen = conv.FromWChar(NULL, 0, widestr, widelen);
+ wxCharBuffer utf16buf(utf16bufLen);
+
+ // and convert wxString to UTF-16 (=UChar*):
+ const UChar* str = (const UChar*)utf16buf.data();
+ size_t len = conv.FromWChar(utf16buf.data(), utf16bufLen, widestr, widelen) / 2;
+
+#endif // SIZEOF_WCHAR_T == 4
+
+ // conversion to UTF-16 or getting internal buffer isn't supposed to fail:
+ wxASSERT_MSG(str != NULL, _T("failed string conversion?"));
+
+ m_impl = StringImpl::create(str, len);
+}
+
+String::operator wxString() const
+{
+ return wxString(utf8().data(), wxConvUTF8);
+}
+
+} // namespace WebCore
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d792d66..1cb7365 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-03 Patrick Gansterer <paroga at webkit.org>
+
+ Reviewed by Andreas Kling.
+
+ Move StringWx.cpp into wtf directory
+ https://bugs.webkit.org/show_bug.cgi?id=50060
+
+ * WebCore.gypi:
+ * platform/text/wx/StringWx.cpp: Removed.
+
2010-12-03 Dimitri Glazkov <dglazkov at chromium.org>
Reviewed by Darin Adler.
diff --git a/WebCore/WebCore.gypi b/WebCore/WebCore.gypi
index 8773582..f91d903 100644
--- a/WebCore/WebCore.gypi
+++ b/WebCore/WebCore.gypi
@@ -3197,7 +3197,6 @@
'platform/text/transcoder/FontTranscoder.cpp',
'platform/text/transcoder/FontTranscoder.h',
'platform/text/win/TextBreakIteratorInternalICUWin.cpp',
- 'platform/text/wx/StringWx.cpp',
'platform/text/AtomicStringImpl.h',
'platform/text/Base64.cpp',
'platform/text/Base64.h',
diff --git a/WebCore/platform/text/wx/StringWx.cpp b/WebCore/platform/text/wx/StringWx.cpp
deleted file mode 100644
index 7302edc..0000000
--- a/WebCore/platform/text/wx/StringWx.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (C) 2007 Vaclav Slavik, Kevin Ollivier <kevino at theolliviers.com>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "PlatformString.h"
-
-#include "unicode/ustring.h"
-#include <wtf/text/CString.h>
-
-#include <wx/defs.h>
-#include <wx/string.h>
-
-namespace WTF {
-
-// String conversions
-String::String(const wxString& wxstr)
-{
-#if !wxUSE_UNICODE
- #error "This code only works in Unicode build of wxWidgets"
-#endif
-
- // ICU's UChar is 16bit wide, UTF-16, and the code below counts on it, so
- // it would break if the definition changed:
- wxCOMPILE_TIME_ASSERT(sizeof(UChar) == 2, UCharSizeMustBe16Bit);
-
-#if SIZEOF_WCHAR_T == 2 // wchar_t==UChar
-
- const UChar* str = wxstr.wc_str();
- const size_t len = wxstr.length();
-
-#else // SIZEOF_WCHAR_T == 4
-
- // NB: we can't simply use wxstr.mb_str(wxMBConvUTF16()) here because
- // the number of characters in UTF-16 encoding of the string may differ
- // from the number of UTF-32 values and we can't get the length from
- // returned buffer:
-
-#if defined(wxUSE_UNICODE_UTF8) && wxUSE_UNICODE_UTF8
- // in wx3's UTF8 mode, wc_str() returns a buffer, not raw pointer
- wxWCharBuffer widestr(wxstr.wc_str());
-#else
- const wxChar *widestr = wxstr.wc_str();
-#endif
- const size_t widelen = wxstr.length();
-
- // allocate buffer for the UTF-16 string:
- wxMBConvUTF16 conv;
- const size_t utf16bufLen = conv.FromWChar(NULL, 0, widestr, widelen);
- wxCharBuffer utf16buf(utf16bufLen);
-
- // and convert wxString to UTF-16 (=UChar*):
- const UChar* str = (const UChar*)utf16buf.data();
- size_t len = conv.FromWChar(utf16buf.data(), utf16bufLen, widestr, widelen) / 2;
-
-#endif // SIZEOF_WCHAR_T == 4
-
- // conversion to UTF-16 or getting internal buffer isn't supposed to fail:
- wxASSERT_MSG(str != NULL, _T("failed string conversion?"));
-
- m_impl = StringImpl::create(str, len);
-}
-
-String::operator wxString() const
-{
- return wxString(utf8().data(), wxConvUTF8);
-}
-
-}
-
-// vim: ts=4 sw=4 et
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list