(upload draf code for backup) pdfviewer: improve memory, son't allocate extra buffers, and put the …

experimental/PdfViewer/SkPdfFont.cpp

 #include "SkPdfFont.h"
 
 #include "SkStream.h"
 #include "SkTypeface.h"
 #include "SkPdfNativeTokenizer.h"
 
 std::map<std::string, SkPdfStandardFontEntry>& getStandardFonts() {
     static std::map<std::string, SkPdfStandardFontEntry> gPdfStandardFonts;
 
     // TODO (edisonn): , vs - ? what does it mean?
@@ skipping 146 matching lines @@
     } else if (fd->has_FontFile2()) {
         pdfStream = fd->FontFile2(doc);
     } if (fd->has_FontFile3()) {
         pdfStream = fd->FontFile3(doc);
     } else {
         if (loadFromName) {
             return fontFromName(doc, fd, fd->FontName(doc).c_str());
         }
     }
 
-    unsigned char* uncompressedStream = NULL;
+    const unsigned char* uncompressedStream = NULL;
     size_t uncompressedStreamLength = 0;
 
     // TODO(edisonn): report warning to be used in testing.
     if (!pdfStream ||
-            !pdfStream->GetFilteredStreamRef(&uncompressedStream, &uncompressedStreamLength, doc->allocator()) ||
+            !pdfStream->GetFilteredStreamRef(&uncompressedStream, &uncompressedStreamLength) ||
             !uncompressedStream ||
             !uncompressedStreamLength) {
         return NULL;
     }
 
     SkMemoryStream* skStream = new SkMemoryStream(uncompressedStream, uncompressedStreamLength);
     SkTypeface* face = SkTypeface::CreateFromStream(skStream);
 
     if (face == NULL) {
         // TODO(edisonn): report warning to be used in testing.
@@ skipping 131 matching lines @@
     return ret;
 }
 
 #define tokenIsKeyword(token,keyword) (token.fType == kKeyword_TokenType && token.fKeywordLength==sizeof(keyword)-1 && strncmp(token.fKeyword, keyword, sizeof(keyword)-1) == 0)
 
 SkPdfToUnicode::SkPdfToUnicode(SkNativeParsedPDF* parsed, SkPdfStream* stream) : fParsed(parsed) {
     fCMapEncoding = NULL;
     fCMapEncodingFlag = NULL;
 
     if (stream) {
-        SkPdfNativeTokenizer* tokenizer = fParsed->tokenizerOfStream(stream);
+        // Since font will be cached, the font has to sit in the per doc allocator, not to be
+        // freed after the page is done drawing.
+        SkPdfNativeTokenizer* tokenizer = fParsed->tokenizerOfStream(stream, parsed->allocator());
         PdfToken token;
 
         fCMapEncoding = new unsigned short[256 * 256];
         fCMapEncodingFlag = new unsigned char[256 * 256];
         for (int i = 0 ; i < 256 * 256; i++) {
             fCMapEncoding[i] = i;
             fCMapEncodingFlag[i] = 0;
         }
 
         // TODO(edisonn): deal with multibyte character, or longer strings.
@@ skipping 107 matching lines @@
 SkPdfEncoding* SkPdfEncoding::fromName(const char* name) {
     SkPdfEncoding* encoding = getStandardEncodings()[name];
 
 #ifdef PDF_TRACE
     if (encoding == NULL) {
         printf("Encoding not found: %s\n", name);
     }
 #endif
     return encoding;
 }