From 180ab7e2fca1f1a4e1431dba77806ab91737070a Mon Sep 17 00:00:00 2001 From: "dcheng@chromium.org" Date: Fri, 20 Dec 2013 02:49:56 +0000 Subject: Convert remaining uses of WebView::initializeMainFrame to setMainFrame. This is the Chrome-side change. Fixing this makes inverting the owning relationship between WebFrame and Frame easier. BUG=329266 R=ajwong@chromium.org, bauerb@chromium.org, boliu@chromium.org, ddorwin@chromium.org, scottbyer@chromium.org Review URL: https://codereview.chromium.org/114773003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242016 0039d316-1c4b-4281-b951-d872f2087c98 --- android_webview/renderer/print_web_view_helper.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'android_webview') diff --git a/android_webview/renderer/print_web_view_helper.cc b/android_webview/renderer/print_web_view_helper.cc index ed172f7..df8b34e 100644 --- a/android_webview/renderer/print_web_view_helper.cc +++ b/android_webview/renderer/print_web_view_helper.cc @@ -433,9 +433,8 @@ void PrintWebViewHelper::PrintHeaderAndFooter( blink::WebView* web_view = blink::WebView::create(NULL); web_view->settings()->setJavaScriptEnabled(true); - web_view->initializeMainFrame(NULL); - - blink::WebFrame* frame = web_view->mainFrame(); + blink::WebFrame* frame = blink::WebFrame::create(NULL) + web_view->setMainFrame(web_frame); base::StringValue html( ResourceBundle::GetSharedInstance().GetLocalizedString( @@ -461,6 +460,7 @@ void PrintWebViewHelper::PrintHeaderAndFooter( frame->printEnd(); web_view->close(); + frame->close(); device->setDrawingArea(SkPDFDevice::kContent_DrawingArea); #endif @@ -650,7 +650,7 @@ void PrepareFrameAndViewForPrint::CopySelection( blink::WebView* web_view = blink::WebView::create(this); owns_web_view_ = true; content::ApplyWebPreferences(prefs, web_view); - web_view->initializeMainFrame(this); + web_view->setMainFrame(blink::WebFrame::create(this)); frame_.Reset(web_view->mainFrame()); node_to_print_.reset(); @@ -704,6 +704,7 @@ void PrepareFrameAndViewForPrint::FinishPrinting() { DCHECK(!frame->isLoading()); owns_web_view_ = false; web_view->close(); + frame->close(); } } frame_.Reset(NULL); -- cgit v1.1