diff options
author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-01 22:35:27 +0000 |
---|---|---|
committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-01 22:35:27 +0000 |
commit | b4bb25099b2bc9b1bc1df1b231c859ef82110e7d (patch) | |
tree | 5bf82ee33816b9066e5a829b6a256a747021fc93 /chrome | |
parent | 87772ec3b0265c72efd0bace14b30fafeee97769 (diff) | |
download | chromium_src-b4bb25099b2bc9b1bc1df1b231c859ef82110e7d.zip chromium_src-b4bb25099b2bc9b1bc1df1b231c859ef82110e7d.tar.gz chromium_src-b4bb25099b2bc9b1bc1df1b231c859ef82110e7d.tar.bz2 |
Move various methods from glue/webview.h to api/public/WebView.h
I'll re-order the methods in webview_impl.cc in a follow-up CL. I
wanted to keep this one easy to review.
SetBackForwardListSize is no longer necessary given that
BackForwardListChromium.cpp doesn't care about its capacity.
R=dglazkov
BUG=10033
TEST=none
Originally reviewed here: http://codereview.chromium.org/251051
Review URL: http://codereview.chromium.org/255042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27780 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r-- | chrome/renderer/print_web_view_helper.cc | 2 | ||||
-rw-r--r-- | chrome/renderer/render_view.cc | 23 | ||||
-rw-r--r-- | chrome/renderer/webplugin_delegate_proxy.cc | 2 |
3 files changed, 11 insertions, 16 deletions
diff --git a/chrome/renderer/print_web_view_helper.cc b/chrome/renderer/print_web_view_helper.cc index c516c0e..86c5fc1 100644 --- a/chrome/renderer/print_web_view_helper.cc +++ b/chrome/renderer/print_web_view_helper.cc @@ -98,7 +98,7 @@ bool PrintWebViewHelper::CopyAndPrint(const ViewMsg_PrintPages_Params& params, print_web_view_.reset(WebView::Create(this)); prefs.Apply(print_web_view_.get()); - print_web_view_->InitializeMainFrame(NULL); + print_web_view_->initializeMainFrame(NULL); print_pages_params_.reset(new ViewMsg_PrintPages_Params(params)); print_pages_params_->pages.clear(); // Print all pages of selection. diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 2861d9c..159a976 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -314,15 +314,10 @@ void RenderView::Init(gfx::NativeViewId parent_hwnd, webwidget_ = WebView::Create(this); webkit_preferences_.Apply(webview()); - webview()->InitializeMainFrame(this); + webview()->initializeMainFrame(this); OnSetRendererPrefs(renderer_prefs); - // Don't let WebCore keep a B/F list - we have our own. - // We let it keep 1 entry because FrameLoader::goToItem expects an item in the - // backForwardList, which is used only in ASSERTs. - webview()->SetBackForwardListSize(1); - routing_id_ = routing_id; render_thread_->AddRoute(routing_id_, this); // Take a reference on behalf of the RenderThread. This will be balanced @@ -743,7 +738,7 @@ void RenderView::OnNavigate(const ViewMsg_Navigate_Params& params) { // Stop loading the current page void RenderView::OnStop() { if (webview()) - webview()->StopLoading(); + webview()->mainFrame()->stopLoading(); } void RenderView::OnLoadAlternateHTMLText(const std::string& html, @@ -792,7 +787,7 @@ void RenderView::OnStopFinding(bool clear_selection) { WebFrame* frame = view->mainFrame(); while (frame) { frame->stopFinding(clear_selection); - frame = view->GetNextFrameAfter(frame, false); + frame = frame->traverseNext(false); } } @@ -2587,7 +2582,7 @@ void RenderView::OnFind(int request_id, const string16& search_text, const WebKit::WebFindOptions& options) { WebFrame* main_frame = webview()->mainFrame(); - WebFrame* frame_after_main = webview()->GetNextFrameAfter(main_frame, true); + WebFrame* frame_after_main = main_frame->traverseNext(true); WebFrame* focused_frame = webview()->focusedFrame(); WebFrame* search_frame = focused_frame; // start searching focused frame. @@ -2613,8 +2608,8 @@ void RenderView::OnFind(int request_id, // What is the next frame to search? (we might be going backwards). Note // that we specify wrap=true so that search_frame never becomes NULL. search_frame = options.forward ? - webview()->GetNextFrameAfter(search_frame, true) : - webview()->GetPreviousFrameBefore(search_frame, true); + search_frame->traverseNext(true) : + search_frame->traversePrevious(true); } while (!search_frame->hasVisibleContent() && search_frame != focused_frame); @@ -2680,7 +2675,7 @@ void RenderView::OnFind(int request_id, // Iterate to the next frame. The frame will not necessarily scope, for // example if it is not visible. - search_frame = webview()->GetNextFrameAfter(search_frame, true); + search_frame = search_frame->traverseNext(true); } while (search_frame != main_frame); } } @@ -3277,14 +3272,14 @@ void RenderView::OnClearFocusedNode() { void RenderView::OnSetBackground(const SkBitmap& background) { if (webview()) - webview()->SetIsTransparent(!background.empty()); + webview()->setIsTransparent(!background.empty()); SetBackground(background); } void RenderView::OnSetActive(bool active) { if (webview()) - webview()->SetActive(active); + webview()->setIsActive(active); } void RenderView::SendExtensionRequest(const std::string& name, diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc index 52ee244..af4760b 100644 --- a/chrome/renderer/webplugin_delegate_proxy.cc +++ b/chrome/renderer/webplugin_delegate_proxy.cc @@ -964,7 +964,7 @@ void WebPluginDelegateProxy::OnSetDropEffect(const NPVariant_Param& object, if (!drag_id || !WebBindings::isDragEvent(event)) return; - *success = webview->SetDropEffect(effect != 0); + *success = webview->setDropEffect(effect != 0); } void WebPluginDelegateProxy::OnMissingPluginStatus(int status) { |