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

Unified Diff: content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java

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/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
index fb33b0c5e7d794af00a8e32294740461142841c6..baf3947bcace168bfbb850ed715e23caf451a479 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
@@ -222,7 +222,7 @@ public class ContentViewCore
/**
* Called when the navigation is deferred immediately after the response started.
*/
- public void didDeferAfterResponseStarted();
+ public void didDeferAfterResponseStarted(String transition_url);
/**
* Called when a navigation transition has been detected, and we need to check
@@ -883,7 +883,8 @@ public class ContentViewCore
params.mBaseUrlForDataUrl,
params.mVirtualUrlForDataUrl,
params.mCanLoadLocalResources,
- params.mIsRendererInitiated);
+ params.mIsRendererInitiated,
+ params.mVirtualUrlForTransition);
}
/**
@@ -3086,9 +3087,9 @@ public class ContentViewCore
}
@CalledByNative
- private void didDeferAfterResponseStarted() {
+ private void didDeferAfterResponseStarted(String transition_url) {
if (mNavigationTransitionDelegate != null ) {
- mNavigationTransitionDelegate.didDeferAfterResponseStarted();
+ mNavigationTransitionDelegate.didDeferAfterResponseStarted(transition_url);
}
}
@@ -3197,7 +3198,8 @@ public class ContentViewCore
String baseUrlForDataUrl,
String virtualUrlForDataUrl,
boolean canLoadLocalResources,
- boolean isRendererInitiated);
+ boolean isRendererInitiated,
+ String virtualUrlForTransition);
private native String nativeGetURL(long nativeContentViewCoreImpl);

Powered by Google App Engine
This is Rietveld 408576698