Pdfviewer refactoring.

experimental/PdfViewer/pdfparser/native/SkPdfNativeDoc.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 "SkPdfNativeDoc.h"
 
 #include <stdio.h>
@@ skipping 108 matching lines @@
 
     if (strcmp((char*)xrefstartKeywordLine, "startxref") != 0) {
         SkPdfReport(kWarning_SkPdfIssueSeverity, kMissingToken_SkPdfIssue,
                     "Could not find startxref", NULL, NULL);
     }
 
     long xrefByteOffset = atol((const char*)xrefByteOffsetLine);
 
     bool storeCatalog = true;
     while (xrefByteOffset >= 0) {
-        const unsigned char* trailerStart = readCrossReferenceSection(fFileContent + xrefByteOffset,
-                                                                      xrefstartKeywordLine);
+        const unsigned char* trailerStart = this->readCrossReferenceSection(fFileContent + xrefByteOffset,
+                                                                            xrefstartKeywordLine);
         xrefByteOffset = -1;
         if (trailerStart < xrefstartKeywordLine) {
-            readTrailer(trailerStart, xrefstartKeywordLine, storeCatalog, &xrefByteOffset, false);
+            this->readTrailer(trailerStart, xrefstartKeywordLine, storeCatalog, &xrefByteOffset, false);
             storeCatalog = false;
         }
     }
 
     // TODO(edisonn): warn/error expect fObjects[fRefCatalogId].fGeneration == fRefCatalogGeneration
     // TODO(edisonn): security, verify that SkPdfCatalogDictionary is indeed using mapper
 
     if (fRootCatalogRef) {
         fRootCatalog = (SkPdfCatalogDictionary*)resolveReference(fRootCatalogRef);
         if (fRootCatalog != NULL && fRootCatalog->isDictionary() && fRootCatalog->valid()) {
@@ skipping 152 matching lines @@
             token.reset();
             current = nextObject(current, trailerEnd, &token, NULL, NULL);
             if (!token.isKeyword() || token.lenstr() != 1 ||
                 (*token.c_str() != 'f' && *token.c_str() != 'n')) {
                 SkPdfReportUnexpectedType(kIgnoreError_SkPdfIssueSeverity,
                                           "readCrossReferenceSection: f or n expected",
                                           &token, SkPdfNativeObject::kKeyword_PdfObjectType, NULL);
                 return current;
             }
 
-            addCrossSectionInfo(startId + i, generation, offset, *token.c_str() == 'f');
+            this->addCrossSectionInfo(startId + i, generation, offset, *token.c_str() == 'f');
         }
     }
     SkPdfReport(kInfo_SkPdfIssueSeverity, kNoIssue_SkPdfIssue,
                 "Unexpected end of readCrossReferenceSection", NULL, NULL);
     return current;
 }
 
 const unsigned char* SkPdfNativeDoc::readTrailer(const unsigned char* trailerStart,
                                                  const unsigned char* trailerEnd,
                                                  bool storeCatalog, long* prev, bool skipKeyword) {
@@ skipping 39 matching lines @@
     if (trailer->has_Prev()) {
         *prev = (long)trailer->Prev(NULL);
     }
 
     return current;
 }
 
 void SkPdfNativeDoc::addCrossSectionInfo(int id, int generation, int offset, bool isFreed) {
     // TODO(edisonn): security here, verify id
     while (fObjects.count() < id + 1) {
-        reset(fObjects.append());
+        this->reset(fObjects.append());
     }
 
     fObjects[id].fOffset = offset;
     fObjects[id].fObj = NULL;
     fObjects[id].fResolvedReference = NULL;
     fObjects[id].fIsReferenceResolved = false;
 }
 
 SkPdfNativeObject* SkPdfNativeDoc::readObject(int id/*, int expectedGeneration*/) {
     long startOffset = fObjects[id].fOffset;
@@ skipping 220 matching lines @@
     return (SkPdfNativeObject*)ref;
 }
 
 size_t SkPdfNativeDoc::bytesUsed() const {
     return fAllocator->bytesUsed() +
            fContentLength +
            fObjects.count() * sizeof(PublicObjectEntry) +
            fPages.count() * sizeof(SkPdfPageObjectDictionary*) +
            sizeof(*this);
 }