| 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 9733a58784af0c70ff24a72caa08e94a4c75e899..cd5145f2a7d31da84bec8b70ac6c1d14b852f555 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
|
| @@ -240,7 +240,7 @@ public class ContentViewCore
|
| * the transition layer's markup after the entering stylesheets
|
| * have been applied.
|
| */
|
| - public void didDeferAfterResponseStarted(String enteringColor);
|
| + public void didDeferAfterResponseStarted(String markup, String cssSelector, String enteringColor);
|
|
|
| /**
|
| * Called when a navigation transition has been detected, and we need to check
|
| @@ -1421,6 +1421,23 @@ public class ContentViewCore
|
| }
|
|
|
| /**
|
| + * Inserts the provided markup sandboxed into the frame.
|
| + */
|
| + void setupTransitionView(String markup) {
|
| + if (mNativeContentViewCore == 0) return;
|
| + nativeSetupTransitionView(mNativeContentViewCore, markup);
|
| + }
|
| +
|
| + /**
|
| + * Hides transition elements specified by the selector, and activates any
|
| + * exiting-transition stylesheets.
|
| + */
|
| + void beginExitTransition(String cssSelector) {
|
| + if (mNativeContentViewCore == 0) return;
|
| + nativeBeginExitTransition(mNativeContentViewCore, cssSelector);
|
| + }
|
| +
|
| + /**
|
| * Requests the renderer insert a link to the specified stylesheet in the
|
| * main frame's document.
|
| */
|
| @@ -3059,9 +3076,9 @@ public class ContentViewCore
|
| }
|
|
|
| @CalledByNative
|
| - private void didDeferAfterResponseStarted(String enteringColor) {
|
| + private void didDeferAfterResponseStarted(String markup, String cssSelector, String enteringColor) {
|
| if (mNavigationTransitionDelegate != null ) {
|
| - mNavigationTransitionDelegate.didDeferAfterResponseStarted(enteringColor);
|
| + mNavigationTransitionDelegate.didDeferAfterResponseStarted(markup, cssSelector, enteringColor);
|
| }
|
| }
|
|
|
| @@ -3300,6 +3317,8 @@ public class ContentViewCore
|
| private native void nativeExtractSmartClipData(long nativeContentViewCoreImpl,
|
| int x, int y, int w, int h);
|
| private native void nativeSetBackgroundOpaque(long nativeContentViewCoreImpl, boolean opaque);
|
| + private native void nativeSetupTransitionView(long nativeContentViewCoreImpl, String markup);
|
| + private native void nativeBeginExitTransition(long nativeContentViewCoreImpl, String cssSelector);
|
|
|
| private native void nativeResumeResponseDeferredAtStart(
|
| long nativeContentViewCoreImpl);
|
|
|