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 60 matching lines @@
   // 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));
   {
     base::AutoLock lock(lock_);
     mutable_.pages_[page_number] = page;
+    mutable_.shrink_factor = shrink;
 
 #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);

[vandebo (ex-Chrome), 2012/01/03 21:55:12]

I think this DCHECK is saying that shrink must be consistent across all pages. 
Are we changing that assumption?

[kmadhusu, 2012/01/04 16:55:35]

Still working on this.

[kmadhusu, 2012/01/05 01:15:47]

Moved shrink_factor to PrintedPage class.

-    }
   }
   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 129 matching lines @@
 }
 
 #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