Move Start/EndPage() from NewPage/PageDone() to inside the metafile.

printing/printing_context_win.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 "printing/printing_context_win.h"
 
 #include <winspool.h>
 
 #include "base/i18n/file_util_icu.h"
 #include "base/i18n/time_formatting.h"
@@ skipping 280 matching lines @@
   // IPC. Make sure recursive task processing is disabled.
   if (StartDoc(context_, &di) <= 0)
     return OnError();
 
   return OK;
 }
 
 PrintingContext::Result PrintingContextWin::NewPage() {
   if (abort_printing_)
     return CANCEL;
-
   DCHECK(context_);
   DCHECK(in_print_job_);
 
-  // Inform the driver that the application is about to begin sending data.
-  if (StartPage(context_) <= 0)
-    return OnError();
+  // Intentional No-op. NativeMetafile::SafePlayback takes care of calling
+  // ::StartPage().
 
   return OK;
 }
 
 PrintingContext::Result PrintingContextWin::PageDone() {
   if (abort_printing_)
     return CANCEL;
   DCHECK(in_print_job_);
 
-  if (EndPage(context_) <= 0)
-    return OnError();
+  // Intentional No-op. NativeMetafile::SafePlayback takes care of calling
+  // ::EndPage().
+
   return OK;
 }
 
 PrintingContext::Result PrintingContextWin::DocumentDone() {
   if (abort_printing_)
     return CANCEL;
   DCHECK(in_print_job_);
   DCHECK(context_);
 
   // Inform the driver that document has ended.
@@ skipping 282 matching lines @@
   if (buf_size) {
     buffer->reset(new uint8[buf_size]);
     memset(buffer->get(), 0, buf_size);
     if (!GetPrinter(printer, level, buffer->get(), buf_size, &buf_size)) {
       buffer->reset();
     }
   }
 }
 
 }  // namespace printing