From 1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353 Mon Sep 17 00:00:00 2001
From: The Android Open Source Project <initial-contribution@android.com>
Date: Wed, 17 Dec 2008 18:05:15 -0800
Subject: Code drop from //branches/cupcake/...@124589

---
 WebCore/platform/text/TextDecoder.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'WebCore/platform/text/TextDecoder.h')

diff --git a/WebCore/platform/text/TextDecoder.h b/WebCore/platform/text/TextDecoder.h
index 3892032..171cb59 100644
--- a/WebCore/platform/text/TextDecoder.h
+++ b/WebCore/platform/text/TextDecoder.h
@@ -41,15 +41,15 @@ namespace WebCore {
         void reset(const TextEncoding&);
         const TextEncoding& encoding() const { return m_encoding; };
 
-        String decode(const char* data, size_t length, bool flush = false)
+        String decode(const char* data, size_t length, bool flush, bool stopOnError, bool& sawError)
         {
             if (!m_checkedForBOM)
-                return checkForBOM(data, length, flush);
-            return m_codec->decode(data, length, flush);
+                return checkForBOM(data, length, flush, stopOnError, sawError);
+            return m_codec->decode(data, length, flush, stopOnError, sawError);
         }
 
     private:
-        String checkForBOM(const char*, size_t length, bool flush);
+        String checkForBOM(const char*, size_t length, bool flush, bool stopOnError, bool& sawError);
 
         TextEncoding m_encoding;
         OwnPtr<TextCodec> m_codec;
-- 
cgit v1.1