diff -r 000000000000 -r 6474c204b198 intl/uconv/ucvcn/nsGBKToUnicode.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/intl/uconv/ucvcn/nsGBKToUnicode.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,68 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+#ifndef nsGBK2312ToUnicode_h___
+#define nsGBK2312ToUnicode_h___
+
+#include "nsCOMPtr.h"
+#include "nsIUnicodeDecoder.h"
+#include "nsUCSupport.h"
+#include "nsGBKConvUtil.h"
+
+//----------------------------------------------------------------------
+// Class nsGBKToUnicode [declaration]
+
+/**
+ * A character set converter from GBK to Unicode.
+ * 
+ *
+ * @created         07/Sept/1999
+ * @author  Yueheng Xu, Yueheng.Xu@intel.com
+ */
+class nsGBKToUnicode : public nsBufferDecoderSupport
+{
+public:
+		  
+  /**
+   * Class constructor.
+   */
+  nsGBKToUnicode() : nsBufferDecoderSupport(1)
+  {
+    mExtensionDecoder = nullptr;
+    m4BytesDecoder = nullptr;
+  }
+
+protected:
+
+  //--------------------------------------------------------------------
+  // Subclassing of nsDecoderSupport class [declaration]
+  NS_IMETHOD ConvertNoBuff(const char* aSrc, int32_t * aSrcLength, char16_t *aDest, int32_t * aDestLength);
+
+protected:
+  nsGBKConvUtil mUtil;
+  nsCOMPtr<nsIUnicodeDecoder> mExtensionDecoder;
+  nsCOMPtr<nsIUnicodeDecoder> m4BytesDecoder;
+
+  virtual void CreateExtensionDecoder();
+  virtual void Create4BytesDecoder();
+  bool TryExtensionDecoder(const char* aSrc, char16_t* aDest);
+  bool Try4BytesDecoder(const char* aSrc, char16_t* aDest);
+  virtual bool DecodeToSurrogate(const char* aSrc, char16_t* aDest);
+
+};
+
+
+class nsGB18030ToUnicode : public nsGBKToUnicode
+{
+public:
+  nsGB18030ToUnicode() {}
+  virtual ~nsGB18030ToUnicode() {}
+protected:
+  virtual void CreateExtensionDecoder();
+  virtual void Create4BytesDecoder();
+  virtual bool DecodeToSurrogate(const char* aSrc, char16_t* aDest);
+};
+
+#endif /* nsGBK2312ToUnicode_h___ */
+