diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-10 05:46:45 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-10 05:46:45 +0000 |
| commit | dd7daa80d25deb78ab365e28df4d93437357793b (patch) | |
| tree | fb4dd2331820f5e32ddeb7e2bfb731f0604fbc0d /chrome/renderer/print_web_view_helper_win.cc | |
| parent | 64c40aa34646a198a04029ee6b78dd9559595dc5 (diff) | |
| download | chromium_src-dd7daa80d25deb78ab365e28df4d93437357793b.zip chromium_src-dd7daa80d25deb78ab365e28df4d93437357793b.tar.gz chromium_src-dd7daa80d25deb78ab365e28df4d93437357793b.tar.bz2 | |
Switch to WebFrame from the WebKit API.
I tried to avoid unnecessary changes in this CL to help make it easier to
review.
As part of this CL, glue/webtextinput* are folded into WebFrame / WebFrameImpl.
R=dglazkov
BUG=10034
TEST=none
Review URL: http://codereview.chromium.org/164225
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22896 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/print_web_view_helper_win.cc')
| -rw-r--r-- | chrome/renderer/print_web_view_helper_win.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/renderer/print_web_view_helper_win.cc b/chrome/renderer/print_web_view_helper_win.cc index e4e372a..fe7a8db 100644 --- a/chrome/renderer/print_web_view_helper_win.cc +++ b/chrome/renderer/print_web_view_helper_win.cc @@ -12,9 +12,10 @@ #include "grit/generated_resources.h" #include "printing/native_metafile.h" #include "webkit/api/public/WebConsoleMessage.h" -#include "webkit/glue/webframe.h" +#include "webkit/api/public/WebFrame.h" using WebKit::WebConsoleMessage; +using WebKit::WebFrame; using WebKit::WebString; #include "skia/ext/vector_canvas.h" @@ -42,7 +43,7 @@ void PrintWebViewHelper::Print(WebFrame* frame, bool script_initiated) { if (diff.InSeconds() < min_wait_seconds) { WebString message(WebString::fromUTF8( "Ignoring too frequent calls to print().")); - frame->AddMessageToConsole(WebConsoleMessage( + frame->addMessageToConsole(WebConsoleMessage( WebConsoleMessage::LevelWarning, message)); return; @@ -77,7 +78,7 @@ void PrintWebViewHelper::Print(WebFrame* frame, bool script_initiated) { { PrepareFrameAndViewForPrint prep_frame_view(default_settings, frame, - frame->GetView()); + frame->view()); expected_pages_count = prep_frame_view.GetExpectedPageCount(); DCHECK(expected_pages_count); } @@ -96,7 +97,7 @@ void PrintWebViewHelper::Print(WebFrame* frame, bool script_initiated) { // of this message has to deal with this. params.host_window_id = render_view_->host_window(); params.cookie = default_settings.document_cookie; - params.has_selection = frame->HasSelection(); + params.has_selection = frame->hasSelection(); params.expected_pages_count = expected_pages_count; msg = new ViewHostMsg_ScriptedPrint(params, @@ -195,7 +196,7 @@ void PrintWebViewHelper::PrintPage(const ViewMsg_PrintPage_Params& params, #else // 100% GDI based. skia::VectorCanvas canvas(hdc, size_x, size_y); - float webkit_shrink = frame->PrintPage(params.page_number, &canvas); + float webkit_shrink = frame->printPage(params.page_number, &canvas); if (shrink <= 0) { NOTREACHED() << "Printing page " << params.page_number << " failed."; } else { |