| 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 <stdint.h> | 7 #include <stdint.h> |
| 8 | 8 |
| 9 #include "base/android/jni_android.h" | 9 #include "base/android/jni_android.h" |
| 10 #include "base/android/jni_array.h" | 10 #include "base/android/jni_array.h" |
| (...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 569 | 569 |
| 570 void WebContentsAndroid::SendMessageToFrame( | 570 void WebContentsAndroid::SendMessageToFrame( |
| 571 JNIEnv* env, | 571 JNIEnv* env, |
| 572 const JavaParamRef<jobject>& obj, | 572 const JavaParamRef<jobject>& obj, |
| 573 const JavaParamRef<jstring>& frame_name, | 573 const JavaParamRef<jstring>& frame_name, |
| 574 const JavaParamRef<jstring>& message, | 574 const JavaParamRef<jstring>& message, |
| 575 const JavaParamRef<jstring>& target_origin) { | 575 const JavaParamRef<jstring>& target_origin) { |
| 576 base::string16 source_origin; | 576 base::string16 source_origin; |
| 577 base::string16 j_target_origin(ConvertJavaStringToUTF16(env, target_origin)); | 577 base::string16 j_target_origin(ConvertJavaStringToUTF16(env, target_origin)); |
| 578 base::string16 j_message(ConvertJavaStringToUTF16(env, message)); | 578 base::string16 j_message(ConvertJavaStringToUTF16(env, message)); |
| 579 std::vector<content::TransferredMessagePort> ports; | 579 std::vector<int> ports; |
| 580 content::MessagePortProvider::PostMessageToFrame( | 580 content::MessagePortProvider::PostMessageToFrame( |
| 581 web_contents_, source_origin, j_target_origin, j_message, ports); | 581 web_contents_, source_origin, j_target_origin, j_message, ports); |
| 582 } | 582 } |
| 583 | 583 |
| 584 jboolean WebContentsAndroid::HasAccessedInitialDocument( | 584 jboolean WebContentsAndroid::HasAccessedInitialDocument( |
| 585 JNIEnv* env, | 585 JNIEnv* env, |
| 586 const JavaParamRef<jobject>& jobj) { | 586 const JavaParamRef<jobject>& jobj) { |
| 587 return static_cast<WebContentsImpl*>(web_contents_)-> | 587 return static_cast<WebContentsImpl*>(web_contents_)-> |
| 588 HasAccessedInitialDocument(); | 588 HasAccessedInitialDocument(); |
| 589 } | 589 } |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 683 if (response == READBACK_SUCCESS) | 683 if (response == READBACK_SUCCESS) |
| 684 java_bitmap = gfx::ConvertToJavaBitmap(&bitmap); | 684 java_bitmap = gfx::ConvertToJavaBitmap(&bitmap); |
| 685 Java_WebContentsImpl_onGetContentBitmapFinished(env, | 685 Java_WebContentsImpl_onGetContentBitmapFinished(env, |
| 686 obj->obj(), | 686 obj->obj(), |
| 687 callback->obj(), | 687 callback->obj(), |
| 688 java_bitmap.obj(), | 688 java_bitmap.obj(), |
| 689 response); | 689 response); |
| 690 } | 690 } |
| 691 | 691 |
| 692 } // namespace content | 692 } // namespace content |
| OLD | NEW |