libadblockplus-android/jni/JniFilterChangeCallback.cpp - Issue 29422558: Issue 5167 - Update to use libadblockplus revision dca8df9af1a7

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
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
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
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
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Unified Diff: libadblockplus-android/jni/JniFilterChangeCallback.cpp

Issue 29422558: Issue 5167 - Update to use libadblockplus revision dca8df9af1a7 (Closed)

Patch Set: updated dependencies (..-binaries) Created May 10, 2017, 6:54 a.m.

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Index: libadblockplus-android/jni/JniFilterChangeCallback.cpp

diff --git a/libadblockplus-android/jni/JniFilterChangeCallback.cpp b/libadblockplus-android/jni/JniFilterChangeCallback.cpp

index 77c578562c68687898c55544cfb3c5e15fc59906..44dcdcc2425e8e867269de719a5e597f8f219081 100644

--- a/libadblockplus-android/jni/JniFilterChangeCallback.cpp

+++ b/libadblockplus-android/jni/JniFilterChangeCallback.cpp

@@ -37,8 +37,7 @@ JniFilterChangeCallback::JniFilterChangeCallback(JNIEnv* env,

{

}

-void JniFilterChangeCallback::Callback(const std::string& arg,

- const AdblockPlus::JsValuePtr jsValue)

+void JniFilterChangeCallback::Callback(const std::string& arg, AdblockPlus::JsValue&& jsValue)

{

JNIEnvAcquire env(GetJavaVM());

@@ -50,7 +49,7 @@ void JniFilterChangeCallback::Callback(const std::string& arg,

if (method)

{

JniLocalReference<jstring> jArg(*env, env->NewStringUTF(arg.c_str()));

- JniLocalReference<jobject> jJsValue(*env, NewJniJsValue(*env, jsValue, GetJsValueClass()));

+ JniLocalReference<jobject> jJsValue(*env, NewJniJsValue(*env, std::move(jsValue), GetJsValueClass()));

env->CallVoidMethod(GetCallbackObject(), method, *jArg, *jJsValue);

}