Temporarily avoid process swaps for renderer navigations away from an app.

chrome/renderer/render_view.cc

 // Copyright (c) 2010 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 <cmath>
 #include <string>
 #include <vector>
@@ skipping 373 matching lines @@
 
   // If the URL is still empty, this is a window.open navigation. Check the
   // opener's URL.
   GURL old_url(frame->url());
   if (old_url.is_empty() && frame->opener())
     old_url = frame->opener()->url();
 
   return !ExtensionRendererInfo::InSameExtent(old_url, new_url);
 }
 
+// Returns true if the frame is in an extension app's extent.
+static bool InExtensionExtent(WebFrame* frame) {
+  if (!RenderThread::current())

[darin (slow to review), 2010/12/14 17:17:40]

what is the purpose of this null check?  i don't see RenderThread::current()
dereferenced below.

[Charlie Reis, 2010/12/14 18:52:29]

We don't need this function anymore, but the same check is in
CrossesExtensionExtents above.  Erik, do you know why it's there?

+    return false;
+
+  // If the URL is still empty, this is a window.open navigation. Check the
+  // opener's URL.
+  GURL old_url(frame->url());
+  if (old_url.is_empty() && frame->opener())

[darin (slow to review), 2010/12/14 17:17:40]

Why do you bother checking frame->opener() here?  At the callsite, you check
frame->opener() as well.  If the opener is non-null here, then the result of
InExtensionExtent will be ignored anyways.

[Charlie Reis, 2010/12/14 18:52:29]

No longer needed here, but still used in CrossesExtensionExtents.

+    old_url = frame->opener()->url();
+
+  return ExtensionRendererInfo::GetByURL(old_url) != NULL;
+}
+
 // Returns the ISO 639_1 language code of the specified |text|, or 'unknown'
 // if it failed.
 static std::string DetermineTextLanguage(const string16& text) {
   std::string language = chrome::kUnknownLanguageCode;
   int num_languages = 0;
   int text_bytes = 0;
   bool is_reliable = false;
   Language cld_language =
       DetectLanguageOfUnicodeText(NULL, text.c_str(), true, &is_reliable,
                                   &num_languages, NULL, &text_bytes);
@@ skipping 2590 matching lines @@
         // We don't send referrer from extensions.
         OpenURL(url, GURL(), default_policy);
         return WebKit::WebNavigationPolicyIgnore;  // Suppress the load here.
     }
 
     // If the navigation would cross an app extent boundary, we also need
     // to defer to the browser to ensure process isolation.
     // TODO(erikkay) This is happening inside of a check to is_content_initiated
     // which means that things like the back button won't trigger it.  Is that
     // OK?
-    if (CrossesExtensionExtents(frame, url)) {
+    if (CrossesExtensionExtents(frame, url) &&
+        // Temporary workaround for crbug.com/65953: Only swap processes if we

[darin (slow to review), 2010/12/14 17:17:40]

nit: Comments like this should have a TODO(creis)

[Charlie Reis, 2010/12/14 18:52:29]

Done.

+        // are not already in an app, and only if window.opener is null, since
+        // we do not yet restore window.opener if the window navigates back to
+        // this process later.
+        !InExtensionExtent(frame) &&
+        frame->opener() == NULL) {

[darin (slow to review), 2010/12/14 17:17:40]

style nit: prefer "!frame->opener()"

[Charlie Reis, 2010/12/14 18:52:29]

Simplified by removing this part of the check and modifying
CrossesExtensionExtents instead.

       // Include the referrer in this case since we're going from a hosted web
       // page. (the packaged case is handled previously by the extension
       // navigation test)
       GURL referrer(request.httpHeaderField(WebString::fromUTF8("Referer")));
       OpenURL(url, referrer, default_policy);
       return WebKit::WebNavigationPolicyIgnore;  // Suppress the load here.
     }
   }
 
   // Detect when a page is "forking" a new tab that can be safely rendered in
@@ skipping 2713 matching lines @@
   external_popup_menu_.reset();
 }
 #endif
 
 void RenderView::AddErrorToRootConsole(const string16& message) {
   if (webview() && webview()->mainFrame()) {
     webview()->mainFrame()->addMessageToConsole(
         WebConsoleMessage(WebConsoleMessage::LevelError, message));
   }
 }