From 60745416082f8f0eebca05ad50da4bc0786f5a20 Mon Sep 17 00:00:00 2001 From: "jhawkins@chromium.org" Date: Mon, 27 Sep 2010 23:46:07 +0000 Subject: Printing: Push checking of |context| one level lower, as the different platforms have different expectations at this level. BUG=none TEST=none Review URL: http://codereview.chromium.org/3418034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60728 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/printing/print_job_worker.cc | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'chrome') diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc index cac0abf..20e51ea 100644 --- a/chrome/browser/printing/print_job_worker.cc +++ b/chrome/browser/printing/print_job_worker.cc @@ -137,9 +137,7 @@ void PrintJobWorker::StartPrinting(PrintedDocument* new_document) { DCHECK_EQ(document_, new_document); DCHECK(document_.get()); DCHECK(new_document->settings().Equals(printing_context_.settings())); -#if !defined(OS_MACOSX) - DCHECK(printing_context_.context()); -#endif + if (!document_.get() || page_number_ != PageNumber::npos() || document_ != new_document) { return; @@ -166,9 +164,7 @@ void PrintJobWorker::OnDocumentChanged(PrintedDocument* new_document) { DCHECK_EQ(page_number_, PageNumber::npos()); DCHECK(!new_document || new_document->settings().Equals(printing_context_.settings())); -#if !defined(OS_MACOSX) - DCHECK(printing_context_.context()); -#endif + if (page_number_ != PageNumber::npos()) return; @@ -182,11 +178,6 @@ void PrintJobWorker::OnNewPage() { } // message_loop() could return NULL when the print job is cancelled. DCHECK_EQ(message_loop(), MessageLoop::current()); -#if !defined(OS_MACOSX) - DCHECK(printing_context_.context()); - if (!printing_context_.context()) - return; -#endif if (page_number_ == PageNumber::npos()) { // Find first page to print. @@ -239,9 +230,6 @@ void PrintJobWorker::OnDocumentDone() { DCHECK_EQ(message_loop(), MessageLoop::current()); DCHECK_EQ(page_number_, PageNumber::npos()); DCHECK(document_.get()); -#if !defined(OS_MACOSX) - DCHECK(printing_context_.context()); -#endif if (printing_context_.DocumentDone() != PrintingContext::OK) { OnFailure(); -- cgit v1.1