diff options
| author | kmadhusu@chromium.org <kmadhusu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-17 23:04:42 +0000 |
|---|---|---|
| committer | kmadhusu@chromium.org <kmadhusu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-17 23:04:42 +0000 |
| commit | 5c2e3cce2bbb6dc5862a950caf962c02c877bfe7 (patch) | |
| tree | 526964d7eaf9935a2453c9db936eef1a56e49f0f /webkit | |
| parent | 078928b2f9846fbc5c97187b5e0a2dde0ab3ccf4 (diff) | |
| download | chromium_src-5c2e3cce2bbb6dc5862a950caf962c02c877bfe7.zip chromium_src-5c2e3cce2bbb6dc5862a950caf962c02c877bfe7.tar.gz chromium_src-5c2e3cce2bbb6dc5862a950caf962c02c877bfe7.tar.bz2 | |
Use overloaded printBegin() chromium-webkit api in PrepareFrameAndViewPrint class and webkit-glue.cc
BUG=85132
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10168013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137761 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/webkit_glue.cc | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc index f2a1205..7eb8cfa 100644 --- a/webkit/glue/webkit_glue.cc +++ b/webkit/glue/webkit_glue.cc @@ -31,17 +31,19 @@ #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/platform/WebImage.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/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" #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.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/WebPrintParams.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" @@ -58,6 +60,8 @@ 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; @@ -157,7 +161,13 @@ int NumberOfPages(WebFrame* web_frame, 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; } |