Windows: Make it possible to print text with GDI.

printing/printing_context_win.cc

 // Copyright (c) 2012 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 "printing/printing_context_win.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/memory/free_deleter.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "printing/backend/print_backend.h"
 #include "printing/backend/win_helper.h"
 #include "printing/print_settings_initializer_win.h"
 #include "printing/printed_document.h"
 #include "printing/printing_context_system_dialog_win.h"
 #include "printing/printing_utils.h"
 #include "printing/units.h"
 #include "skia/ext/skia_utils_win.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
 
 namespace printing {
 
 namespace {
 
-void AssingResult(PrintingContext::Result* out, PrintingContext::Result in) {

[scottmg, 2016/06/30 17:48:31]

(probably meant to be "assign"? not sure)

[Lei Zhang, 2016/06/30 22:29:35]

Oh, ya, that would make more sense. :)

+void PassingResult(PrintingContext::Result* out, PrintingContext::Result in) {
   *out = in;
 }
 
 }  // namespace
 
 // static
 std::unique_ptr<PrintingContext> PrintingContext::Create(Delegate* delegate) {
 #if defined(ENABLE_BASIC_PRINTING)
-  return base::WrapUnique(new PrintingContextSytemDialogWin(delegate));
-#else   // ENABLE_BASIC_PRINTING
+  return base::WrapUnique(new PrintingContextSystemDialogWin(delegate));
+#else
   return base::WrapUnique(new PrintingContextWin(delegate));
-#endif  // EENABLE_BASIC_PRINTING
+#endif
 }
 
 PrintingContextWin::PrintingContextWin(Delegate* delegate)
     : PrintingContext(delegate), context_(NULL) {
 }
 
 PrintingContextWin::~PrintingContextWin() {
   ReleaseContext();
 }
 
@@ skipping 150 matching lines @@
       dev_mode->dmPaperWidth = width;
       dev_mode->dmFields |= DM_PAPERLENGTH;
       dev_mode->dmPaperLength = height;
     }
   }
 
   // Update data using DocumentProperties.
   if (show_system_dialog) {
     PrintingContext::Result result = PrintingContext::FAILED;
     AskUserForSettings(page_count, false, false,
-                       base::Bind(&AssingResult, &result));
+                       base::Bind(&PassingResult, &result));
     return result;
-  } else {
-    scoped_dev_mode = CreateDevMode(printer.Get(), scoped_dev_mode.get());
   }
   // Set printer then refresh printer settings.
+  scoped_dev_mode = CreateDevMode(printer.Get(), scoped_dev_mode.get());

[scottmg, 2016/06/30 17:48:31]

I don't understand this change, why do we need to always do this now?

[Lei Zhang, 2016/06/30 22:29:35]

It's an else after return. e.g.

if (foo)
  return bar;
else
  qux;

is the same as:

if (foo)
  return bar;
qux;

[scottmg, 2016/06/30 22:31:53]

Doh sorry, missed the return.

   return InitializeSettings(settings_.device_name(), scoped_dev_mode.get());
 }
 
 PrintingContext::Result PrintingContextWin::InitWithSettings(
     const PrintSettings& settings) {
   DCHECK(!in_print_job_);
 
   settings_ = settings;
 
   // TODO(maruel): settings_.ToDEVMODE()
@@ skipping 137 matching lines @@
   if (view && view->GetHost())
     window = view->GetHost()->GetAcceleratedWidget();
   if (!window) {
     // TODO(maruel):  crbug.com/1214347 Get the right browser window instead.
     return GetDesktopWindow();
   }
   return window;
 }
 
 }  // namespace printing