New Task Manager - Phase 1.3.2.B: Implement Tab Contents Task Providing (Prerender)

chrome/browser/task_management/providers/web_contents/web_contents_task_provider.cc

 // Copyright 2015 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/browser/task_management/providers/web_contents/web_contents_task_provider.h"
 
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "chrome/browser/task_management/providers/web_contents/subframe_task.h"
 #include "chrome/browser/task_management/providers/web_contents/web_contents_tags_manager.h"
@@ skipping 34 matching lines @@
   void RenderFrameHostChanged(RenderFrameHost* old_host,
                               RenderFrameHost* new_host) override;
   void RenderViewReady() override;
   void WebContentsDestroyed() override;
   void RenderProcessGone(base::TerminationStatus status) override;
   void TitleWasSet(content::NavigationEntry* entry, bool explicit_set) override;
   void DidUpdateFaviconURL(
       const std::vector<content::FaviconURL>& candidates) override;
 
  private:
+  friend class WebContentsTaskProvider;

[ncarter (slow), 2015/06/19 19:50:51]

WebContentsTaskProvider is the only class that can even see the declaration of
WebContentsEntry, so if you make it a friend, "private:" seems like it doesn't
mean anything here.

I think it might be better to just add a public entry point for what you need,
like how CreateAllTasks() works, and drop the friend declaration.

[You could just call WebContentsDestroyed() here, too, but that feels kind of
terrible]

[afakhry, 2015/06/19 21:49:22]

Done.

   // Defines a callback for WebContents::ForEachFrame() to create a
   // corresponding task for the given |render_frame_host| and notifying the
   // provider's observer of the new task.
   void CreateTaskForFrame(RenderFrameHost* render_frame_host);
 
   // Clears the task that corresponds to the given |render_frame_host| and
   // notifies the provider's observer of the tasks removal.
   void ClearTaskForFrame(RenderFrameHost* render_frame_host);
 
   // Clears all the tasks in this entry. The provider's observer will be
@@ skipping 210 matching lines @@
     // notification of its connection hasn't been fired yet. In this case we
     // ignore it since we're already tracking it.
     return;
   }
 
   WebContentsEntry* entry = new WebContentsEntry(web_contents, this);
   entries_map_[web_contents] = entry;
   entry->CreateAllTasks();
 }
 
+void WebContentsTaskProvider::OnWebContentsTagRemoved(WebContentsTag* tag) {
+  DCHECK(tag);
+  content::WebContents* web_contents = tag->web_contents();
+  DCHECK(web_contents);
+
+  auto itr = entries_map_.find(web_contents);
+  DCHECK(itr != entries_map_.end());
+  WebContentsEntry* entry = itr->second;
+
+  // Must manually clear the tasks and notifying the observer.

[ncarter (slow), 2015/06/19 19:50:51]

notifying->notify

[afakhry, 2015/06/19 21:49:22]

Done.

+  entry->ClearAllTasks(true);
+  entries_map_.erase(itr);
+  delete entry;
+}
+
 Task* WebContentsTaskProvider::GetTaskOfUrlRequest(int origin_pid,
                                                    int child_id,
                                                    int route_id) {
   // If an origin PID was specified then the URL request originated in a plugin
   // working on the WebContents' behalf, so ignore it.
   if (origin_pid)
     return nullptr;
 
   content::RenderFrameHost* rfh =
       content::RenderFrameHost::FromID(child_id, route_id);
@@ skipping 42 matching lines @@
 
   WebContentsEntry* entry = itr->second;
   entries_map_.erase(itr);
 
   // The entry we're about to delete is our caller, however its' still fine to
   // delete it.
   delete entry;
 }
 
 }  // namespace task_management