Skip to content
Snippets Groups Projects
Commit 60745416 authored by jhawkins@chromium.org's avatar jhawkins@chromium.org
Browse files

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
parent be8aea74
No related merge requests found
......@@ -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();
......
......@@ -330,6 +330,7 @@ PrintingContext::Result PrintingContext::DocumentDone() {
if (abort_printing_)
return CANCEL;
DCHECK(in_print_job_);
DCHECK(context_);
// Inform the driver that document has ended.
if (EndDoc(context_) <= 0)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment