Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(148)

Unified Diff: content/browser/transition_request_manager.cc

Issue 378743002: Navigation transitions: Place transition page in same process as destination page. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/transition_request_manager.cc
diff --git a/content/browser/transition_request_manager.cc b/content/browser/transition_request_manager.cc
index ab651fed5511c1bd461fd06db8be13115107433e..eaf21ca3edad5c08002472e24bc1723bf453f02c 100644
--- a/content/browser/transition_request_manager.cc
+++ b/content/browser/transition_request_manager.cc
@@ -5,7 +5,11 @@
#include "content/browser/transition_request_manager.h"
#include "base/memory/singleton.h"
+#include "base/strings/stringprintf.h"
#include "content/public/browser/browser_thread.h"
+#include "content/public/common/child_process_host.h"
+#include "content/public/common/url_constants.h"
+#include "url/gurl.h"
namespace content {
@@ -33,7 +37,36 @@ void TransitionRequestManager::SetHasPendingTransitionRequest(
}
}
-TransitionRequestManager::TransitionRequestManager() {
+void TransitionRequestManager::AddPendingTransitionProcessID(const GURL& token,
+ int process_id) {
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
+ transition_process_ids_[token.spec()] = process_id;
+}
+
+void TransitionRequestManager::ClearPendingTransitionProcessID(
+ const GURL& token) {
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
+ transition_process_ids_.erase(token.spec());
+}
+
+int TransitionRequestManager::GetPendingTransitionProcessIDByToken(
+ const GURL& token) {
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
+ ProcessIDMap::iterator it = transition_process_ids_.find(token.spec());
+ if (it == transition_process_ids_.end())
+ return content::ChildProcessHost::kInvalidUniqueID;
+ return it->second;
+}
+
+GURL TransitionRequestManager::CreateTransitionURL() {
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
+ transition_unique_ids_++;
+ return GURL(base::StringPrintf(
+ "%s:%x", kNavigationTransitionScheme, transition_unique_ids_));
+}
+
+TransitionRequestManager::TransitionRequestManager()
+ : transition_unique_ids_(0) {
}
TransitionRequestManager::~TransitionRequestManager() {

Powered by Google App Engine
This is Rietveld 408576698