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

printing/printed_document_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/printed_document.h"
 
+#include <winspool.h>
+
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "printing/page_number.h"
 #include "printing/page_overlays.h"
 #include "printing/printed_pages_source.h"
 #include "printing/printed_page.h"
 #include "printing/units.h"
 #include "skia/ext/platform_device.h"
 #include "ui/gfx/font.h"
@@ skipping 53 matching lines @@
   GetDateFormat(LOCALE_USER_DEFAULT, NULL, &date, format_ptr,
                 WriteInto(&output, buffer_size), buffer_size);
 
   return output;
 }
 
 }  // namespace
 
 namespace printing {
 
-void PrintedDocument::RenderPrintedPage(
+bool PrintedDocument::RenderPrintedPage(
     const PrintedPage& page, gfx::NativeDrawingContext context) const {
 #ifndef NDEBUG
   {
     // Make sure the page is from our list.
     base::AutoLock lock(lock_);
     DCHECK(&page == mutable_.pages_.find(page.page_number() - 1)->second.get());
   }
 #endif
 
   DCHECK(context);
 
   const printing::PageSetup& page_setup(
       immutable_.settings_.page_setup_device_units());
   gfx::Rect content_area;
   page.GetCenteredPageContentRect(page_setup.physical_size(), &content_area);
 
+  // Inform the driver that the application is about to begin sending data.
+  if (StartPage(context) <= 0)

[vandebo (ex-Chrome), 2011/03/15 17:23:06]

We wanted to move this to PrintWebViewHelper::RenderPage

[dpapad, 2011/03/15 20:32:32]

Done.

+    return false;
+
   // Save the state to make sure the context this function call does not modify
   // the device context.
   int saved_state = SaveDC(context);
   DCHECK_NE(saved_state, 0);
   skia::PlatformDevice::InitializeDC(context);
   {
     // Save the state (again) to apply the necessary world transformation.
     int saved_state = SaveDC(context);
     DCHECK_NE(saved_state, 0);
 
@@ skipping 39 matching lines @@
   PrintHeaderFooter(context, page, PageOverlays::RIGHT, PageOverlays::TOP,
                     font);
   PrintHeaderFooter(context, page, PageOverlays::LEFT, PageOverlays::BOTTOM,
                     font);
   PrintHeaderFooter(context, page, PageOverlays::CENTER, PageOverlays::BOTTOM,
                     font);
   PrintHeaderFooter(context, page, PageOverlays::RIGHT, PageOverlays::BOTTOM,
                     font);
   int res = RestoreDC(context, saved_state);
   DCHECK_NE(res, 0);
+
+  if (EndPage(context) <= 0)
+    return false;
+  return true;
 }
 
 void PrintedDocument::Immutable::SetDocumentDate() {
   // Use the native time formatting for printing on Windows.
   SYSTEMTIME systemtime;
   GetLocalTime(&systemtime);
   date_ =
       WideToUTF16Hack(FormatSystemDate(systemtime, std::wstring()));
   time_ =
       WideToUTF16Hack(FormatSystemTime(systemtime, std::wstring()));
@@ skipping 11 matching lines @@
   DCHECK(result == SIMPLEREGION || result == COMPLEXREGION);
   TextOut(context,
           bounds.x(), bounds.y(),
           text.c_str(),
           static_cast<int>(text.size()));
   int res = RestoreDC(context, saved_state);
   DCHECK_NE(res, 0);
 }
 
 }  // namespace printing