Commit 28fab5ba authored by ossy@webkit.org's avatar ossy@webkit.org
Browse files

Unreviewed, rolling out r132736.

http://trac.webkit.org/changeset/132736
https://bugs.webkit.org/show_bug.cgi?id=100652

It broke all plugin related tests on GTK and on Qt (Requested
by Ossy on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2012-10-29

* wtf/text/WTFString.cpp:
(WTF::String::fromUTF8):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@132784 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 4a676a6c
2012-10-29 Sheriff Bot <webkit.review.bot@gmail.com>
Unreviewed, rolling out r132736.
http://trac.webkit.org/changeset/132736
https://bugs.webkit.org/show_bug.cgi?id=100652
It broke all plugin related tests on GTK and on Qt (Requested
by Ossy on #webkit).
* wtf/text/WTFString.cpp:
(WTF::String::fromUTF8):
2012-10-27 Michael Saboff <msaboff@apple.com>
Try to create AtomicString as 8 bit where possible
......
......@@ -862,13 +862,9 @@ String String::fromUTF8(const LChar* stringStart, size_t length)
// Try converting into the buffer.
const char* stringCurrent = reinterpret_cast<const char*>(stringStart);
bool isAllASCII;
if (convertUTF8ToUTF16(&stringCurrent, reinterpret_cast<const char *>(stringStart + length), &buffer, bufferEnd, &isAllASCII) != conversionOK)
if (convertUTF8ToUTF16(&stringCurrent, reinterpret_cast<const char *>(stringStart + length), &buffer, bufferEnd) != conversionOK)
return String();
if (isAllASCII)
return String(stringStart, length);
// stringBuffer is full (the input must have been all ascii) so just return it!
if (buffer == bufferEnd)
return stringBuffer;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment