Remove SkPdfNativeDoc::tokenizerOfStream.

experimental/PdfViewer/SkPdfFont.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 "SkPdfFont.h"
 
 #include "SkPdfNativeTokenizer.h"
@@ skipping 318 matching lines @@
                                       token.fKeywordLength==sizeof(keyword)-1 && \
                                       strncmp(token.fKeyword, keyword, sizeof(keyword)-1) == 0)
 
 SkPdfToUnicode::SkPdfToUnicode(SkPdfNativeDoc* parsed, SkPdfStream* stream) : fParsed(parsed) {
     fCMapEncoding = NULL;
     fCMapEncodingFlag = NULL;
 
     if (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());
+        SkPdfNativeTokenizer tokenizer(stream, parsed->allocator(), parsed);
         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.
         // Right now we deal with up 2 characters, e.g. <0020> but not longer like <00660066006C>
         //2 beginbfrange
         //<0000> <005E> <0020>
         //<005F> <0061> [<00660066> <00660069> <00660066006C>]
 
-        while (tokenizer->readToken(&token)) {
+        while (tokenizer.readToken(&token)) {
 
             if (tokenIsKeyword(token, "begincodespacerange")) {
-                while (tokenizer->readToken(&token) &&
+                while (tokenizer.readToken(&token) &&
                        !tokenIsKeyword(token, "endcodespacerange")) {
-//                    tokenizer->PutBack(token);
-//                    tokenizer->readToken(&token);
+//                    tokenizer.PutBack(token);
+//                    tokenizer.readToken(&token);
                     // TODO(edisonn): check token type! ignore/report errors.
                     int start = skstoi(token.fObject);
-                    tokenizer->readToken(&token);
+                    tokenizer.readToken(&token);
                     int end = skstoi(token.fObject);
                     for (int i = start; i <= end; i++) {
                         fCMapEncodingFlag[i] |= 1;
                     }
                 }
             }
 
             if (tokenIsKeyword(token, "beginbfchar")) {
-                while (tokenizer->readToken(&token) && !tokenIsKeyword(token, "endbfchar")) {
-//                    tokenizer->PutBack(token);
-//                    tokenizer->readToken(&token);
+                while (tokenizer.readToken(&token) && !tokenIsKeyword(token, "endbfchar")) {
+//                    tokenizer.PutBack(token);
+//                    tokenizer.readToken(&token);
                     int from = skstoi(token.fObject);
-                    tokenizer->readToken(&token);
+                    tokenizer.readToken(&token);
                     int to = skstoi(token.fObject);
 
                     fCMapEncodingFlag[from] |= 2;
                     fCMapEncoding[from] = to;
                 }
             }
 
             if (tokenIsKeyword(token, "beginbfrange")) {
-                while (tokenizer->readToken(&token) && !tokenIsKeyword(token, "endbfrange")) {
-//                    tokenizer->PutBack(token);
-//                    tokenizer->readToken(&token);
+                while (tokenizer.readToken(&token) && !tokenIsKeyword(token, "endbfrange")) {
+//                    tokenizer.PutBack(token);
+//                    tokenizer.readToken(&token);
                     int start = skstoi(token.fObject);
-                    tokenizer->readToken(&token);
+                    tokenizer.readToken(&token);
                     int end = skstoi(token.fObject);
 
 
-                    tokenizer->readToken(&token); // [ or just an array directly?
+                    tokenizer.readToken(&token); // [ or just an array directly?
                     // do not putback, we will reuse the read. See next commented read.
-//                    tokenizer->PutBack(token);
+//                    tokenizer.PutBack(token);
 
                     // TODO(edisonn): read spec: any string or only hex string?
                     if (token.fType == kObject_TokenType && token.fObject->isAnyString()) {
-//                        tokenizer->readToken(&token);
+//                        tokenizer.readToken(&token);
                         int value = skstoi(token.fObject);
 
                         for (int i = start; i <= end; i++) {
                             fCMapEncodingFlag[i] |= 2;
                             fCMapEncoding[i] = value;
                             value++;
                             // if i != end, verify last byte id not if, ignore/report error
                         }
 
                         // read one string
                     } else if (token.fType == kObject_TokenType && token.fObject->isArray()) {
-//                        tokenizer->readToken(&token);
+//                        tokenizer.readToken(&token);
                         // read array
                         for (unsigned int i = 0; i < token.fObject->size(); i++) {
                             fCMapEncodingFlag[start + i] |= 2;
                             fCMapEncoding[start + i] = skstoi((*token.fObject)[i]);
                         }
                     } else {
-                        tokenizer->PutBack(token);
+                        tokenizer.PutBack(token);
                     }
                 }
             }
         }
     }
 }
 
 SkPdfType0Font::SkPdfType0Font(SkPdfNativeDoc* doc, SkPdfType0FontDictionary* dict) {
     fBaseFont = fontFromName(doc, dict, dict->BaseFont(doc).c_str());
     fEncoding = NULL;
@@ skipping 29 matching lines @@
         encoding = NULL;
     }
 
 #ifdef PDF_TRACE
     if (encoding == NULL) {
         printf("Encoding not found: %s\n", name);
     }
 #endif
     return encoding;
 }