Separate and update PDF_DIFF_TRACE_IN_PNG

experimental/PdfViewer/pdf_viewer_main.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 "SkBitmapDevice.h"
 #include "SkCanvas.h"
 #include "SkCommandLineFlags.h"
 #include "SkDevice.h"
 #include "SkGraphics.h"
 #include "SkImageDecoder.h"
 #include "SkImageEncoder.h"
 #include "SkOSFile.h"
+#include "SkPdfConfig.h"
 #include "SkPdfRenderer.h"
 #include "SkPicture.h"
 #include "SkStream.h"
 #include "SkTypeface.h"
 #include "SkTArray.h"
 #include "SkNulCanvas.h"
 
 #if SK_SUPPORT_GPU
 #include "GrContextFactory.h"
 #include "GrContext.h"
@@ skipping 89 matching lines @@
     bitmap->eraseColor(color);
 }
 
 /** Write the output of pdf renderer to a file.
  * @param outputDir Output dir.
  * @param inputFilename The skp file that was read.
  * @param renderer The object responsible to write the pdf file.
  * @param page -1 means there is only one page (0), and render in a file without page extension
  */
 
+#ifdef PDF_TRACE_DIFF_IN_PNG
 extern "C" SkBitmap* gDumpBitmap;
 extern "C" SkCanvas* gDumpCanvas;
+#endif
 
 #if SK_SUPPORT_GPU
 GrContextFactory gContextFactory;
 #endif
 
 static bool render_page(const SkString& outputDir,
                         const SkString& inputFilename,
                         const SkPdfRenderer& renderer,
                         int page) {
     SkRect rect = renderer.MediaBox(page < 0 ? 0 :page);
@@ skipping 48 matching lines @@
 
             device.reset(SkGpuDevice::Create(target));
         }
 #endif
         else {
             SkDebugf("unknown --config: %s\n", FLAGS_config[0]);
             return false;
         }
         SkCanvas canvas(device);
 
+#ifdef PDF_TRACE_DIFF_IN_PNG
         gDumpBitmap = &bitmap;
-
         gDumpCanvas = &canvas;
+#endif
         renderer.renderPage(page < 0 ? 0 : page, &canvas, rect);
 
         SkString outputPath;
         if (!make_output_filepath(&outputPath, outputDir, inputFilename, page)) {
             return false;
         }
         SkImageEncoder::EncodeFile(outputPath.c_str(), bitmap, SkImageEncoder::kPNG_Type, 100);
 
         if (FLAGS_showMemoryUsage) {
             SkDebugf("Memory usage after page %i rendered: %u\n",
@@ skipping 130 matching lines @@
     }
 
     return 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif