Pdfviewer refactoring.

samplecode/SamplePdfFileViewer.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.
  */
 
 #ifdef SAMPLE_PDF_FILE_VIEWER
 
@@ skipping 19 matching lines @@
 #include "SkXfermode.h"
 
 #include "SkPdfRenderer.h"
 
 class PdfFileViewer : public SampleView {
 private:
     SkString    fFilename;
     SkPicture*  fPicture;  // TODO(edisonn): multiple pages, one page / picture, make it an array
 
     static SkPicture* LoadPdf(const char path[]) {
-        SkPicture* pic = NULL;
+        SkAutoTDelete<SkPdfRenderer> renderer(SkPdfRenderer::CreateFromFile(path));
+        if (NULL == renderer.get()) {
+            return NULL;
+        }
 
-        SkPdfRenderer renderer;
-        SkString skpath;
-        skpath.append(path);
-        renderer.load(skpath);
-        if (renderer.loaded()) {
-            pic = SkNEW(SkPicture);
-            SkCanvas* canvas = pic->beginRecording((int)renderer.MediaBox(0).width(), (int)renderer.MediaBox(0).height());
-            renderer.renderPage(0, canvas, renderer.MediaBox(0));
-            pic->endRecording();
-        }
+        SkPicture* pic = SkNEW(SkPicture);
+        SkCanvas* canvas = pic->beginRecording((int) renderer->MediaBox(0).width(),
+                                               (int) renderer->MediaBox(0).height());
+        renderer->renderPage(0, canvas, renderer->MediaBox(0));
+        pic->endRecording();
         return pic;
     }
 
 public:
     PdfFileViewer(const char name[] = NULL) : fFilename(name) {
         fPicture = NULL;
     }
 
     virtual ~PdfFileViewer() {
         SkSafeUnref(fPicture);
@@ skipping 38 matching lines @@
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
 #if 0
 static SkView* MyFactory() { return new PdfFileViewer; }
 static SkViewRegister reg(MyFactory);
 #endif
 
 #endif  // SAMPLE_PDF_FILE_VIEWER