Merge 104615 - Sanity check the printable area returned by windows.

chrome/renderer/print_web_view_helper.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 "chrome/renderer/print_web_view_helper.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 978 matching lines @@
                            margin_left_in_pixels -
                            margin_right_in_pixels);
   page_layout_in_points->content_height =
       ConvertPixelsToPoint(page_size_in_pixels.height -
                            margin_top_in_pixels -
                            margin_bottom_in_pixels);
 
   // Invalid page size and/or margins. We just use the default setting.
   if (page_layout_in_points->content_width < 1.0 ||
       page_layout_in_points->content_height < 1.0) {
-    // TODO(vandebo) remove CHECK after debugging crbug.com/96063
     CHECK(frame != NULL);
     GetPageSizeAndMarginsInPoints(NULL, page_index, default_params,
                                   page_layout_in_points);
     return;
   }
 
     page_layout_in_points->margin_top =
         ConvertPixelsToPointDouble(margin_top_in_pixels);
     page_layout_in_points->margin_right =
         ConvertPixelsToPointDouble(margin_right_in_pixels);
@@ skipping 519 matching lines @@
 const gfx::Size&
 PrintWebViewHelper::PrintPreviewContext::GetPrintCanvasSize() const {
   return prep_frame_view_->GetPrintCanvasSize();
 }
 
 void PrintWebViewHelper::PrintPreviewContext::ClearContext() {
   prep_frame_view_.reset();
   metafile_.reset();
   pages_to_render_.clear();
 }