Separate and update PDF_DIFF_TRACE_IN_PNG

experimental/PdfViewer/pdfparser/native/SkPdfNativeTokenizer.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkPdfConfig.h"
+#include "SkPdfDiffEncoder.h"
 #include "SkPdfNativeObject.h"
 #include "SkPdfNativeTokenizer.h"
 #include "SkPdfUtils.h"
 
 // TODO(edisonn): mac builder does not find the header ... but from headers is ok
 //#include "SkPdfStreamCommonDictionary_autogen.h"
 //#include "SkPdfImageDictionary_autogen.h"
 #include "SkPdfHeaders_autogen.h"
 
 
@@ skipping 914 matching lines @@
 bool SkPdfNativeTokenizer::readTokenCore(PdfToken* token) {
 #ifdef PDF_TRACE_READ_TOKEN
     static int read_op = 0;
 #endif
 
     token->fKeyword = NULL;
     token->fObject = NULL;
 
     fUncompressedStream = skipPdfWhiteSpaces(fUncompressedStream, fUncompressedStreamEnd);
     if (fUncompressedStream >= fUncompressedStreamEnd) {
+        fEmpty = true;
         return false;
     }
 
     SkPdfNativeObject obj;
     fUncompressedStream = nextObject(fUncompressedStream, fUncompressedStreamEnd, &obj, fAllocator, fDoc);
     //  PUT_TRACK_STREAM_ARGS_EXPL2(fStreamId, fUncompressedStreamStart)
 
     // If it is a keyword, we will only get the pointer of the string.
     if (obj.type() == SkPdfNativeObject::kKeyword_PdfObjectType) {
         token->fKeyword = obj.c_str();
@@ skipping 25 matching lines @@
     SkASSERT(!fHasPutBack);
     fHasPutBack = true;
     fPutBack = token;
 #ifdef PDF_TRACE_READ_TOKEN
     printf("PUT_BACK %s %s\n", token.fType == kKeyword_TokenType ? "Keyword" : "Object",
            token.fKeyword ? SkString(token.fKeyword, token.fKeywordLength).c_str() :
                             token.fObject->toString().c_str());
 #endif
 }
 
-bool SkPdfNativeTokenizer::readToken(PdfToken* token) {
+bool SkPdfNativeTokenizer::readToken(PdfToken* token, bool writeDiff) {
     if (fHasPutBack) {
         *token = fPutBack;
         fHasPutBack = false;
 #ifdef PDF_TRACE_READ_TOKEN
-    printf("READ_BACK %s %s\n", token->fType == kKeyword_TokenType ? "Keyword" : "Object",
-           token->fKeyword ? SkString(token->fKeyword, token->fKeywordLength).c_str() :
-                             token->fObject->toString().c_str());
+        printf("READ_BACK %s %s\n", token->fType == kKeyword_TokenType ? "Keyword" : "Object",
+               token->fKeyword ? SkString(token->fKeyword, token->fKeywordLength).c_str() :
+                                 token->fObject->toString().c_str());
 #endif
+        if (writeDiff) {
+            SkPdfDiffEncoder::WriteToFile(token);
+        }
         return true;
     }
 
     if (fEmpty) {
 #ifdef PDF_TRACE_READ_TOKEN
-    printf("EMPTY TOKENIZER\n");
+        printf("EMPTY TOKENIZER\n");
 #endif
         return false;
     }
 
-    return readTokenCore(token);
+    const bool result = readTokenCore(token);
+    if (result && writeDiff) {
+        SkPdfDiffEncoder::WriteToFile(token);
+    }
+    return result;
 }
 
 #define DECLARE_PDF_NAME(longName) SkPdfName longName((char*)#longName)
 
 // keys
 DECLARE_PDF_NAME(BitsPerComponent);
 DECLARE_PDF_NAME(ColorSpace);
 DECLARE_PDF_NAME(Decode);
 DECLARE_PDF_NAME(DecodeParms);
 DECLARE_PDF_NAME(Filter);
@@ skipping 89 matching lines @@
                                              fAllocator, fDoc);
             //  PUT_TRACK_STREAM_ARGS_EXPL2(fStreamId, fUncompressedStreamStart)s
             // TODO(edisonn): perf maybe we should not expand abBreviation like this
             inlineImage->set(inlineImageKeyAbbreviationExpand(key),
                              inlineImageValueAbbreviationExpand(obj));
         }
     }
     // TODO(edisonn): report end of data with inline image without an EI
     return inlineImage;
 }