Eliminate WebView::GetDelegate and replace RenderViewSet with a linked list o...

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 161 matching lines @@
 // Typically, we capture the page data once the page is loaded.
 // Sometimes, the page never finishes to load, preventing the page capture
 // To workaround this problem, we always perform a capture after the following
 // delay.
 static const int kDelayForForcedCaptureMs = 6000;
 
 // The default value for RenderView.delay_seconds_for_form_state_sync_, see
 // that variable for more.
 const int kDefaultDelaySecondsForFormStateSync = 5;
 
-// The next available page ID to use. This ensures that the page IDs are
-// globally unique in the renderer.
-static int32 next_page_id_ = 1;
-
 // The maximum number of popups that can be spawned from one page.
 static const int kMaximumNumberOfUnacknowledgedPopups = 25;
 
 static const char* const kUnreachableWebDataURL =
     "chrome://chromewebdata/";
 
 static const char* const kBackForwardNavigationScheme = "history";
 
 static void GetRedirectChain(WebDataSource* ds, std::vector<GURL>* result) {
   WebVector<WebURL> urls;
   ds->redirectChain(urls);
   result->reserve(urls.size());
   for (size_t i = 0; i < urls.size(); ++i)
     result->push_back(urls[i]);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
+int32 RenderView::next_page_id_ = 1;
+
 RenderView::RenderView(RenderThreadBase* render_thread,
                        const WebPreferences& webkit_preferences)
     : RenderWidget(render_thread, true),
       enabled_bindings_(0),
       target_url_status_(TARGET_NONE),
       is_loading_(false),
       navigation_gesture_(NavigationGestureUnknown),
       page_id_(-1),
       last_page_id_sent_to_browser_(-1),
       last_indexed_page_id_(-1),
@@ skipping 14 matching lines @@
       send_preferred_width_changes_(false),
       determine_page_text_after_loading_stops_(false),
       view_type_(ViewType::INVALID),
       browser_window_id_(-1),
       last_top_level_navigation_page_id_(-1),
 #if defined(OS_MACOSX)
       has_document_tag_(false),
 #endif
       document_tag_(0),
       webkit_preferences_(webkit_preferences) {
-  Singleton<RenderViewSet>()->render_view_set_.insert(this);
 }
 
 RenderView::~RenderView() {
-  Singleton<RenderViewSet>()->render_view_set_.erase(this);
   if (decrement_shared_popup_at_destruction_)
     shared_popup_counter_->data--;
 
   // Dispose of un-disposed image fetchers.
   for (ImageResourceFetcherSet::iterator i = image_fetchers_.begin();
        i != image_fetchers_.end(); ++i) {
     delete *i;
   }
 
   // If file chooser is still waiting for answer, dispatch empty answer.
   if (file_chooser_completion_)
     file_chooser_completion_->didChooseFile(WebVector<WebString>());
 
 #if defined(OS_MACOSX)
   // Tell the spellchecker that the document is closed.
   if (has_document_tag_)
     Send(new ViewHostMsg_DocumentWithTagClosed(routing_id_, document_tag_));
 #endif
 
   render_thread_->RemoveFilter(audio_message_filter_);
   render_thread_->RemoveFilter(notification_provider_.get());
+
+#ifndef NDEBUG
+  // Make sure we are no longer referenced by the ViewMap.
+  ViewMap* views = Singleton<ViewMap>::get();
+  for (ViewMap::iterator it = views->begin(); it != views->end(); ++it)
+    DCHECK_NE(this, it->second) << "Failed to call Close?";
+#endif
+}
+
+/*static*/
+void RenderView::ForEach(RenderViewVisitor* visitor) {
+  ViewMap* views = Singleton<ViewMap>::get();
+  for (ViewMap::iterator it = views->begin(); it != views->end(); ++it)
+    visitor->Visit(it->second);

[Matt Perry, 2009/10/09 00:25:14]

I think you want to break if this returns false?

[darin (slow to review), 2009/10/09 03:52:30]

Yes, thanks for catching that!

+}
+
+/*static*/
+RenderView* RenderView::FromWebView(WebView* webview) {
+  ViewMap* views = Singleton<ViewMap>::get();
+  ViewMap::iterator it = views->find(webview);
+  return it == views->end() ? NULL : it->second;
 }
 
 /*static*/
 RenderView* RenderView::Create(
     RenderThreadBase* render_thread,
     gfx::NativeViewId parent_hwnd,
     int32 opener_id,
     const RendererPreferences& renderer_prefs,
     const WebPreferences& webkit_prefs,
     SharedRenderViewCounter* counter,
@@ skipping 43 matching lines @@
   } else {
     shared_popup_counter_ = new SharedRenderViewCounter(0);
     decrement_shared_popup_at_destruction_ = false;
   }
 
   devtools_agent_.reset(new DevToolsAgent(routing_id, this));
 
   notification_provider_ = new NotificationProvider(this);
 
   webwidget_ = WebView::Create(this);
+  Singleton<ViewMap>::get()->insert(std::make_pair(webview(), this));
   webkit_preferences_.Apply(webview());
   webview()->initializeMainFrame(this);
 
   OnSetRendererPrefs(renderer_prefs);
 
   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();
@@ skipping 3272 matching lines @@
     main_frame->executeScriptInIsolatedWorld(
         UserScriptSlave::GetIsolatedWorldId(extension_id),
         &sources.front(), sources.size(), EXTENSION_GROUP_CONTENT_SCRIPTS);
   } else {
     main_frame->insertStyleText(WebString::fromUTF8(code_string), WebString());
   }
 
   Send(new ViewMsg_ExecuteCodeFinished(routing_id_, request_id, true));
 }
 
+void RenderView::Close() {
+  // We need to grab a pointer to the doomed WebView before we destroy it.
+  WebView* doomed = webview();
+  RenderWidget::Close();
+  Singleton<ViewMap>::get()->erase(doomed);
+}
+
 void RenderView::DidHandleKeyEvent() {
   edit_commands_.clear();
 }
 
 void RenderView::EnsureDocumentTag() {
   // TODO(darin): There's actually no reason for this to be here.  We should
   // have the browser side manage the document tag.
 #if defined(OS_MACOSX)
   if (!has_document_tag_) {
     // Make the call to get the tag.
     Send(new ViewHostMsg_GetDocumentTag(routing_id_, &document_tag_));
     has_document_tag_ = true;
   }
 #endif
 }
 
 bool RenderView::SendAndRunNestedMessageLoop(IPC::SyncMessage* message) {
   PluginChannelHost::Broadcast(
       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;
 }