pdfviewer: if the resources are missing, exit (right now inheritance is not implemented)
Review URL: https://codereview.chromium.org/23125015
git-svn-id: http://skia.googlecode.com/svn/trunk@10875 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/experimental/PdfViewer/SkPdfRenderer.cpp b/experimental/PdfViewer/SkPdfRenderer.cpp
index 21e4287..7fa1c15 100644
--- a/experimental/PdfViewer/SkPdfRenderer.cpp
+++ b/experimental/PdfViewer/SkPdfRenderer.cpp
@@ -1041,6 +1041,12 @@
return kIgnoreError_SkPdfResult;
}
+ pdfContext->fGraphicsState.fResources = skobj->Resources(pdfContext->fPdfDoc);
+
+ if (!pdfContext->fGraphicsState.fResources) {
+ return kIgnoreError_SkPdfResult; // probably it is null because we have not implemented yet inheritance
+ }
+
if (CheckRecursiveRendering::IsInRendering(skobj)) {
// Oops, corrupt PDF!
return kIgnoreError_SkPdfResult;
@@ -1050,11 +1056,6 @@
PdfOp_q(pdfContext, canvas, NULL);
-
- if (skobj->Resources(pdfContext->fPdfDoc)) {
- pdfContext->fGraphicsState.fResources = skobj->Resources(pdfContext->fPdfDoc);
- }
-
// TODO(edisonn): MediaBox can be inherited!!!!
SkRect bbox = skobj->MediaBox(pdfContext->fPdfDoc);
if (skobj->has_Group()) {