| OLD | NEW |
| 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 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 203 } | 203 } |
| 204 | 204 |
| 205 @CalledByNative | 205 @CalledByNative |
| 206 private void addEnteringStylesheetToTransition(String stylesheet) { | 206 private void addEnteringStylesheetToTransition(String stylesheet) { |
| 207 if (mNavigationTransitionDelegate != null) { | 207 if (mNavigationTransitionDelegate != null) { |
| 208 mNavigationTransitionDelegate.addEnteringStylesheetToTransition(styl
esheet); | 208 mNavigationTransitionDelegate.addEnteringStylesheetToTransition(styl
esheet); |
| 209 } | 209 } |
| 210 } | 210 } |
| 211 | 211 |
| 212 @CalledByNative | 212 @CalledByNative |
| 213 private void didStartNavigationTransitionForFrame(long frameId) { | 213 private void didStartNavigationTransitionForFrame(long frameId, String cssSe
lector) { |
| 214 if (mNavigationTransitionDelegate != null) { | 214 if (mNavigationTransitionDelegate != null) { |
| 215 mNavigationTransitionDelegate.didStartNavigationTransitionForFrame(f
rameId); | 215 mNavigationTransitionDelegate.didStartNavigationTransitionForFrame( |
| 216 frameId, cssSelector); |
| 216 } | 217 } |
| 217 } | 218 } |
| 218 | 219 |
| 220 @CalledByNative |
| 221 private void addNavigationTransitionElements(String name, int x, int y, int
width, int height) { |
| 222 if (mNavigationTransitionDelegate != null) { |
| 223 mNavigationTransitionDelegate.addNavigationTransitionElements( |
| 224 name, x, y, width, height); |
| 225 } |
| 226 } |
| 227 |
| 219 @Override | 228 @Override |
| 220 public void evaluateJavaScript(String script, JavaScriptCallback callback) { | 229 public void evaluateJavaScript(String script, JavaScriptCallback callback) { |
| 221 nativeEvaluateJavaScript(mNativeWebContentsAndroid, script, callback); | 230 nativeEvaluateJavaScript(mNativeWebContentsAndroid, script, callback); |
| 222 } | 231 } |
| 223 | 232 |
| 224 @CalledByNative | 233 @CalledByNative |
| 225 private static void onEvaluateJavaScriptResult( | 234 private static void onEvaluateJavaScriptResult( |
| 226 String jsonResult, JavaScriptCallback callback) { | 235 String jsonResult, JavaScriptCallback callback) { |
| 227 callback.handleJavaScriptResult(jsonResult); | 236 callback.handleJavaScriptResult(jsonResult); |
| 228 } | 237 } |
| (...skipping 23 matching lines...) Expand all Loading... |
| 252 private native void nativeResumeResponseDeferredAtStart(long nativeWebConten
tsAndroid); | 261 private native void nativeResumeResponseDeferredAtStart(long nativeWebConten
tsAndroid); |
| 253 private native void nativeSetHasPendingNavigationTransitionForTesting( | 262 private native void nativeSetHasPendingNavigationTransitionForTesting( |
| 254 long nativeWebContentsAndroid); | 263 long nativeWebContentsAndroid); |
| 255 private native void nativeSetupTransitionView(long nativeWebContentsAndroid, | 264 private native void nativeSetupTransitionView(long nativeWebContentsAndroid, |
| 256 String markup); | 265 String markup); |
| 257 private native void nativeBeginExitTransition(long nativeWebContentsAndroid, | 266 private native void nativeBeginExitTransition(long nativeWebContentsAndroid, |
| 258 String cssSelector); | 267 String cssSelector); |
| 259 private native void nativeEvaluateJavaScript(long nativeWebContentsAndroid, | 268 private native void nativeEvaluateJavaScript(long nativeWebContentsAndroid, |
| 260 String script, JavaScriptCallback callback); | 269 String script, JavaScriptCallback callback); |
| 261 } | 270 } |
| OLD | NEW |