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 #include "content/browser/web_contents/web_contents_android.h" | 5 #include "content/browser/web_contents/web_contents_android.h" |
6 | 6 |
7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
8 #include "base/android/jni_string.h" | 8 #include "base/android/jni_string.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/json/json_writer.h" | 10 #include "base/json/json_writer.h" |
(...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
331 | 331 |
332 std::vector<GURL>::const_iterator iter = entering_stylesheets.begin(); | 332 std::vector<GURL>::const_iterator iter = entering_stylesheets.begin(); |
333 for (; iter != entering_stylesheets.end(); ++iter) { | 333 for (; iter != entering_stylesheets.end(); ++iter) { |
334 ScopedJavaLocalRef<jstring> jstring_url( | 334 ScopedJavaLocalRef<jstring> jstring_url( |
335 ConvertUTF8ToJavaString(env, iter->spec())); | 335 ConvertUTF8ToJavaString(env, iter->spec())); |
336 Java_WebContentsImpl_addEnteringStylesheetToTransition( | 336 Java_WebContentsImpl_addEnteringStylesheetToTransition( |
337 env, obj_.obj(), jstring_url.obj()); | 337 env, obj_.obj(), jstring_url.obj()); |
338 } | 338 } |
339 } | 339 } |
340 | 340 |
341 void WebContentsAndroid::DidStartNavigationTransitionForFrame( | 341 void WebContentsAndroid::DidStartNavigationTransitionForFrame(int64 frame_id) { |
342 int64 frame_id, | |
343 const TransitionLayerData& transition_data) { | |
344 JNIEnv* env = AttachCurrentThread(); | 342 JNIEnv* env = AttachCurrentThread(); |
345 | |
346 ScopedJavaLocalRef<jstring> jstring_css_selector( | |
347 ConvertUTF8ToJavaString(env, transition_data.css_selector)); | |
348 | |
349 Java_WebContentsImpl_didStartNavigationTransitionForFrame( | 343 Java_WebContentsImpl_didStartNavigationTransitionForFrame( |
350 env, obj_.obj(), frame_id, jstring_css_selector.obj()); | 344 env, obj_.obj(), frame_id); |
351 | |
352 std::vector<TransitionElement>::const_iterator it = | |
353 transition_data.elements.begin(); | |
354 for (; it != transition_data.elements.end(); ++it) { | |
355 ScopedJavaLocalRef<jstring> jstring_name(ConvertUTF8ToJavaString(env, | |
356 it->name)); | |
357 Java_WebContentsImpl_addNavigationTransitionElements( | |
358 env, obj_.obj(), jstring_name.obj(), | |
359 it->rect.x(), it->rect.y(), it->rect.width(), it->rect.height()); | |
360 } | |
361 } | 345 } |
362 | 346 |
363 void WebContentsAndroid::EvaluateJavaScript(JNIEnv* env, | 347 void WebContentsAndroid::EvaluateJavaScript(JNIEnv* env, |
364 jobject obj, | 348 jobject obj, |
365 jstring script, | 349 jstring script, |
366 jobject callback) { | 350 jobject callback) { |
367 RenderViewHost* rvh = web_contents_->GetRenderViewHost(); | 351 RenderViewHost* rvh = web_contents_->GetRenderViewHost(); |
368 DCHECK(rvh); | 352 DCHECK(rvh); |
369 | 353 |
370 if (!rvh->IsRenderViewLive()) { | 354 if (!rvh->IsRenderViewLive()) { |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
406 ViewMsg_PostMessage_Params params; | 390 ViewMsg_PostMessage_Params params; |
407 params.source_origin = ConvertJavaStringToUTF16(env, source_origin); | 391 params.source_origin = ConvertJavaStringToUTF16(env, source_origin); |
408 params.target_origin = ConvertJavaStringToUTF16(env, target_origin); | 392 params.target_origin = ConvertJavaStringToUTF16(env, target_origin); |
409 params.data = ConvertJavaStringToUTF16(env, message); | 393 params.data = ConvertJavaStringToUTF16(env, message); |
410 params.is_data_raw_string = true; | 394 params.is_data_raw_string = true; |
411 params.source_routing_id = MSG_ROUTING_NONE; | 395 params.source_routing_id = MSG_ROUTING_NONE; |
412 host->Send(new ViewMsg_PostMessageEvent(host->GetRoutingID(), params)); | 396 host->Send(new ViewMsg_PostMessageEvent(host->GetRoutingID(), params)); |
413 } | 397 } |
414 | 398 |
415 } // namespace content | 399 } // namespace content |
OLD | NEW |