Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9756)

Unified Diff: chrome/renderer/render_view.cc

Issue 246060: Revert 27705 - Move various methods from glue/webview.h to api/public/WebView... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/renderer/print_web_view_helper.cc ('k') | chrome/renderer/webplugin_delegate_proxy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/render_view.cc
===================================================================
--- chrome/renderer/render_view.cc (revision 27710)
+++ chrome/renderer/render_view.cc (working copy)
@@ -314,10 +314,15 @@
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
@@ -738,7 +743,7 @@
// Stop loading the current page
void RenderView::OnStop() {
if (webview())
- webview()->mainFrame()->stopLoading();
+ webview()->StopLoading();
}
void RenderView::OnLoadAlternateHTMLText(const std::string& html,
@@ -787,7 +792,7 @@
WebFrame* frame = view->mainFrame();
while (frame) {
frame->stopFinding(clear_selection);
- frame = frame->traverseNext(false);
+ frame = view->GetNextFrameAfter(frame, false);
}
}
@@ -2582,7 +2587,7 @@
const string16& search_text,
const WebKit::WebFindOptions& options) {
WebFrame* main_frame = webview()->mainFrame();
- WebFrame* frame_after_main = main_frame->traverseNext(true);
+ WebFrame* frame_after_main = webview()->GetNextFrameAfter(main_frame, true);
WebFrame* focused_frame = webview()->focusedFrame();
WebFrame* search_frame = focused_frame; // start searching focused frame.
@@ -2608,8 +2613,8 @@
// 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 ?
- search_frame->traverseNext(true) :
- search_frame->traversePrevious(true);
+ webview()->GetNextFrameAfter(search_frame, true) :
+ webview()->GetPreviousFrameBefore(search_frame, true);
} while (!search_frame->hasVisibleContent() &&
search_frame != focused_frame);
@@ -2675,7 +2680,7 @@
// Iterate to the next frame. The frame will not necessarily scope, for
// example if it is not visible.
- search_frame = search_frame->traverseNext(true);
+ search_frame = webview()->GetNextFrameAfter(search_frame, true);
} while (search_frame != main_frame);
}
}
@@ -3272,14 +3277,14 @@
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()->setIsActive(active);
+ webview()->SetActive(active);
}
void RenderView::SendExtensionRequest(const std::string& name,
« no previous file with comments | « chrome/renderer/print_web_view_helper.cc ('k') | chrome/renderer/webplugin_delegate_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698