Various changes to JBig2 cache:

core/src/fxcodec/jbig2/JBig2_BitStream.h

Index: core/src/fxcodec/jbig2/JBig2_BitStream.h
diff --git a/core/src/fxcodec/jbig2/JBig2_BitStream.h b/core/src/fxcodec/jbig2/JBig2_BitStream.h
index 9a3d8b0a18d7e3f8ee3698f334fc2cf145d7db60..1a0ab6413c1c65b11461740bb6d32bde076616c8 100644
--- a/core/src/fxcodec/jbig2/JBig2_BitStream.h
+++ b/core/src/fxcodec/jbig2/JBig2_BitStream.h
@@ -7,11 +7,12 @@
 #ifndef CORE_SRC_FXCODEC_JBIG2_JBIG2_BITSTREAM_H_
 #define CORE_SRC_FXCODEC_JBIG2_JBIG2_BITSTREAM_H_
 
+#include "../../../include/fpdfapi/fpdf_objects.h"

[Lei Zhang, 2015/10/08 03:22:44]

ditto, forward declare instead.

[David Lattimore, 2015/10/08 03:44:39]

Done.

 #include "../../../include/fxcrt/fx_basic.h"
 
 class CJBig2_BitStream {
  public:
-  CJBig2_BitStream(const uint8_t* pBuffer, FX_DWORD dwLength);
+  explicit CJBig2_BitStream(CPDF_StreamAcc* pSrcStream);
   ~CJBig2_BitStream();
 
   // TODO(thestig): readFoo() should return bool.
@@ -37,6 +38,8 @@ class CJBig2_BitStream {
   void offset(FX_DWORD dwOffset);
   FX_DWORD getByteLeft() const;
 
+  FX_DWORD getObjNum() const;

[Lei Zhang, 2015/10/08 03:22:44]

nit: this method looks lonely sitting by itself.

[David Lattimore, 2015/10/08 03:44:39]

Done.

+
  private:
   void AdvanceBit();
   bool IsInBound() const;
@@ -46,6 +49,7 @@ class CJBig2_BitStream {
   FX_DWORD m_dwLength;
   FX_DWORD m_dwByteIdx;
   FX_DWORD m_dwBitIdx;
+  const FX_DWORD m_dwObjNum;
 
   CJBig2_BitStream(const CJBig2_BitStream&) = delete;
   void operator=(const CJBig2_BitStream&) = delete;