| Index: content/browser/web_contents/web_contents_android.cc
|
| diff --git a/content/browser/web_contents/web_contents_android.cc b/content/browser/web_contents/web_contents_android.cc
|
| index 1bef8a3c293fc4e4874296fb7f62aac40b68f9ae..d38cdf527ab8a1135e5566a50f6bcde72c768924 100644
|
| --- a/content/browser/web_contents/web_contents_android.cc
|
| +++ b/content/browser/web_contents/web_contents_android.cc
|
| @@ -324,10 +324,26 @@ void WebContentsAndroid::DidDeferAfterResponseStarted(
|
| }
|
| }
|
|
|
| -void WebContentsAndroid::DidStartNavigationTransitionForFrame(int64 frame_id) {
|
| +void WebContentsAndroid::DidStartNavigationTransitionForFrame(
|
| + int64 frame_id,
|
| + const TransitionLayerData& transition_data) {
|
| JNIEnv* env = AttachCurrentThread();
|
| +
|
| + ScopedJavaLocalRef<jstring> jstring_css_selector(
|
| + ConvertUTF8ToJavaString(env, transition_data.css_selector));
|
| +
|
| Java_WebContentsImpl_didStartNavigationTransitionForFrame(
|
| - env, obj_.obj(), frame_id);
|
| + env, obj_.obj(), frame_id, jstring_css_selector.obj());
|
| +
|
| + std::vector<std::string>::const_iterator it = transition_data.names.begin();
|
| + std::vector<gfx::Rect>::const_iterator jt = transition_data.rects.begin();
|
| + for (; it != transition_data.names.end() && jt != transition_data.rects.end();
|
| + ++it, ++jt) {
|
| + ScopedJavaLocalRef<jstring> jstring_name(ConvertUTF8ToJavaString(env, *it));
|
| + Java_WebContentsImpl_addNavigationTransitionElements(
|
| + env, obj_.obj(), jstring_name.obj(),
|
| + jt->x(), jt->y(), jt->width(), jt->height());
|
| + }
|
| }
|
|
|
| void WebContentsAndroid::EvaluateJavaScript(JNIEnv* env,
|
|
|