Merge r12905....

chrome/renderer/render_view.cc

 // Copyright (c) 2006-2008 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/render_view.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 446 matching lines @@
                            WebFrame* frame) {
 #if defined(OS_WIN)
   // Generate a memory-based EMF file. The EMF will use the current screen's
   // DPI.
   gfx::Emf emf;
 
   emf.CreateDc(NULL, NULL);
   HDC hdc = emf.hdc();
   DCHECK(hdc);
   skia::PlatformDeviceWin::InitializeDC(hdc);
-  int size_x = canvas_size.width();
-  int size_y = canvas_size.height();
+  // Since WebKit extends the page width depending on the magical shrink
+  // factor we make sure the canvas covers the worst case scenario 
+  // (x2.0 currently).  PrintContext will then set the correct clipping region.
+  int size_x = static_cast<int>(canvas_size.width() * params.params.max_shrink);
+  int size_y = static_cast<int>(canvas_size.height() *
+      params.params.max_shrink);
   // Calculate the dpi adjustment.
   float shrink = static_cast<float>(canvas_size.width()) /
       params.params.printable_size.width();
 #if 0
   // TODO(maruel): This code is kept for testing until the 100% GDI drawing
   // code is stable. maruels use this code's output as a reference when the
   // GDI drawing code fails.
 
   // Mix of Skia and GDI based.
   skia::PlatformCanvasWin canvas(size_x, size_y, true);
@@ skipping 2479 matching lines @@
 void RenderView::OnExtensionResponse(int callback_id,
                                      const std::string& response) {
   WebFrame* web_frame = pending_extension_callbacks_.Lookup(callback_id);
   if (!web_frame)
     return;  // The frame went away.
 
   extensions_v8::ExtensionProcessBindings::ExecuteCallbackInFrame(
       web_frame, callback_id, response);
   pending_extension_callbacks_.Remove(callback_id);
 }