commit d1a874aaa820e32590c5046fe13267b3a132263b
author edisonn@google.com <edisonn@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Jul 11 14:45:20 2013 +0000
committer edisonn@google.com <edisonn@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Jul 11 14:45:20 2013 +0000
tree e090bc52f55f5a9409ec25b3df2808c472f667a4
parent 15b11182036ba32a732a68982f5eca0b325e0ebe

(unreviewed) sample app: fix break in pdf viewer (podofo was replaced by native parser)

Review URL: https://codereview.chromium.org/18507004

git-svn-id: http://skia.googlecode.com/svn/trunk@10007 2bbb7eff-a529-9590-31e7-b0007b416f81

gyp/SampleApp.gyp

diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp
index 2574fc8..b30fca7 100644
--- a/gyp/SampleApp.gyp
+++ b/gyp/SampleApp.gyp
@@ -165,7 +165,7 @@
            'pdfviewer.gyp:libpdfviewer',
          ],
          'include_dirs' : [
-           '../experimental/PdfViewer/pdfparser/podofo',
+           '../experimental/PdfViewer/',
          ],
          'sources': [
            '../samplecode/SamplePdfFileViewer.cpp',

samplecode/SamplePdfFileViewer.cpp

diff --git a/samplecode/SamplePdfFileViewer.cpp b/samplecode/SamplePdfFileViewer.cpp
index cd39901..fecc153 100644
--- a/samplecode/SamplePdfFileViewer.cpp
+++ b/samplecode/SamplePdfFileViewer.cpp
@@ -29,7 +29,7 @@
 #include "SkTypeface.h"
 #include "SkXfermode.h"
 
-#include "SkPodofoParsedPDF.h"
+#include "SkPdfRenderer.h"
 
 class PdfFileViewer : public SampleView {
 private:
@@ -39,11 +39,14 @@
     static SkPicture* LoadPdf(const char path[]) {
         SkPicture* pic = NULL;
 
-        SkPodofoParsedPDF doc(path);
-        if (doc.pages()) {
+        SkPdfRenderer renderer;
+        SkString skpath;
+        skpath.append(path);
+        renderer.load(skpath);
+        if (renderer.loaded()) {
             pic = SkNEW(SkPicture);
-            SkCanvas* canvas = pic->beginRecording((int)doc.width(0), (int)doc.height(0));
-            doc.drawPage(0, canvas);
+            SkCanvas* canvas = pic->beginRecording((int)renderer.MediaBox(0).width(), (int)renderer.MediaBox(0).height());
+            renderer.renderPage(0, canvas);
             pic->endRecording();
         }
         return pic;