[Print Preview] Modified PrepareFrameAndViewPrint class to call the new printBegin function to supp…

webkit/glue/webkit_glue.cc

 // Copyright (c) 2012 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 "webkit/glue/webkit_glue.h"
 
 #if defined(OS_WIN)
 #include <objidl.h>
 #include <mlang.h>
 #elif defined(OS_POSIX) && !defined(OS_MACOSX)
@@ skipping 19 matching lines @@
 #include "skia/ext/skia_utils_mac.h"
 #endif
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebData.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsAgent.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebGlyphCache.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebHistoryItem.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebImage.h"

[darin (slow to review), 2012/05/17 19:13:03]

nit: bonus points: consider re-sorting headers here, which was never done when
we introduced the "platform/" subdir :-(

[kmadhusu, 2012/05/17 20:16:29]

Done.

 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebPrintParams.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #if defined(OS_WIN)
 #include "third_party/WebKit/Source/WebKit/chromium/public/win/WebInputEventFactory.h"
 #endif
 #include "v8/include/v8.h"
 #include "webkit/glue/glue_serialize.h"
 #include "webkit/glue/user_agent.h"
 
 using WebKit::WebCanvas;
 using WebKit::WebData;
 using WebKit::WebDevToolsAgent;
 using WebKit::WebElement;
 using WebKit::WebFrame;
 using WebKit::WebGlyphCache;
 using WebKit::WebHistoryItem;
 using WebKit::WebImage;
+using WebKit::WebPrintParams;
+using WebKit::WebRect;
 using WebKit::WebSize;
 using WebKit::WebString;
 using WebKit::WebVector;
 using WebKit::WebView;
 
 static const char kLayoutTestsPattern[] = "/LayoutTests/";
 static const std::string::size_type kLayoutTestsPatternSize =
     arraysize(kLayoutTestsPattern) - 1;
 static const char kFileUrlPattern[] = "file:/";
 static const char kDataUrlPattern[] = "data:";
@@ skipping 79 matching lines @@
   return web_frame->pageNumberForElementById(WebString::fromUTF8(id),
                                              page_width_in_pixels,
                                              page_height_in_pixels);
 }
 
 int NumberOfPages(WebFrame* web_frame,
                   float page_width_in_pixels,
                   float page_height_in_pixels) {
   WebSize size(static_cast<int>(page_width_in_pixels),
                static_cast<int>(page_height_in_pixels));
-  int number_of_pages = web_frame->printBegin(size);
+
+  WebPrintParams print_params;
+  print_params.paperSize = size;
+  print_params.printContentArea = WebRect(0, 0, size.width, size.height);
+  print_params.printableArea = WebRect(0, 0, size.width, size.height);
+
+  int number_of_pages = web_frame->printBegin(print_params);
   web_frame->printEnd();
   return number_of_pages;
 }
 
 string16 DumpFrameScrollPosition(WebFrame* web_frame, bool recursive) {
   gfx::Size offset = web_frame->scrollOffset();
   std::string result_utf8;
 
   if (offset.width() > 0 || offset.height() > 0) {
     if (web_frame->parent()) {
@@ skipping 335 matching lines @@
     case WebKit::WebReferrerPolicyAlways:
     case WebKit::WebReferrerPolicyNever:
     case WebKit::WebReferrerPolicyOrigin:
       net_referrer_policy = net::URLRequest::NEVER_CLEAR_REFERRER;
       break;
   }
   request->set_referrer_policy(net_referrer_policy);
 }
 
 } // namespace webkit_glue