Separate and update PDF_DIFF_TRACE_IN_PNG

experimental/PdfViewer/src/SkPdfRenderer.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 "SkPdfRenderer.h"
 
 #include "SkBitmapDevice.h"
@@ skipping 2718 matching lines @@
 }
 
 SkPdfResult PdfCompatibilitySectionLooper::consumeToken(PdfToken& token) {
     return fParent->consumeToken(token);
 }
 
 void PdfCompatibilitySectionLooper::loop() {
     PdfOp_q(fPdfContext, fCanvas, NULL);
 
     PdfToken token;
-    while (readToken(fTokenizer, &token)) {
+    while (fTokenizer->readToken(&token)) {
         if (token.fType == kKeyword_TokenType && strcmp(token.fKeyword, "BX") == 0) {
             SkPdfTokenLooper* looper = new PdfCompatibilitySectionLooper();
             looper->setUp(this);
             looper->loop();
             delete looper;
         } else {
             if (token.fType == kKeyword_TokenType && strcmp(token.fKeyword, "EX") == 0) break;
             fParent->consumeToken(token);
         }
     }
@@ skipping 147 matching lines @@
 
     rect = SkRect::MakeWH(width, height);
 
     setup_bitmap(output, SkScalarCeilToInt(width), SkScalarCeilToInt(height));
 
     SkAutoTUnref<SkBaseDevice> device(SkNEW_ARGS(SkBitmapDevice, (*output)));
     SkCanvas canvas(device);
 
     return renderer->renderPage(page, &canvas, rect);
 }