Reverting 27711.

chrome/renderer/render_view.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/render_view.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 296 matching lines @@
     decrement_shared_popup_at_destruction_ = true;
   } else {
     shared_popup_counter_ = new SharedRenderViewCounter(0);
     decrement_shared_popup_at_destruction_ = false;
   }
 
   devtools_agent_.reset(new DevToolsAgent(routing_id, this));
 
   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
   // when we receive ViewMsg_Close.
   AddRef();
 
   // If this is a popup, we must wait for the CreatingNew_ACK message before
   // completing initialization.  Otherwise, we can finish it now.
   if (opener_id == MSG_ROUTING_NONE) {
     did_show_ = true;
@@ skipping 400 matching lines @@
     main_frame->loadRequest(request);
   }
 
   // In case LoadRequest failed before DidCreateDataSource was called.
   pending_navigation_state_.reset();
 }
 
 // Stop loading the current page
 void RenderView::OnStop() {
   if (webview())
-    webview()->StopLoading();
+    webview()->mainFrame()->stopLoading();
 }
 
 void RenderView::OnLoadAlternateHTMLText(const std::string& html,
                                          bool new_navigation,
                                          const GURL& display_url,
                                          const std::string& security_info) {
   if (!webview())
     return;
 
   pending_navigation_state_.reset(NavigationState::CreateBrowserInitiated(
@@ skipping 28 matching lines @@
   WebView* view = webview();
   if (!view)
     return;
 
   if (clear_selection)
     view->focusedFrame()->executeCommand(WebString::fromUTF8("Unselect"));
 
   WebFrame* frame = view->mainFrame();
   while (frame) {
     frame->stopFinding(clear_selection);
-    frame = view->GetNextFrameAfter(frame, false);
+    frame = frame->traverseNext(false);
   }
 }
 
 void RenderView::OnFindReplyAck() {
   // Check if there is any queued up request waiting to be sent.
   if (queued_find_reply_message_.get()) {
     // Send the search result over to the browser process.
     Send(queued_find_reply_message_.get());
     queued_find_reply_message_.release();
   }
@@ skipping 1774 matching lines @@
   GURL::Replacements link_doctor_params;
   link_doctor_params.SetQueryStr(params);
   GURL url = alternate_error_page_url_.ReplaceComponents(link_doctor_params);
   return url;
 }
 
 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.
 
   bool multi_frame = (frame_after_main != main_frame);
 
   // If we have multiple frames, we don't want to wrap the search within the
   // frame, so we check here if we only have main_frame in the chain.
   bool wrap_within_frame = !multi_frame;
 
   WebRect selection_rect;
   bool result = false;
 
   do {
     result = search_frame->find(
         request_id, search_text, options, wrap_within_frame, &selection_rect);
 
     if (!result) {
       // don't leave text selected as you move to the next frame.
       search_frame->executeCommand(WebString::fromUTF8("Unselect"));
 
       // Find the next frame, but skip the invisible ones.
       do {
         // 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);
 
       // Make sure selection doesn't affect the search operation in new frame.
       search_frame->executeCommand(WebString::fromUTF8("Unselect"));
 
       // If we have multiple frames and we have wrapped back around to the
       // focused frame, we need to search it once more allowing wrap within
       // the frame, otherwise it will report 'no match' if the focused frame has
       // reported matches, but no frames after the focused_frame contain a
@@ skipping 45 matching lines @@
         // Start new scoping request. If the scoping function determines that it
         // needs to scope, it will defer until later.
         search_frame->scopeStringMatches(request_id,
                                          search_text,
                                          options,
                                          true);  // reset the tickmarks
       }
 
       // 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);
   }
 }
 
 void RenderView::OnDeterminePageText() {
   if (!is_loading_) {
     if (!webview())
       return;
     WebFrame* main_frame = webview()->mainFrame();
     std::wstring contents;
@@ skipping 576 matching lines @@
   RenderWidget::OnResize(new_size, resizer_rect);
 }
 
 void RenderView::OnClearFocusedNode() {
   if (webview())
     webview()->clearFocusedNode();
 }
 
 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,
                                       const std::string& args,
                                       int request_id,
                                       bool has_callback) {
   Send(new ViewHostMsg_ExtensionRequest(routing_id_, name, args, request_id,
                                         has_callback));
 }
 
@@ skipping 317 matching lines @@
       new PluginMsg_SignalModalDialogEvent(host_window_));
 
   message->EnableMessagePumping();  // Runs a nested message loop.
   bool rv = Send(message);
 
   PluginChannelHost::Broadcast(
       new PluginMsg_ResetModalDialogEvent(host_window_));
 
   return rv;
 }