Title: [103124] trunk/Source/WebKit/chromium
- Revision
- 103124
- Author
- jam...@google.com
- Date
- 2011-12-16 16:01:15 -0800 (Fri, 16 Dec 2011)
Log Message
[chromium] Remove WebCString's dependency on WebCore
https://bugs.webkit.org/show_bug.cgi?id=74761
Reviewed by Darin Fisher.
Remove WebCString::fromUTF16(), which are never called, and implement WebCString::utf16() using WTF instead of
WebCore/platform/text/TextEncoding.
* public/platform/WebCString.h:
* src/WebCString.cpp:
(WebKit::WebCString::utf16):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (103123 => 103124)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-12-16 23:59:01 UTC (rev 103123)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-12-17 00:01:15 UTC (rev 103124)
@@ -1,3 +1,17 @@
+2011-12-16 James Robinson <jam...@chromium.org>
+
+ [chromium] Remove WebCString's dependency on WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=74761
+
+ Reviewed by Darin Fisher.
+
+ Remove WebCString::fromUTF16(), which are never called, and implement WebCString::utf16() using WTF instead of
+ WebCore/platform/text/TextEncoding.
+
+ * public/platform/WebCString.h:
+ * src/WebCString.cpp:
+ (WebKit::WebCString::utf16):
+
2011-12-16 Ryosuke Niwa <rn...@webkit.org>
Rename registerCommandFor(Undo|Redo) to register(Undo|Redo)Step
Modified: trunk/Source/WebKit/chromium/public/platform/WebCString.h (103123 => 103124)
--- trunk/Source/WebKit/chromium/public/platform/WebCString.h 2011-12-16 23:59:01 UTC (rev 103123)
+++ trunk/Source/WebKit/chromium/public/platform/WebCString.h 2011-12-17 00:01:15 UTC (rev 103124)
@@ -89,9 +89,6 @@
WEBKIT_EXPORT WebString utf16() const;
- WEBKIT_EXPORT static WebCString fromUTF16(const WebUChar* data, size_t length);
- WEBKIT_EXPORT static WebCString fromUTF16(const WebUChar* data);
-
#if WEBKIT_IMPLEMENTATION
WebCString(const WTF::CString&);
WebCString& operator=(const WTF::CString&);
@@ -113,12 +110,6 @@
size_t len = length();
return len ? std::string(data(), len) : std::string();
}
-
- template <class UTF16String>
- static WebCString fromUTF16(const UTF16String& s)
- {
- return fromUTF16(s.data(), s.length());
- }
#endif
private:
Modified: trunk/Source/WebKit/chromium/src/WebCString.cpp (103123 => 103124)
--- trunk/Source/WebKit/chromium/src/WebCString.cpp 2011-12-16 23:59:01 UTC (rev 103123)
+++ trunk/Source/WebKit/chromium/src/WebCString.cpp 2011-12-17 00:01:15 UTC (rev 103124)
@@ -31,7 +31,6 @@
#include "config.h"
#include "platform/WebCString.h"
-#include "TextEncoding.h"
#include "platform/WebString.h"
#include <wtf/text/CString.h>
@@ -91,23 +90,9 @@
WebString WebCString::utf16() const
{
- return WebCore::UTF8Encoding().decode(data(), length());
+ return WebString::fromUTF8(data(), length());
}
-WebCString WebCString::fromUTF16(const WebUChar* data, size_t length)
-{
- return WebCore::UTF8Encoding().encode(
- data, length, WebCore::QuestionMarksForUnencodables);
-}
-
-WebCString WebCString::fromUTF16(const WebUChar* data)
-{
- size_t len = 0;
- while (data[len] != WebUChar(0))
- len++;
- return fromUTF16(data, len);
-}
-
WebCString::WebCString(const WTF::CString& s)
: m_private(static_cast<WebCStringPrivate*>(s.buffer()))
{
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
