pdfviewer: more plumming for soft masks

experimental/PdfViewer/pdfparser/native/SkNativeParsedPDF.cpp

 #include "SkNativeParsedPDF.h"
 #include "SkPdfNativeTokenizer.h"
 #include "SkPdfBasics.h"
 #include "SkPdfObject.h"
 
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
@@ skipping 178 matching lines @@
             token.reset();
             current = nextObject(0, current, trailerEnd, &token, NULL, NULL);
             if (!token.isInteger()) {
                 // TODO(edisonn): report/warning
                 return current;
             }
             int generation = (int)token.intValue();
 
             token.reset();
             current = nextObject(0, current, trailerEnd, &token, NULL, NULL);
-            if (!token.isKeyword() || token.len() != 1 || (*token.c_str() != 'f' && *token.c_str() != 'n')) {
+            if (!token.isKeyword() || token.lenstr() != 1 || (*token.c_str() != 'f' && *token.c_str() != 'n')) {
                 // TODO(edisonn): report/warning
                 return current;
             }
 
             addCrossSectionInfo(startId + i, generation, offset, *token.c_str() == 'f');
         }
     }
     // TODO(edisonn): it should never get here? there is no trailer?
     return current;
 }
 
 long SkNativeParsedPDF::readTrailer(const unsigned char* trailerStart, const unsigned char* trailerEnd, bool storeCatalog) {
     SkPdfObject trailerKeyword;
     // TODO(edisonn): use null allocator, and let it just fail if memory
     // needs allocated (but no crash)!
     const unsigned char* current =
             nextObject(0, trailerStart, trailerEnd, &trailerKeyword, NULL, NULL);
 
-    if (!trailerKeyword.isKeyword() || strlen("trailer") != trailerKeyword.len() ||
+    if (!trailerKeyword.isKeyword() || strlen("trailer") != trailerKeyword.lenstr() ||
         strncmp(trailerKeyword.c_str(), "trailer", strlen("trailer")) != 0) {
         // TODO(edisonn): report warning, rebuild trailer from objects.
         return -1;
     }
 
     SkPdfObject token;
     current = nextObject(0, current, trailerEnd, &token, fAllocator, NULL);
     if (!token.isDictionary()) {
         return -1;
     }
@@ skipping 231 matching lines @@
     return (SkPdfObject*)ref;
 }
 
 size_t SkNativeParsedPDF::bytesUsed() const {
     return fAllocator->bytesUsed() +
            fContentLength +
            fObjects.count() * sizeof(PublicObjectEntry) +
            fPages.count() * sizeof(SkPdfPageObjectDictionary*) +
            sizeof(*this);
 }