Linux: Simplify printing code and make it more reliable during shutdown.

chrome/browser/printing/print_dialog_gtk.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/printing/print_dialog_gtk.h"
 
 #include <fcntl.h>
 #include <gtk/gtkpagesetupunixdialog.h>
 #include <gtk/gtkprintjob.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
 #include <string>
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/file_util_proxy.h"
 #include "base/logging.h"
-#include "base/synchronization/waitable_event.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "printing/metafile.h"
 #include "printing/print_job_constants.h"
 #include "printing/print_settings_initializer_gtk.h"
 
 using printing::PageRanges;
 using printing::PrintSettings;
 
@@ skipping 96 matching lines @@
     g_object_unref(page_setup_);
     page_setup_ = NULL;
   }
   if (printer_) {
     g_object_unref(printer_);
     printer_ = NULL;
   }
 }
 
 void PrintDialogGtk::UseDefaultSettings() {
-  DCHECK(!save_document_event_.get());
   DCHECK(!page_setup_);
 
   // |gtk_settings_| is a new object.
   gtk_settings_ = gtk_print_settings_new();
 
   scoped_ptr<GtkPrinterList> printer_list(new GtkPrinterList);
   printer_ = printer_list->default_printer();
   if (printer_) {
     g_object_ref(printer_);
     gtk_print_settings_set_printer(gtk_settings_,
@@ skipping 62 matching lines @@
       gtk_settings_,
       landscape ? GTK_PAGE_ORIENTATION_LANDSCAPE :
                   GTK_PAGE_ORIENTATION_PORTRAIT);
 
   InitPrintSettings(ranges);
   return true;
 }
 
 void PrintDialogGtk::ShowDialog(
     PrintingContextCairo::PrintSettingsCallback* callback) {
-  DCHECK(!save_document_event_.get());
-
   callback_ = callback;
 
   GtkWindow* parent = BrowserList::GetLastActive()->window()->GetNativeHandle();
   // TODO(estade): We need a window title here.
   dialog_ = gtk_print_unix_dialog_new(NULL, parent);
   g_signal_connect(dialog_, "delete-event",
                    G_CALLBACK(gtk_widget_hide_on_delete), NULL);
 
 
   // Set modal so user cannot focus the same tab and press print again.
@@ skipping 18 matching lines @@
 }
 
 void PrintDialogGtk::PrintDocument(const printing::Metafile* metafile,
                                    const string16& document_name) {
   // This runs on the print worker thread, does not block the UI thread.
   DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // The document printing tasks can outlive the PrintingContext that created
   // this dialog.
   AddRef();
-  DCHECK(!save_document_event_.get());
-  save_document_event_.reset(new base::WaitableEvent(false, false));
 
-  BrowserThread::PostTask(
-      BrowserThread::FILE, FROM_HERE,
-      NewRunnableMethod(this,
-                        &PrintDialogGtk::SaveDocumentToDisk,
-                        metafile,
-                        document_name));
-  // Wait for SaveDocumentToDisk() to finish.
-  save_document_event_->Wait();
+  bool error = false;
+  if (!file_util::CreateTemporaryFile(&path_to_pdf_)) {
+    LOG(ERROR) << "Creating temporary file failed";
+    error = true;
+  }
+
+  if (!error && !metafile->SaveTo(path_to_pdf_)) {
+    LOG(ERROR) << "Saving metafile failed";
+    file_util::Delete(path_to_pdf_, false);
+    error = true;
+  }
+
+  if (error) {
+    // Matches AddRef() above.
+    Release();
+  } else {
+    // No errors, continue printing.
+    BrowserThread::PostTask(
+        BrowserThread::UI, FROM_HERE,
+        NewRunnableMethod(this,
+                          &PrintDialogGtk::SendDocumentToPrinter,
+                          document_name));
+  }
 }
 
 void PrintDialogGtk::AddRefToDialog() {
   AddRef();
 }
 
 void PrintDialogGtk::ReleaseDialog() {
   Release();
 }
 
@@ skipping 48 matching lines @@
       callback_ = NULL;
       return;
     }
     case GTK_RESPONSE_APPLY:
     default: {
       NOTREACHED();
     }
   }
 }
 
-void PrintDialogGtk::SaveDocumentToDisk(const printing::Metafile* metafile,
-                                        const string16& document_name) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-
-  bool error = false;
-  if (!file_util::CreateTemporaryFile(&path_to_pdf_)) {
-    LOG(ERROR) << "Creating temporary file failed";
-    error = true;
-  }
-
-  if (!error && !metafile->SaveTo(path_to_pdf_)) {
-    LOG(ERROR) << "Saving metafile failed";
-    file_util::Delete(path_to_pdf_, false);
-    error = true;
-  }
-
-  // Done saving, let PrintDialogGtk::PrintDocument() continue.
-  save_document_event_->Signal();
-
-  if (error) {
-    // Matches AddRef() in PrintDocument();
-    Release();
-  } else {
-    // No errors, continue printing.
-    BrowserThread::PostTask(
-        BrowserThread::UI, FROM_HERE,
-        NewRunnableMethod(this,
-                          &PrintDialogGtk::SendDocumentToPrinter,
-                          document_name));
-  }
-}
-
 void PrintDialogGtk::SendDocumentToPrinter(const string16& document_name) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // If |printer_| is NULL then somehow the GTK printer list changed out under
   // us. In which case, just bail out.
   if (!printer_) {
     // Matches AddRef() in PrintDocument();
     Release();
     return;
   }
@@ skipping 27 matching lines @@
   // Printing finished. Matches AddRef() in PrintDocument();
   Release();
 }
 
 void PrintDialogGtk::InitPrintSettings(const PageRanges& page_ranges) {
   PrintSettings settings;
   printing::PrintSettingsInitializerGtk::InitPrintSettings(
       gtk_settings_, page_setup_, page_ranges, false, &settings);
   context_->InitWithSettings(settings);
 }