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

Side by Side Diff: content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java

Issue 652953008: Navigation transitions (web to native app): Pass data after starting provisional load (Chrome side) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 package org.chromium.content.browser.webcontents; 5 package org.chromium.content.browser.webcontents;
6 6
7 import org.chromium.base.CalledByNative; 7 import org.chromium.base.CalledByNative;
8 import org.chromium.base.JNINamespace; 8 import org.chromium.base.JNINamespace;
9 import org.chromium.content_public.browser.JavaScriptCallback; 9 import org.chromium.content_public.browser.JavaScriptCallback;
10 import org.chromium.content_public.browser.NavigationController; 10 import org.chromium.content_public.browser.NavigationController;
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 } 221 }
222 222
223 @CalledByNative 223 @CalledByNative
224 private void addEnteringStylesheetToTransition(String stylesheet) { 224 private void addEnteringStylesheetToTransition(String stylesheet) {
225 if (mNavigationTransitionDelegate != null) { 225 if (mNavigationTransitionDelegate != null) {
226 mNavigationTransitionDelegate.addEnteringStylesheetToTransition(styl esheet); 226 mNavigationTransitionDelegate.addEnteringStylesheetToTransition(styl esheet);
227 } 227 }
228 } 228 }
229 229
230 @CalledByNative 230 @CalledByNative
231 private void didStartNavigationTransitionForFrame(long frameId) { 231 private void didStartNavigationTransitionForFrame(long frameId, String cssSe lector) {
232 if (mNavigationTransitionDelegate != null) { 232 if (mNavigationTransitionDelegate != null) {
233 mNavigationTransitionDelegate.didStartNavigationTransitionForFrame(f rameId); 233 mNavigationTransitionDelegate.didStartNavigationTransitionForFrame(
234 frameId, cssSelector);
234 } 235 }
235 } 236 }
236 237
238 @CalledByNative
239 private void addNavigationTransitionElements(String name, int x, int y, int width, int height) {
240 if (mNavigationTransitionDelegate != null) {
241 mNavigationTransitionDelegate.addNavigationTransitionElements(
242 name, x, y, width, height);
243 }
244 }
245
237 @Override 246 @Override
238 public void evaluateJavaScript(String script, JavaScriptCallback callback) { 247 public void evaluateJavaScript(String script, JavaScriptCallback callback) {
239 nativeEvaluateJavaScript(mNativeWebContentsAndroid, script, callback); 248 nativeEvaluateJavaScript(mNativeWebContentsAndroid, script, callback);
240 } 249 }
241 250
242 @CalledByNative 251 @CalledByNative
243 private static void onEvaluateJavaScriptResult( 252 private static void onEvaluateJavaScriptResult(
244 String jsonResult, JavaScriptCallback callback) { 253 String jsonResult, JavaScriptCallback callback) {
245 callback.handleJavaScriptResult(jsonResult); 254 callback.handleJavaScriptResult(jsonResult);
246 } 255 }
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 private native void nativeSetupTransitionView(long nativeWebContentsAndroid, 291 private native void nativeSetupTransitionView(long nativeWebContentsAndroid,
283 String markup); 292 String markup);
284 private native void nativeBeginExitTransition(long nativeWebContentsAndroid, 293 private native void nativeBeginExitTransition(long nativeWebContentsAndroid,
285 String cssSelector); 294 String cssSelector);
286 private native void nativeClearNavigationTransitionData(long nativeWebConten tsAndroid); 295 private native void nativeClearNavigationTransitionData(long nativeWebConten tsAndroid);
287 private native void nativeEvaluateJavaScript(long nativeWebContentsAndroid, 296 private native void nativeEvaluateJavaScript(long nativeWebContentsAndroid,
288 String script, JavaScriptCallback callback); 297 String script, JavaScriptCallback callback);
289 private native void nativePostMessageToFrame(long nativeWebContentsAndroid, String frameId, 298 private native void nativePostMessageToFrame(long nativeWebContentsAndroid, String frameId,
290 String message, String sourceOrigin, String targetOrigin); 299 String message, String sourceOrigin, String targetOrigin);
291 } 300 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698