pdfviewer: debug code for drawText (show magenta background for text, to show text even when we fai…

experimental/PdfViewer/pdfparser/native/SkPdfNativeTokenizer.cpp

 
 #include "SkPdfNativeTokenizer.h"
-#include "SkPdfObject.h"
+#include "SkPdfNativeObject.h"
 #include "SkPdfConfig.h"
 
 #include "SkPdfStreamCommonDictionary_autogen.h"
 #include "SkPdfImageDictionary_autogen.h"
 
 // TODO(edisonn): perf!!!
 // there could be 0s between start and end! but not in the needle.
 static char* strrstrk(char* hayStart, char* hayEnd, const char* needle) {
     int needleLen = strlen(needle);
     if ((isPdfWhiteSpaceOrPdfDelimiter(*(hayStart+needleLen)) || (hayStart+needleLen == hayEnd)) &&
@@ skipping 105 matching lines @@
     }
 
     while (start < end && !isPdfWhiteSpaceOrPdfDelimiter(*start)) {
         TRACE_TK(*start);
         start++;
     }
     return start;
 }
 
 // last elem has to be ]
-static const unsigned char* readArray(int level, const unsigned char* start, const unsigned char* end, SkPdfObject* array, SkPdfAllocator* allocator, SkNativeParsedPDF* doc) {
+static const unsigned char* readArray(int level, const unsigned char* start, const unsigned char* end, SkPdfNativeObject* array, SkPdfAllocator* allocator, SkPdfNativeDoc* doc) {
     if (allocator == NULL) {
         // TODO(edisonn): report/warning error
         return end;
     }
 
     TRACE_INDENT(level, "Array");
     while (start < end) {
         // skip white spaces
         start = skipPdfWhiteSpaces(level + 1, start, end);
 
         const unsigned char* endOfToken = endOfPdfToken(level + 1, start, end);
 
         if (endOfToken == start) {
             // TODO(edisonn): report error in pdf file (end of stream with ] for end of aray
             return start;
         }
 
         if (endOfToken == start + 1 && *start == kClosedSquareBracket_PdfDelimiter) {
             return endOfToken;
         }
 
-        SkPdfObject* newObj = allocator->allocObject();
+        SkPdfNativeObject* newObj = allocator->allocObject();
         start = nextObject(level + 1, start, end, newObj, allocator, doc);
         // TODO(edisonn): perf/memory: put the variables on the stack, and flush them on the array only when
         // we are sure they are not references!
         if (newObj->isKeywordReference() && array->size() >= 2 && array->objAtAIndex(array->size() - 1)->isInteger() && array->objAtAIndex(array->size() - 2)->isInteger()) {
-            SkPdfObject* gen = array->removeLastInArray();
-            SkPdfObject* id = array->removeLastInArray();
+            SkPdfNativeObject* gen = array->removeLastInArray();
+            SkPdfNativeObject* id = array->removeLastInArray();
             newObj->reset();
-            SkPdfObject::makeReference((unsigned int)id->intValue(), (unsigned int)gen->intValue(), newObj);
+            SkPdfNativeObject::makeReference((unsigned int)id->intValue(), (unsigned int)gen->intValue(), newObj);
         }
         array->appendInArray(newObj);
     }
     // TODO(edisonn): report not reached, we should never get here
     // TODO(edisonn): there might be a bug here, enable an assert and run it on files
     // or it might be that the files were actually corrupted
     return start;
 }
 
 // When we read strings we will rewrite the string so we will reuse the memory
@@ skipping 119 matching lines @@
         return in;  // consumed already ) at the end of the string
     } else {
         return start + (out - (const unsigned char*)NULL); // return where the string would end if we reuse the string
     }
 }
 
 static int readStringLength(int level, const unsigned char* start, const unsigned char* end) {
     return readString(level, start, end, NULL) - start;
 }
 
-static const unsigned char* readString(int level, const unsigned char* start, const unsigned char* end, SkPdfObject* str, SkPdfAllocator* allocator) {
+static const unsigned char* readString(int level, const unsigned char* start, const unsigned char* end, SkPdfNativeObject* str, SkPdfAllocator* allocator) {
     if (!allocator) {
         return end;
     }
     int outLength = readStringLength(level, start, end);
     // TODO(edisonn): optimize the allocation, don't allocate new string, but put it in a preallocated buffer
     unsigned char* out = (unsigned char*)allocator->alloc(outLength);
     start = readString(level, start, end, out);
-    SkPdfObject::makeString(out, out + outLength, str);
+    SkPdfNativeObject::makeString(out, out + outLength, str);
     TRACE_STRING(out, out + outLength);
     return start;  // consumed already ) at the end of the string
 }
 
 static const unsigned char* readHexString(int level, const unsigned char* start, const unsigned char* end, unsigned char* out) {
     TRACE_INDENT(level, "HexString");
     bool hasOut = (out != NULL);
     const unsigned char* in = start;
 
     unsigned char code = 0;
@@ skipping 118 matching lines @@
         return in;  // consumed already > at the end of the string
     } else {
         return start + (out - (const unsigned char*)NULL); // return where the string would end if we reuse the string
     }
 }
 
 static int readHexStringLength(int level, const unsigned char* start, const unsigned char* end) {
     return readHexString(level, start, end, NULL) - start;
 }
 
-static const unsigned char* readHexString(int level, const unsigned char* start, const unsigned char* end, SkPdfObject* str, SkPdfAllocator* allocator) {
+static const unsigned char* readHexString(int level, const unsigned char* start, const unsigned char* end, SkPdfNativeObject* str, SkPdfAllocator* allocator) {
     if (!allocator) {
         return end;
     }
     int outLength = readHexStringLength(level, start, end);
     // TODO(edisonn): optimize the allocation, don't allocate new string, but put it in a preallocated buffer
     unsigned char* out = (unsigned char*)allocator->alloc(outLength);
     start = readHexString(level, start, end, out);
-    SkPdfObject::makeHexString(out, out + outLength, str);
+    SkPdfNativeObject::makeHexString(out, out + outLength, str);
     TRACE_HEXSTRING(out, out + outLength);
     return start;  // consumed already > at the end of the string
 }
 
 // TODO(edisonn): before PDF 1.2 name could not have special characters, add version parameter
 static const unsigned char* readName(int level, const unsigned char* start, const unsigned char* end, unsigned char* out) {
     TRACE_INDENT(level, "Name");
     bool hasOut = (out != NULL);
     const unsigned char* in = start;
 
@@ skipping 96 matching lines @@
         return in;
     } else {
         return start + (out - (const unsigned char*)NULL); // return where the string would end if we reuse the string
     }
 }
 
 static int readNameLength(int level, const unsigned char* start, const unsigned char* end) {
     return readName(level, start, end, NULL) - start;
 }
 
-static const unsigned char* readName(int level, const unsigned char* start, const unsigned char* end, SkPdfObject* name, SkPdfAllocator* allocator) {
+static const unsigned char* readName(int level, const unsigned char* start, const unsigned char* end, SkPdfNativeObject* name, SkPdfAllocator* allocator) {
     if (!allocator) {
         return end;
     }
     int outLength = readNameLength(level, start, end);
     // TODO(edisonn): optimize the allocation, don't allocate new string, but put it in a preallocated buffer
     unsigned char* out = (unsigned char*)allocator->alloc(outLength);
     start = readName(level, start, end, out);
-    SkPdfObject::makeName(out, out + outLength, name);
+    SkPdfNativeObject::makeName(out, out + outLength, name);
     TRACE_NAME(out, out + outLength);
     return start;
 }
 
 // TODO(edisonn): pdf spec let Length to be an indirect object define after the stream
 // that makes for an interesting scenario, where the stream itself contains endstream, together
 // with a reference object with the length, but the real length object would be somewhere else
 // it could confuse the parser
 /*example:
 
 7 0 obj
 << /length 8 0 R>>
 stream
 ...............
 endstream
 8 0 obj #we are in stream actually, not a real object
 << 10 >> #we are in stream actually, not a real object
 endobj
 endstream
 8 0 obj #real obj
 << 100 >> #real obj
 endobj
 and it could get worse, with multiple object like this
 */
 
 // right now implement the silly algorithm that assumes endstream is finishing the stream
 
 
-static const unsigned char* readStream(int level, const unsigned char* start, const unsigned char* end, SkPdfObject* dict, SkNativeParsedPDF* doc) {
+static const unsigned char* readStream(int level, const unsigned char* start, const unsigned char* end, SkPdfNativeObject* dict, SkPdfNativeDoc* doc) {
     TRACE_INDENT(level, "Stream");
     start = skipPdfWhiteSpaces(level, start, end);
     if (!(start[0] == 's' && start[1] == 't' && start[2] == 'r' && start[3] == 'e' && start[4] == 'a' && start[5] == 'm')) {
         // no stream. return.
         return start;
     }
 
     start += 6; // strlen("stream")
     if (start[0] == kCR_PdfWhiteSpace && start[1] == kLF_PdfWhiteSpace) {
         start += 2;
@@ skipping 56 matching lines @@
         // TODO(edisonn): verify the next bytes are "endstream"
 
         endstream += strlen("endstream");
         // TODO(edisonn): Assert? report error/warning?
         dict->addStream(start, (size_t)length);
         return endstream;
     }
     return start;
 }
 
-static const unsigned char* readInlineImageStream(int level, const unsigned char* start, const unsigned char* end, SkPdfImageDictionary* inlineImage, SkNativeParsedPDF* doc) {
+static const unsigned char* readInlineImageStream(int level, const unsigned char* start, const unsigned char* end, SkPdfImageDictionary* inlineImage, SkPdfNativeDoc* doc) {
     TRACE_INDENT(level, "Inline Image");
     // We already processed ID keyword, and we should be positioned immediately after it
 
     // TODO(edisonn): security: read after end check, or make buffers with extra 2 bytes
     if (start[0] == kCR_PdfWhiteSpace && start[1] == kLF_PdfWhiteSpace) {
         start += 2;
     } else if (start[0] == kLF_PdfWhiteSpace) {
         start += 1;
     } else if (isPdfWhiteSpace(start[0])) {
         start += 1;
@@ skipping 11 matching lines @@
         if (*(endstream-2) == kCR_PdfWhiteSpace) length--;
         inlineImage->addStream(start, (size_t)length);
     } else {
         // TODO(edisonn): report error in inline image stream (ID-EI) section
         // TODO(edisonn): based on filter, try to ignore a missing EI, and read data properly
         return end;
     }
     return endEI;
 }
 
-static const unsigned char* readDictionary(int level, const unsigned char* start, const unsigned char* end, SkPdfObject* dict, SkPdfAllocator* allocator, SkNativeParsedPDF* doc) {
+static const unsigned char* readDictionary(int level, const unsigned char* start, const unsigned char* end, SkPdfNativeObject* dict, SkPdfAllocator* allocator, SkPdfNativeDoc* doc) {
     if (allocator == NULL) {
         // TODO(edisonn): report/warning error
         return end;
     }
     TRACE_INDENT(level, "Dictionary");
-    SkPdfObject::makeEmptyDictionary(dict);
+    SkPdfNativeObject::makeEmptyDictionary(dict);
 
     start = skipPdfWhiteSpaces(level, start, end);
     SkPdfAllocator tmpStorage;  // keys will be stored in dict, we can free them immediately after set.
 
     while (start < end && *start == kNamed_PdfDelimiter) {
-        SkPdfObject key;
+        SkPdfNativeObject key;
         //*start = '\0';
         start++;
         start = readName(level + 1, start, end, &key, &tmpStorage);
         start = skipPdfWhiteSpaces(level + 1, start, end);
 
         if (start < end) {
-            SkPdfObject* value = allocator->allocObject();
+            SkPdfNativeObject* value = allocator->allocObject();
             start = nextObject(level + 1, start, end, value, allocator, doc);
 
             start = skipPdfWhiteSpaces(level + 1, start, end);
 
             if (start < end) {
                 // seems we have an indirect reference
                 if (isPdfDigit(*start)) {
-                    SkPdfObject generation;
+                    SkPdfNativeObject generation;
                     start = nextObject(level + 1, start, end, &generation, allocator, doc);
 
-                    SkPdfObject keywordR;
+                    SkPdfNativeObject keywordR;
                     start = nextObject(level + 1, start, end, &keywordR, allocator, doc);
 
                     if (value->isInteger() && generation.isInteger() && keywordR.isKeywordReference()) {
                         int64_t id = value->intValue();
                         value->reset();
-                        SkPdfObject::makeReference((unsigned int)id, (unsigned int)generation.intValue(), value);
+                        SkPdfNativeObject::makeReference((unsigned int)id, (unsigned int)generation.intValue(), value);
                         dict->set(&key, value);
                     } else {
                         // error, ignore
                         dict->set(&key, value);
                     }
                 } else {
                     // next elem is not a digit, but it might not be / either!
                     dict->set(&key, value);
                 }
             } else {
                 // /key >>
                 dict->set(&key, value);
                 return end;
             }
             start = skipPdfWhiteSpaces(level + 1, start, end);
         } else {
-            dict->set(&key, &SkPdfObject::kNull);
+            dict->set(&key, &SkPdfNativeObject::kNull);
             return end;
         }
     }
 
     // TODO(edisonn): options to ignore these errors
 
     // now we should expect >>
     start = skipPdfWhiteSpaces(level, start, end);
     if (*start != kClosedInequityBracket_PdfDelimiter) {
         // TODO(edisonn): report/warning
     }
     //*start = '\0';
     start++;  // skip >
     if (*start != kClosedInequityBracket_PdfDelimiter) {
         // TODO(edisonn): report/warning
     }
     //*start = '\0';
     start++;  // skip >
 
     start = readStream(level, start, end, dict, doc);
 
     return start;
 }
 
-const unsigned char* nextObject(int level, const unsigned char* start, const unsigned char* end, SkPdfObject* token, SkPdfAllocator* allocator, SkNativeParsedPDF* doc) {
+const unsigned char* nextObject(int level, const unsigned char* start, const unsigned char* end, SkPdfNativeObject* token, SkPdfAllocator* allocator, SkPdfNativeDoc* doc) {
     const unsigned char* current;
 
     // skip white spaces
     start = skipPdfWhiteSpaces(level, start, end);
 
     current = endOfPdfToken(level, start, end);
 
     // no token, len would be 0
     if (current == start) {
         return NULL;
     }
 
     int tokenLen = current - start;
 
     if (tokenLen == 1) {
         // start array
         switch (*start) {
             case kOpenedSquareBracket_PdfDelimiter:
                 //*start = '\0';
-                SkPdfObject::makeEmptyArray(token);
+                SkPdfNativeObject::makeEmptyArray(token);
                 return readArray(level + 1, current, end, token, allocator, doc);
 
             case kOpenedRoundBracket_PdfDelimiter:
                 //*start = '\0';
                 return readString(level, start + 1, end, token, allocator);
 
             case kOpenedInequityBracket_PdfDelimiter:
                 //*start = '\0';
                 if (end > start + 1 && start[1] == kOpenedInequityBracket_PdfDelimiter) {
                     //start[1] = '\0';  // optional
@@ skipping 14 matching lines @@
         }
 
         SkASSERT(!isPdfWhiteSpace(*start));
         if (isPdfDelimiter(*start)) {
             // TODO(edisonn): how stream ] } > ) will be handled?
             // for now ignore, and it will become a keyword to be ignored
         }
     }
 
     if (tokenLen == 4 && start[0] == 'n' && start[1] == 'u' && start[2] == 'l' && start[3] == 'l') {
-        SkPdfObject::makeNull(token);
+        SkPdfNativeObject::makeNull(token);
         return current;
     }
 
     if (tokenLen == 4 && start[0] == 't' && start[1] == 'r' && start[2] == 'u' && start[3] == 'e') {
-        SkPdfObject::makeBoolean(true, token);
+        SkPdfNativeObject::makeBoolean(true, token);
         return current;
     }
 
     if (tokenLen == 5 && start[0] == 'f' && start[1] == 'a' && start[2] == 'l' && start[3] == 's' && start[4] == 'e') {
-        SkPdfObject::makeBoolean(false, token);
+        SkPdfNativeObject::makeBoolean(false, token);
         return current;
     }
 
     if (isPdfNumeric(*start)) {
-        SkPdfObject::makeNumeric(start, current, token);
+        SkPdfNativeObject::makeNumeric(start, current, token);
     } else {
-        SkPdfObject::makeKeyword(start, current, token);
+        SkPdfNativeObject::makeKeyword(start, current, token);
     }
     return current;
 }
 
-SkPdfObject* SkPdfAllocator::allocBlock() {
-    fSizeInBytes += BUFFER_SIZE * sizeof(SkPdfObject);
-    return new SkPdfObject[BUFFER_SIZE];
+SkPdfNativeObject* SkPdfAllocator::allocBlock() {
+    fSizeInBytes += BUFFER_SIZE * sizeof(SkPdfNativeObject);
+    return new SkPdfNativeObject[BUFFER_SIZE];
 }
 
 SkPdfAllocator::~SkPdfAllocator() {
     for (int i = 0 ; i < fHandles.count(); i++) {
         free(fHandles[i]);
     }
     for (int i = 0 ; i < fHistory.count(); i++) {
         for (int j = 0 ; j < BUFFER_SIZE; j++) {
             fHistory[i][j].reset();
         }
         delete[] fHistory[i];
     }
     for (int j = 0 ; j < BUFFER_SIZE; j++) {
         fCurrent[j].reset();
     }
     delete[] fCurrent;
 }
 
-SkPdfObject* SkPdfAllocator::allocObject() {
+SkPdfNativeObject* SkPdfAllocator::allocObject() {
     if (fCurrentUsed >= BUFFER_SIZE) {
         fHistory.push(fCurrent);
         fCurrent = allocBlock();
         fCurrentUsed = 0;
-        fSizeInBytes += sizeof(SkPdfObject*);
+        fSizeInBytes += sizeof(SkPdfNativeObject*);
     }
     fCurrentUsed++;
     return &fCurrent[fCurrentUsed - 1];
 }
 
 // TODO(edisonn): perf: do no copy the buffers, but use them, and mark cache the result, so there is no need of a second pass
-SkPdfNativeTokenizer::SkPdfNativeTokenizer(SkPdfObject* objWithStream, const SkPdfMapper* mapper, SkPdfAllocator* allocator, SkNativeParsedPDF* doc) : fDoc(doc), fMapper(mapper), fAllocator(allocator), fUncompressedStream(NULL), fUncompressedStreamEnd(NULL), fEmpty(false), fHasPutBack(false) {
+SkPdfNativeTokenizer::SkPdfNativeTokenizer(SkPdfNativeObject* objWithStream, const SkPdfMapper* mapper, SkPdfAllocator* allocator, SkPdfNativeDoc* doc) : fDoc(doc), fMapper(mapper), fAllocator(allocator), fUncompressedStream(NULL), fUncompressedStreamEnd(NULL), fEmpty(false), fHasPutBack(false) {
     const unsigned char* buffer = NULL;
     size_t len = 0;
     objWithStream->GetFilteredStreamRef(&buffer, &len);
     // TODO(edisonn): hack, find end of object
     char* endobj = strrstrk((char*)buffer, (char*)buffer + len, "endobj");
     if (endobj) {
         len = endobj - (char*)buffer + strlen("endobj");
     }
     fUncompressedStreamStart = fUncompressedStream = buffer;
     fUncompressedStreamEnd = fUncompressedStream + len;
 }
 
-SkPdfNativeTokenizer::SkPdfNativeTokenizer(const unsigned char* buffer, int len, const SkPdfMapper* mapper, SkPdfAllocator* allocator, SkNativeParsedPDF* doc) : fDoc(doc), fMapper(mapper), fAllocator(allocator), fEmpty(false), fHasPutBack(false) {
+SkPdfNativeTokenizer::SkPdfNativeTokenizer(const unsigned char* buffer, int len, const SkPdfMapper* mapper, SkPdfAllocator* allocator, SkPdfNativeDoc* doc) : fDoc(doc), fMapper(mapper), fAllocator(allocator), fEmpty(false), fHasPutBack(false) {
     // TODO(edisonn): hack, find end of object
     char* endobj = strrstrk((char*)buffer, (char*)buffer + len, "endobj");
     if (endobj) {
         len = endobj - (char*)buffer + strlen("endobj");
     }
     fUncompressedStreamStart = fUncompressedStream = buffer;
     fUncompressedStreamEnd = fUncompressedStream + len;
 }
 
 SkPdfNativeTokenizer::~SkPdfNativeTokenizer() {
 }
 
 bool SkPdfNativeTokenizer::readTokenCore(PdfToken* token) {
-    SkPdfObject obj;
+    SkPdfNativeObject obj;
 #ifdef PDF_TRACE_READ_TOKEN
     static int read_op = 0;
 #endif
     token->fKeyword = NULL;
     token->fObject = NULL;
 
     fUncompressedStream = skipPdfWhiteSpaces(0, fUncompressedStream, fUncompressedStreamEnd);
     if (fUncompressedStream >= fUncompressedStreamEnd) {
         return false;
     }
 
     fUncompressedStream = nextObject(0, fUncompressedStream, fUncompressedStreamEnd, &obj, fAllocator, fDoc);
 
     // If it is a keyword, we will only get the pointer of the string
-    if (obj.type() == SkPdfObject::kKeyword_PdfObjectType) {
+    if (obj.type() == SkPdfNativeObject::kKeyword_PdfObjectType) {
         token->fKeyword = obj.c_str();
         token->fKeywordLength = obj.lenstr();
         token->fType = kKeyword_TokenType;
     } else {
-        SkPdfObject* pobj = fAllocator->allocObject();
+        SkPdfNativeObject* pobj = fAllocator->allocObject();
         *pobj = obj;
         token->fObject = pobj;
         token->fType = kObject_TokenType;
     }
 
 #ifdef PDF_TRACE_READ_TOKEN
     read_op++;
 #if 0
     if (548 == read_op) {
         printf("break;\n");
@@ skipping 57 matching lines @@
 DECLARE_PDF_NAME(ASCII85Decode);
 DECLARE_PDF_NAME(LZWDecode);
 DECLARE_PDF_NAME(FlateDecode);  // PDF 1.2
 DECLARE_PDF_NAME(RunLengthDecode);
 DECLARE_PDF_NAME(CCITTFaxDecode);
 DECLARE_PDF_NAME(DCTDecode);
 
 #define HANDLE_NAME_ABBR(obj,longName,shortName) if (obj->isName(#shortName)) return &longName;
 
 
-static SkPdfObject* inlineImageKeyAbbreviationExpand(SkPdfObject* key) {
+static SkPdfNativeObject* inlineImageKeyAbbreviationExpand(SkPdfNativeObject* key) {
     if (!key || !key->isName()) {
         return key;
     }
 
     // TODO(edisonn): use autogenerated code!
     HANDLE_NAME_ABBR(key, BitsPerComponent, BPC);
     HANDLE_NAME_ABBR(key, ColorSpace, CS);
     HANDLE_NAME_ABBR(key, Decode, D);
     HANDLE_NAME_ABBR(key, DecodeParms, DP);
     HANDLE_NAME_ABBR(key, Filter, F);
     HANDLE_NAME_ABBR(key, Height, H);
     HANDLE_NAME_ABBR(key, ImageMask, IM);
 //    HANDLE_NAME_ABBR(key, Intent, );
     HANDLE_NAME_ABBR(key, Interpolate, I);
     HANDLE_NAME_ABBR(key, Width, W);
 
     return key;
 }
 
-static SkPdfObject* inlineImageValueAbbreviationExpand(SkPdfObject* value) {
+static SkPdfNativeObject* inlineImageValueAbbreviationExpand(SkPdfNativeObject* value) {
     if (!value || !value->isName()) {
         return value;
     }
 
     // TODO(edisonn): use autogenerated code!
     HANDLE_NAME_ABBR(value, DeviceGray, G);
     HANDLE_NAME_ABBR(value, DeviceRGB, RGB);
     HANDLE_NAME_ABBR(value, DeviceCMYK, CMYK);
     HANDLE_NAME_ABBR(value, Indexed, I);
     HANDLE_NAME_ABBR(value, ASCIIHexDecode, AHx);
     HANDLE_NAME_ABBR(value, ASCII85Decode, A85);
     HANDLE_NAME_ABBR(value, LZWDecode, LZW);
     HANDLE_NAME_ABBR(value, FlateDecode, Fl);  // (PDF 1.2)
     HANDLE_NAME_ABBR(value, RunLengthDecode, RL);
     HANDLE_NAME_ABBR(value, CCITTFaxDecode, CCF);
     HANDLE_NAME_ABBR(value, DCTDecode, DCT);
 
     return value;
 }
 
 SkPdfImageDictionary* SkPdfNativeTokenizer::readInlineImage() {
     // BI already processed
     fUncompressedStream = skipPdfWhiteSpaces(0, fUncompressedStream, fUncompressedStreamEnd);
     if (fUncompressedStream >= fUncompressedStreamEnd) {
         return NULL;
     }
 
     SkPdfImageDictionary* inlineImage = (SkPdfImageDictionary*)fAllocator->allocObject();
-    SkPdfObject::makeEmptyDictionary(inlineImage);
+    SkPdfNativeObject::makeEmptyDictionary(inlineImage);
 
     while (fUncompressedStream < fUncompressedStreamEnd) {
-        SkPdfObject* key = fAllocator->allocObject();
+        SkPdfNativeObject* key = fAllocator->allocObject();
         fUncompressedStream = nextObject(0, fUncompressedStream, fUncompressedStreamEnd, key, fAllocator, fDoc);
 
         if (key->isKeyword() && key->lenstr() == 2 && key->c_str()[0] == 'I' && key->c_str()[1] == 'D') { // ID
             fUncompressedStream = readInlineImageStream(0, fUncompressedStream, fUncompressedStreamEnd, inlineImage, fDoc);
             return inlineImage;
         } else {
-            SkPdfObject* obj = fAllocator->allocObject();
+            SkPdfNativeObject* obj = fAllocator->allocObject();
             fUncompressedStream = nextObject(0, fUncompressedStream, fUncompressedStreamEnd, obj, fAllocator, fDoc);
             // TODO(edisonn): perf maybe we should not expand abreviation like this
             inlineImage->set(inlineImageKeyAbbreviationExpand(key),
                              inlineImageValueAbbreviationExpand(obj));
         }
     }
     // TODO(edisonn): report end of data with inline image without an EI
     return inlineImage;
 }