From 644f4d8731599a7137de1230acc454cd813dd3ba Mon Sep 17 00:00:00 2001 From: thestig Date: Fri, 29 Jan 2016 08:53:51 -0800 Subject: PDF: Fix a crash from r372196 with the print preview PDFEngine client. TEST=Print preview does not crash BUG=582345 Review URL: https://codereview.chromium.org/1645073004 Cr-Commit-Position: refs/heads/master@{#372360} --- pdf/pdfium/pdfium_engine.cc | 5 ++++- pdf/preview_mode_client.cc | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'pdf') diff --git a/pdf/pdfium/pdfium_engine.cc b/pdf/pdfium/pdfium_engine.cc index 6295ce4..6f8f4b3 100644 --- a/pdf/pdfium/pdfium_engine.cc +++ b/pdf/pdfium/pdfium_engine.cc @@ -608,7 +608,10 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Client* client) IFSDK_PAUSE::NeedToPauseNow = Pause_NeedToPauseNow; #if defined(OS_LINUX) - g_last_instance_id = client_->GetPluginInstance()->pp_instance(); + // PreviewModeClient does not know its pp::Instance. + pp::Instance* instance = client_->GetPluginInstance(); + if (instance) + g_last_instance_id = instance->pp_instance(); #endif } diff --git a/pdf/preview_mode_client.cc b/pdf/preview_mode_client.cc index 7c74dabb..f1c3e4a 100644 --- a/pdf/preview_mode_client.cc +++ b/pdf/preview_mode_client.cc @@ -138,8 +138,7 @@ void PreviewModeClient::DocumentLoadFailed() { } pp::Instance* PreviewModeClient::GetPluginInstance() { - NOTREACHED(); - return NULL; + return nullptr; } void PreviewModeClient::DocumentHasUnsupportedFeature( -- cgit v1.1