content/browser/android/content_view_core_impl.cc - Issue 473253002: Merge 283159 "[Android] Extend smart clip to return html along w..."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/android/content_view_core_impl.cc

Issue 473253002: Merge 283159 "[Android] Extend smart clip to return html along w..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/2062/src/

Patch Set: Created 6 years, 4 months 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/android/content_view_core_impl.h ('k') | content/browser/renderer_host/render_widget_host_view_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/android/content_view_core_impl.cc

===================================================================

--- content/browser/android/content_view_core_impl.cc (revision 289886)

+++ content/browser/android/content_view_core_impl.cc (working copy)

@@ -1612,16 +1612,18 @@

}

void ContentViewCoreImpl::OnSmartClipDataExtracted(

- const gfx::Rect& clip_rect,

- const base::string16& result) {

+ const base::string16& text,

+ const base::string16& html,

+ const gfx::Rect& clip_rect) {

JNIEnv* env = AttachCurrentThread();

ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);

if (obj.is_null())

return;

+ ScopedJavaLocalRef<jstring> jtext = ConvertUTF16ToJavaString(env, text);

+ ScopedJavaLocalRef<jstring> jhtml = ConvertUTF16ToJavaString(env, html);

ScopedJavaLocalRef<jobject> clip_rect_object(CreateJavaRect(env, clip_rect));

- ScopedJavaLocalRef<jstring> jresult = ConvertUTF16ToJavaString(env, result);

Java_ContentViewCore_onSmartClipDataExtracted(

- env, obj.obj(), jresult.obj(), clip_rect_object.obj());

+ env, obj.obj(), jtext.obj(), jhtml.obj(), clip_rect_object.obj());

}

void ContentViewCoreImpl::WebContentsDestroyed() {