diff options
| author | thestig <thestig@chromium.org> | 2016-01-29 08:53:51 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-29 16:54:55 +0000 |
| commit | 644f4d8731599a7137de1230acc454cd813dd3ba (patch) | |
| tree | 852624bc2cba9df4284a3169eb66fbe37476966a /pdf | |
| parent | 9a8e892c20f14492af3cade9c6444de4e1267c1a (diff) | |
| download | chromium_src-644f4d8731599a7137de1230acc454cd813dd3ba.zip chromium_src-644f4d8731599a7137de1230acc454cd813dd3ba.tar.gz chromium_src-644f4d8731599a7137de1230acc454cd813dd3ba.tar.bz2 | |
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}
Diffstat (limited to 'pdf')
| -rw-r--r-- | pdf/pdfium/pdfium_engine.cc | 5 | ||||
| -rw-r--r-- | pdf/preview_mode_client.cc | 3 |
2 files changed, 5 insertions, 3 deletions
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( |