Implement a prototype to render cross-site iframes in a separate process from their parent.

chrome/browser/task_manager/task_manager_resource_providers.cc

Index: chrome/browser/task_manager/task_manager_resource_providers.cc
diff --git a/chrome/browser/task_manager/task_manager_resource_providers.cc b/chrome/browser/task_manager/task_manager_resource_providers.cc
index 239e9f320bb3fa0a247d095ae115c0303256cae9..85cb1934a11beb619b6abab1a449fe00231af6c5 100644
--- a/chrome/browser/task_manager/task_manager_resource_providers.cc
+++ b/chrome/browser/task_manager/task_manager_resource_providers.cc
@@ -27,6 +27,7 @@
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
+#include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_manager_factory.h"
@@ -1849,6 +1850,18 @@ TaskManager::Resource* TaskManagerGuestResourceProvider::GetResource(
   return NULL;
 }
 
+// Given a RenderViewHost, return true if this RVH is Cross-site Iframe.

[Charlie Reis, 2013/01/17 19:44:54]

This comment belongs in .h file.

We should have a separate comment within this function saying why the heuristic
it's using (all processes that don't have TabContents) is correct.

Except... it's not correct.  There are other RenderProcessHosts that don't have
TabContents, like background pages and notifications.  We'll need a different
approach.

[nasko, 2013/01/17 22:19:13]

We discussed this in person and both agreed this is the wrong approach. This
code is being removed.

+bool TaskManagerGuestResourceProvider::IsOOPIframe(RenderProcessHost* host) {
+  if (host==NULL || !host->GetHandle())

[Charlie Reis, 2013/01/17 19:44:54]

nit: !host

[nasko, 2013/01/17 22:19:13]

Done.

+    return false;
+
+  for (TabContentsIterator iterator; !iterator.done(); ++iterator) {
+    if ((*iterator)->GetRenderProcessHost()->GetHandle() == host->GetHandle())

[Charlie Reis, 2013/01/17 19:44:54]

Is it possible for this to crash if a TabContents doesn't have a RPH?

[nasko, 2013/01/17 22:19:13]

Done.

+      return false;
+  }
+  return true;
+}
+
 void TaskManagerGuestResourceProvider::StartUpdating() {
   DCHECK(!updating_);
   updating_ = true;
@@ -1858,13 +1871,13 @@ void TaskManagerGuestResourceProvider::StartUpdating() {
            RenderProcessHost::AllHostsIterator());
        !i.IsAtEnd(); i.Advance()) {
     RenderProcessHost* host = i.GetCurrentValue();
-    if (host->IsGuest()) {
+    if (host->IsGuest() || IsOOPIframe(host)) {
+      // Current RPH only contains Browser-Plugin Guest or Cross-Site IFrame.
       RenderProcessHost::RenderWidgetHostsIterator iter =
           host->GetRenderWidgetHostsIterator();
       for (; !iter.IsAtEnd(); iter.Advance()) {
         const RenderWidgetHost* widget = iter.GetCurrentValue();
-        Add(RenderViewHost::From(
-                const_cast<RenderWidgetHost*>(widget)));
+        Add(RenderViewHost::From(const_cast<RenderWidgetHost*>(widget)));
       }
     }
   }
@@ -1919,7 +1932,9 @@ void TaskManagerGuestResourceProvider::Observe(int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   WebContents* web_contents = content::Source<WebContents>(source).ptr();
-  if (!web_contents || !web_contents->GetRenderProcessHost()->IsGuest())
+  if (!web_contents ||
+      (!web_contents->GetRenderProcessHost()->IsGuest() &&
+      !IsOOPIframe(web_contents->GetRenderProcessHost())))
     return;
 
   switch (type) {