Simplify SkPdfTokenLooper behavior.

experimental/PdfViewer/src/SkPdfContext.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 "SkPdfContext.h"
 #include "SkPdfNativeDoc.h"
 #include "SkPdfReporter.h"
 #include "SkPdfTokenLooper.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 
 class PdfMainLooper : public SkPdfTokenLooper {
 public:
-    PdfMainLooper(SkPdfTokenLooper* parent,
-                  SkPdfNativeTokenizer* tokenizer,
+    PdfMainLooper(SkPdfNativeTokenizer* tokenizer,
                   SkPdfContext* pdfContext,
                   SkCanvas* canvas)
-        : SkPdfTokenLooper(parent, tokenizer, pdfContext, canvas) {}
+        : INHERITED(tokenizer, pdfContext, canvas) {}
 
-    virtual SkPdfResult consumeToken(PdfToken& token);
-    virtual void loop();
+    virtual SkPdfResult consumeToken(PdfToken& token) SK_OVERRIDE;
+    virtual void loop() SK_OVERRIDE;
+
+private:
+    typedef SkPdfTokenLooper INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SkPdfContext::SkPdfContext(SkPdfNativeDoc* doc)
     : fPdfDoc(doc)
 {
     SkASSERT(fPdfDoc != NULL);
 }
 
 void SkPdfContext::parseStream(SkPdfNativeObject* stream, SkCanvas* canvas) {
     SkPdfNativeTokenizer* tokenizer = fPdfDoc->tokenizerOfStream(stream, &fTmpPageAllocator);
     if (NULL == tokenizer) {
         // Nothing to parse.
         return;
     }
-    PdfMainLooper looper(NULL, tokenizer, this, canvas);
+    PdfMainLooper looper(tokenizer, this, canvas);
     looper.loop();
     // FIXME (scroggo): Will restructure to put tokenizer on the stack.
     delete tokenizer;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 // FIXME (scroggo): This probably belongs in a debugging file.
 // For reportRenderStats declaration.
 #include "SkPdfRenderer.h"
@@ skipping 28 matching lines @@
 }
 
 #include "SkPdfOps.h"
 
 SkPdfResult PdfMainLooper::consumeToken(PdfToken& token) {
     if (token.fType == kKeyword_TokenType && token.fKeywordLength < 256)
     {
         PdfOperatorRenderer pdfOperatorRenderer = NULL;
         if (gPdfOps.find(token.fKeyword, token.fKeywordLength, &pdfOperatorRenderer) &&
                     pdfOperatorRenderer) {
-            SkPdfTokenLooper* childLooper = NULL;
             // Main work is done by pdfOperatorRenderer(...)
-            SkPdfResult result = pdfOperatorRenderer(fPdfContext, fCanvas, &childLooper);
+            SkPdfResult result = pdfOperatorRenderer(fPdfContext, fCanvas, this);
 
             int cnt = 0;
             gRenderStats[result].find(token.fKeyword, token.fKeywordLength, &cnt);
             gRenderStats[result].set(token.fKeyword, token.fKeywordLength, cnt + 1);
-            if (childLooper) {
-                // FIXME (scroggo): Auto delete this.
-                childLooper->setUp(this);
-                childLooper->loop();
-                delete childLooper;
-            }
         } else {
             int cnt = 0;
             gRenderStats[kUnsupported_SkPdfResult].find(token.fKeyword,
                                                         token.fKeywordLength,
                                                         &cnt);
             gRenderStats[kUnsupported_SkPdfResult].set(token.fKeyword,
                                                        token.fKeywordLength,
                                                        cnt + 1);
         }
     }
@@ skipping 10 matching lines @@
     }
     return kOK_SkPdfResult;
 }
 
 void PdfMainLooper::loop() {
     PdfToken token;
     while (fTokenizer->readToken(&token, true)) {
         this->consumeToken(token);
     }
 }