pdfviewer: pass the page number, report failure if at least one render fails, and check that xref s…

experimental/PdfViewer/pdf_viewer_main.cpp

Index: experimental/PdfViewer/pdf_viewer_main.cpp
===================================================================
--- experimental/PdfViewer/pdf_viewer_main.cpp	(revision 10543)
+++ experimental/PdfViewer/pdf_viewer_main.cpp	(working copy)
@@ -216,15 +216,8 @@
     SkString inputFilename;
     get_basename(&inputFilename, inputPath);
 
-    SkFILEStream inputStream;
-    inputStream.setPath(inputPath.c_str());
-    if (!inputStream.isValid()) {
-        SkDebugf("Could not open file %s\n", inputPath.c_str());
-        return false;
-    }
+    bool success = true;
 
-    bool success = false;
-
     success = renderer.load(inputPath);
     if (FLAGS_showMemoryUsage) {
         SkDebugf("Memory usage after load: %u\n", (unsigned int)renderer.bytesUsed());
@@ -233,7 +226,7 @@
     // TODO(edisonn): bench timers
     if (FLAGS_benchLoad > 0) {
         for (int i = 0 ; i < FLAGS_benchLoad; i++) {
-            success = renderer.load(inputPath);
+            success = renderer.load(inputPath) && success;
             if (FLAGS_showMemoryUsage) {
                 SkDebugf("Memory usage after load %i number : %u\n", i, (unsigned int)renderer.bytesUsed());
             }
@@ -262,12 +255,16 @@
                     success = render_page(outputDir, inputFilename, renderer, FLAGS_noExtensionForOnePagePdf && renderer.pages() == 1 ? -1 : renderer.pages() - 1) && success;
                 } else {
                     int pn = atoi(FLAGS_pages[0]);
-                    success = render_page(outputDir, inputFilename, renderer, FLAGS_noExtensionForOnePagePdf && renderer.pages() == 1 ? -1 : renderer.pages() - 1) && pn;
+                    success = render_page(outputDir, inputFilename, renderer, FLAGS_noExtensionForOnePagePdf && renderer.pages() == 1 ? -1 : pn) && success;
                 }
             }
         }
     }
 
+    if (!success) {
+        SkDebugf("Failures for file %s\n", inputPath.c_str());
+    }
+
     return success;
 }