diff options
| author |  edisonn@google.com <edisonn@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-22 15:48:35 +0000 |
|---|---|---|
| committer | edisonn@google.com <edisonn@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-22 15:48:35 +0000 |
| commit | 73613c16e154f08d01de98f03a3b10c474d5c9fb (patch) | |
| tree | 3fa1833b1a79a7e979c7fa1f0e4c81a4c10c3eb7 /experimental | |
| parent | 330313a8a8343876ee596da39da06a5d69badd9c (diff) | |
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
Diffstat (limited to 'experimental')
| -rw-r--r-- | experimental/PdfViewer/SkPdfRenderer.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/experimental/PdfViewer/SkPdfRenderer.cpp b/experimental/PdfViewer/SkPdfRenderer.cpp index 21e428777b..7fa1c1502e 100644 --- a/experimental/PdfViewer/SkPdfRenderer.cpp +++ b/experimental/PdfViewer/SkPdfRenderer.cpp @@ -1041,6 +1041,12 @@ static SkPdfResult doPage(SkPdfContext* pdfContext, SkCanvas* canvas, SkPdfPageO 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 @@ static SkPdfResult doPage(SkPdfContext* pdfContext, SkCanvas* canvas, SkPdfPageO 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()) { |