PrintPreview: Honor the print media page size and margin values.

printing/printed_document.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 <algorithm>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 56 matching lines @@
                               Metafile* metafile,
                               double shrink,
                               const gfx::Size& paper_size,
                               const gfx::Rect& page_rect) {
   // Notice the page_number + 1, the reason is that this is the value that will
   // be shown. Users dislike 0-based counting.
   scoped_refptr<PrintedPage> page(
       new PrintedPage(page_number + 1,
                       metafile,
                       paper_size,
-                      page_rect));
+                      page_rect,
+                      shrink));
   {
     base::AutoLock lock(lock_);
     mutable_.pages_[page_number] = page;
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
     if (page_number < mutable_.first_page)
       mutable_.first_page = page_number;
 #endif
-
-    if (mutable_.shrink_factor == 0) {
-      mutable_.shrink_factor = shrink;
-    } else {
-      DCHECK_EQ(mutable_.shrink_factor, shrink);
-    }
   }
   DebugDump(*page);
 }
 
 bool PrintedDocument::GetPage(int page_number,
                               scoped_refptr<PrintedPage>* page) {
   base::AutoLock lock(lock_);
   PrintedPages::const_iterator itr = mutable_.pages_.find(page_number);
   if (itr != mutable_.pages_.end()) {
     if (itr->second.get()) {
@@ skipping 99 matching lines @@
   g_debug_dump_info.Get().debug_dump_path = debug_dump_path;
 }
 
 const FilePath& PrintedDocument::debug_dump_path() {
   return g_debug_dump_info.Get().debug_dump_path;
 }
 
 PrintedDocument::Mutable::Mutable(PrintedPagesSource* source)
     : source_(source),
       expected_page_count_(0),
-      page_count_(0),
-      shrink_factor(0) {
+      page_count_(0) {
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
   first_page = INT_MAX;
 #endif
 }
 
 PrintedDocument::Mutable::~Mutable() {
 }
 
 PrintedDocument::Immutable::Immutable(const PrintSettings& settings,
                                       PrintedPagesSource* source,
                                       int cookie)
     : settings_(settings),
       source_message_loop_(MessageLoop::current()),
       name_(source->RenderSourceName()),
       cookie_(cookie) {
 }
 
 PrintedDocument::Immutable::~Immutable() {
 }
 
 #if defined(OS_POSIX) && defined(USE_AURA)
 // This function is not used on aura linux/chromeos.
 void PrintedDocument::RenderPrintedPage(const PrintedPage& page,
                                         PrintingContext* context) const {
 }
 #endif
 
 }  // namespace printing