| Index: Source/wtf/text/TextCodecUTF8.cpp
|
| diff --git a/Source/wtf/text/TextCodecUTF8.cpp b/Source/wtf/text/TextCodecUTF8.cpp
|
| index 6a4c835ce99e344b89970b96c7c1835a723720c1..ce595b34619709488d0e20aa31b955afaeeb08f3 100644
|
| --- a/Source/wtf/text/TextCodecUTF8.cpp
|
| +++ b/Source/wtf/text/TextCodecUTF8.cpp
|
| @@ -20,7 +20,7 @@
|
| * 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.
|
| + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
|
|
| #include "config.h"
|
| @@ -260,7 +260,7 @@ bool TextCodecUTF8::handlePartialSequence<UChar>(UChar*& destination, const uint
|
|
|
| return false;
|
| }
|
| -
|
| +
|
| String TextCodecUTF8::decode(const char* bytes, size_t length, bool flush, bool stopOnError, bool& sawError)
|
| {
|
| // Each input byte might turn into a character.
|
| @@ -329,7 +329,7 @@ String TextCodecUTF8::decode(const char* bytes, size_t length, bool flush, bool
|
| sawError = true;
|
| if (stopOnError)
|
| break;
|
| -
|
| +
|
| goto upConvertTo16Bit;
|
| }
|
| if (character > 0xff)
|
| @@ -366,7 +366,7 @@ upConvertTo16Bit:
|
| if (m_partialSequenceSize)
|
| break;
|
| }
|
| -
|
| +
|
| while (source < end) {
|
| if (isASCII(*source)) {
|
| // Fast path for ASCII. Most UTF-8 text will be ASCII.
|
| @@ -415,9 +415,9 @@ upConvertTo16Bit:
|
| destination16 = appendCharacter(destination16, character);
|
| }
|
| } while (flush && m_partialSequenceSize);
|
| -
|
| +
|
| buffer16.shrink(destination16 - buffer16.characters());
|
| -
|
| +
|
| return String::adopt(buffer16);
|
| }
|
|
|
|
|