Index: chrome/browser/printing/print_job_worker.cc |
diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc |
index e7cdf14c7fd54397ec6d955098f017c5714e6b00..b895bb61d3790eaf139c22941f6d655e606b0e32 100644 |
--- a/chrome/browser/printing/print_job_worker.cc |
+++ b/chrome/browser/printing/print_job_worker.cc |
@@ -373,12 +373,11 @@ void PrintJobWorker::OnDocumentDone() { |
return; |
} |
- owner_->PostTask(FROM_HERE, |
- base::Bind(&NotificationCallback, |
- make_scoped_refptr(owner_), |
- JobEventDetails::DOC_DONE, |
- document_, |
- scoped_refptr<PrintedPage>())); |
+ owner_->PostTask( |
+ FROM_HERE, |
+ base::Bind(&NotificationCallback, base::RetainedRef(owner_), |
+ JobEventDetails::DOC_DONE, base::RetainedRef(document_), |
+ base::RetainedRef<PrintedPage>(nullptr))); |
Nico
2016/03/18 21:01:01
RetainedRef<>(nullptr)? Why can't this just pass n
vmpstr
2016/03/18 22:20:23
Oh oops. I meant to go back and see if nullptr wor
|
// Makes sure the variables are reinitialized. |
document_ = NULL; |
@@ -389,12 +388,11 @@ void PrintJobWorker::SpoolPage(PrintedPage* page) { |
DCHECK_NE(page_number_, PageNumber::npos()); |
// Signal everyone that the page is about to be printed. |
- owner_->PostTask(FROM_HERE, |
- base::Bind(&NotificationCallback, |
- make_scoped_refptr(owner_), |
- JobEventDetails::NEW_PAGE, |
- document_, |
- make_scoped_refptr(page))); |
+ owner_->PostTask( |
+ FROM_HERE, |
+ base::Bind(&NotificationCallback, base::RetainedRef(owner_), |
+ JobEventDetails::NEW_PAGE, base::RetainedRef(document_), |
+ base::RetainedRef(page))); |
// Preprocess. |
if (printing_context_->NewPage() != PrintingContext::OK) { |
@@ -416,12 +414,11 @@ void PrintJobWorker::SpoolPage(PrintedPage* page) { |
} |
// Signal everyone that the page is printed. |
- owner_->PostTask(FROM_HERE, |
- base::Bind(&NotificationCallback, |
- make_scoped_refptr(owner_), |
- JobEventDetails::PAGE_DONE, |
- document_, |
- make_scoped_refptr(page))); |
+ owner_->PostTask( |
+ FROM_HERE, |
+ base::Bind(&NotificationCallback, base::RetainedRef(owner_), |
+ JobEventDetails::PAGE_DONE, base::RetainedRef(document_), |
+ base::RetainedRef(page))); |
} |
void PrintJobWorker::OnFailure() { |
@@ -430,12 +427,11 @@ void PrintJobWorker::OnFailure() { |
// We may loose our last reference by broadcasting the FAILED event. |
scoped_refptr<PrintJobWorkerOwner> handle(owner_); |
- owner_->PostTask(FROM_HERE, |
- base::Bind(&NotificationCallback, |
- make_scoped_refptr(owner_), |
- JobEventDetails::FAILED, |
- document_, |
- scoped_refptr<PrintedPage>())); |
+ owner_->PostTask( |
+ FROM_HERE, |
+ base::Bind(&NotificationCallback, base::RetainedRef(owner_), |
+ JobEventDetails::FAILED, base::RetainedRef(document_), |
+ base::RetainedRef<PrintedPage>(nullptr))); |
Nico
2016/03/18 21:01:01
same question
|
Cancel(); |
// Makes sure the variables are reinitialized. |