commit 1066f0837892102399a323b8883417cc368f0342
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Jan 10 19:09:00 2014 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Jan 10 19:09:00 2014 +0000
tree b636aed076867a339f604a318218efc5cad2c7a1
parent 5c6f1d4424191539ebe5a5c3db883716d67efe12

If poppler is disable and native pdf is enabled, we still need SkPDFRasterizer.cpp

R=reed@google.com
TBR=reed@google.com
NOTREECHECKS=true
NOTRY=true

Author: vandebo@chromium.org

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

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

gyp/gm.gyp

diff --git a/gyp/gm.gyp b/gyp/gm.gyp
index 657bc56..971fce5 100644
--- a/gyp/gm.gyp
+++ b/gyp/gm.gyp
@@ -62,6 +62,11 @@
         'pdf.gyp:pdf',
       ],
       'conditions': [
+        ['skia_run_pdfviewer_in_gm or skia_poppler_enabled', {
+          'sources': [
+            '../src/utils/SkPDFRasterizer.cpp',
+          ],
+        }],
         ['skia_run_pdfviewer_in_gm', {
           'defines': [
             'SK_BUILD_NATIVE_PDF_RENDERER',
@@ -77,9 +82,6 @@
           'dependencies': [
             'poppler.gyp:libpoppler-cpp-gpl',
           ],
-          'sources': [
-            '../src/utils/SkPDFRasterizer.cpp',
-          ],
           'defines': [
             'SK_BUILD_POPPLER',
           ],

src/utils/SkPDFRasterizer.cpp

diff --git a/src/utils/SkPDFRasterizer.cpp b/src/utils/SkPDFRasterizer.cpp
index 89ac401..68a3119 100644
--- a/src/utils/SkPDFRasterizer.cpp
+++ b/src/utils/SkPDFRasterizer.cpp
@@ -11,17 +11,21 @@
 #pragma warning(disable : 4530)
 #endif
 
-#include <poppler-document.h>
-#include <poppler-image.h>
-#include <poppler-page.h>
-#include <poppler-page-renderer.h>
-
 #include "SkPDFRasterizer.h"
 #include "SkColorPriv.h"
+
 #ifdef SK_BUILD_NATIVE_PDF_RENDERER
 #include "SkPdfRenderer.h"
 #endif  // SK_BUILD_NATIVE_PDF_RENDERER
 
+#ifdef SK_BUILD_POPPLER
+#include <poppler-document.h>
+#include <poppler-image.h>
+#include <poppler-page.h>
+#include <poppler-page-renderer.h>
+#endif  // SK_BUILD_POPPLER
+
+#ifdef SK_BUILD_POPPLER
 bool SkPopplerRasterizePDF(SkStream* pdf, SkBitmap* output) {
   size_t size = pdf->getLength();
   SkAutoFree buffer(sk_malloc_throw(size));
@@ -74,6 +78,7 @@
 
   return true;
 }
+#endif  // SK_BUILD_POPPLER
 
 #ifdef SK_BUILD_NATIVE_PDF_RENDERER
 bool SkNativeRasterizePDF(SkStream* pdf, SkBitmap* output) {

src/utils/SkPDFRasterizer.h

diff --git a/src/utils/SkPDFRasterizer.h b/src/utils/SkPDFRasterizer.h
index ebc9fa6..82ec092 100644
--- a/src/utils/SkPDFRasterizer.h
+++ b/src/utils/SkPDFRasterizer.h
@@ -10,7 +10,9 @@
 #include "SkBitmap.h"
 #include "SkStream.h"
 
+#ifdef SK_BUILD_POPPLER
 bool SkPopplerRasterizePDF(SkStream* pdf, SkBitmap* output);
+#endif  // SK_BUILD_POPPLER
 
 #ifdef SK_BUILD_NATIVE_PDF_RENDERER
 bool SkNativeRasterizePDF(SkStream* pdf, SkBitmap* output);