Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

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

Issue 29523679: Issue 5556 - use JsEngine& instead of JsEnginePtr because JsEnginePtr is not available anymore (Closed) Base URL: github.com:abby-sergz/libadblockplus-android.git
Patch Set: Created Aug. 22, 2017, 2:37 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: libadblockplus-android/jni/JniJsEngine.cpp
diff --git a/libadblockplus-android/jni/JniJsEngine.cpp b/libadblockplus-android/jni/JniJsEngine.cpp
index c6492b0dfee26aea622f01d39ed2c269e5be4f8a..fffa378001950cd8418583e83a2dba8dfb399809 100644
--- a/libadblockplus-android/jni/JniJsEngine.cpp
+++ b/libadblockplus-android/jni/JniJsEngine.cpp
@@ -34,9 +34,9 @@ static void TransformAppInfo(JNIEnv* env, jobject jAppInfo, AdblockPlus::AppInfo
appInfo.developmentBuild = JniGetBooleanField(env, clazz, jAppInfo, "developmentBuild");
}
-static AdblockPlus::JsEnginePtr& GetJsEnginePtrRef(jlong ptr)
+static AdblockPlus::JsEngine& GetJsEngineRef(jlong ptr)
{
- return JniLongToTypePtr<JniJsEngine>(ptr)->jsEngine;
+ return *JniLongToTypePtr<JniJsEngine>(ptr)->jsEngine;
}
static jlong JNICALL JniCtor(JNIEnv* env, jclass clazz, jobject jAppInfo)
@@ -63,7 +63,7 @@ static void JNICALL JniDtor(JNIEnv* env, jclass clazz, jlong ptr)
static void JNICALL JniSetEventCallback(JNIEnv* env, jclass clazz, jlong ptr, jstring jEventName, jlong jCallbackPtr)
{
- AdblockPlus::JsEnginePtr& engine = GetJsEnginePtrRef(ptr);
+ AdblockPlus::JsEngine& jsEngine = GetJsEngineRef(ptr);
anton 2017/08/23 05:46:47 in code review https://codereview.adblockplus.org/
sergei 2017/08/23 08:24:18 Done.
JniEventCallback* callback = JniLongToTypePtr<JniEventCallback>(jCallbackPtr);
std::string eventName = JniJavaToStdString(env, jEventName);
@@ -75,41 +75,41 @@ static void JNICALL JniSetEventCallback(JNIEnv* env, jclass clazz, jlong ptr, js
try
{
- engine->SetEventCallback(eventName, eCallback);
+ jsEngine.SetEventCallback(eventName, eCallback);
}
CATCH_AND_THROW(env)
}
static void JNICALL JniRemoveEventCallback(JNIEnv* env, jclass clazz, jlong ptr, jstring jEventName)
{
- AdblockPlus::JsEnginePtr& engine = GetJsEnginePtrRef(ptr);
+ AdblockPlus::JsEngine& jsEngine = GetJsEngineRef(ptr);
std::string eventName = JniJavaToStdString(env, jEventName);
try
{
- engine->RemoveEventCallback(eventName);
+ jsEngine.RemoveEventCallback(eventName);
}
CATCH_AND_THROW(env)
}
static jobject JNICALL JniEvaluate(JNIEnv* env, jclass clazz, jlong ptr, jstring jSource, jstring jFilename)
{
- AdblockPlus::JsEnginePtr& engine = GetJsEnginePtrRef(ptr);
+ AdblockPlus::JsEngine& engine = GetJsEngineRef(ptr);
std::string source = JniJavaToStdString(env, jSource);
std::string filename = JniJavaToStdString(env, jFilename);
try
{
- return NewJniJsValue(env, engine->Evaluate(source, filename));
+ return NewJniJsValue(env, engine.Evaluate(source, filename));
}
CATCH_THROW_AND_RETURN(env, 0)
}
static void JNICALL JniTriggerEvent(JNIEnv* env, jclass clazz, jlong ptr, jstring jEventName, jarray jJsPtrs)
{
- AdblockPlus::JsEnginePtr& engine = GetJsEnginePtrRef(ptr);
+ AdblockPlus::JsEngine& jsEngine = GetJsEngineRef(ptr);
std::string eventName = JniJavaToStdString(env, jEventName);
AdblockPlus::JsValueList args;
@@ -129,14 +129,14 @@ static void JNICALL JniTriggerEvent(JNIEnv* env, jclass clazz, jlong ptr, jstrin
try
{
- engine->TriggerEvent(eventName, std::move(args));
+ jsEngine.TriggerEvent(eventName, std::move(args));
}
CATCH_AND_THROW(env)
}
static void JNICALL JniSetDefaultFileSystem(JNIEnv* env, jclass clazz, jlong ptr, jstring jBasePath)
{
- AdblockPlus::JsEnginePtr& engine = GetJsEnginePtrRef(ptr);
+ AdblockPlus::JsEngine& jsEngine = GetJsEngineRef(ptr);
try
{
@@ -145,80 +145,80 @@ static void JNICALL JniSetDefaultFileSystem(JNIEnv* env, jclass clazz, jlong ptr
std::string basePath = JniJavaToStdString(env, jBasePath);
fileSystem->SetBasePath(basePath);
- engine->SetFileSystem(fileSystem);
+ jsEngine.SetFileSystem(fileSystem);
}
CATCH_AND_THROW(env)
}
static void JNICALL JniSetDefaultLogSystem(JNIEnv* env, jclass clazz, jlong ptr)
{
- AdblockPlus::JsEnginePtr& engine = GetJsEnginePtrRef(ptr);
+ AdblockPlus::JsEngine& jsEngine = GetJsEngineRef(ptr);
try
{
AdblockPlus::LogSystemPtr logSystem(new AdblockPlus::DefaultLogSystem());
- engine->SetLogSystem(logSystem);
+ jsEngine.SetLogSystem(logSystem);
}
CATCH_AND_THROW(env)
}
static void JNICALL JniSetLogSystem(JNIEnv* env, jclass clazz, jlong ptr, jlong logSystemPtr)
{
- AdblockPlus::JsEnginePtr& engine = GetJsEnginePtrRef(ptr);
+ AdblockPlus::JsEngine& jsEngine = GetJsEngineRef(ptr);
try
{
AdblockPlus::LogSystemPtr logSystem = *JniLongToTypePtr<AdblockPlus::LogSystemPtr>(logSystemPtr);
- engine->SetLogSystem(logSystem);
+ jsEngine.SetLogSystem(logSystem);
}
CATCH_AND_THROW(env)
}
static void JNICALL JniSetWebRequest(JNIEnv* env, jclass clazz, jlong ptr, jlong webRequestPtr)
{
- AdblockPlus::JsEnginePtr& engine = GetJsEnginePtrRef(ptr);
+ AdblockPlus::JsEngine& jsEngine = GetJsEngineRef(ptr);
try
{
auto& webRequest = *JniLongToTypePtr<AdblockPlus::WebRequestSharedPtr>(webRequestPtr);
- engine->SetWebRequest(webRequest);
+ jsEngine.SetWebRequest(webRequest);
}
CATCH_AND_THROW(env)
}
static jobject JNICALL JniNewLongValue(JNIEnv* env, jclass clazz, jlong ptr, jlong value)
{
- AdblockPlus::JsEnginePtr& engine = GetJsEnginePtrRef(ptr);
+ AdblockPlus::JsEngine& jsEngine = GetJsEngineRef(ptr);
try
{
- return NewJniJsValue(env, engine->NewValue(static_cast<int64_t>(value)));
+ return NewJniJsValue(env, jsEngine.NewValue(static_cast<int64_t>(value)));
}
CATCH_THROW_AND_RETURN(env, 0)
}
static jobject JNICALL JniNewBooleanValue(JNIEnv* env, jclass clazz, jlong ptr, jboolean value)
{
- AdblockPlus::JsEnginePtr& engine = GetJsEnginePtrRef(ptr);
+ AdblockPlus::JsEngine& jsEngine = GetJsEngineRef(ptr);
try
{
- return NewJniJsValue(env, engine->NewValue(value == JNI_TRUE ? true : false));
+ return NewJniJsValue(env, jsEngine.NewValue(value == JNI_TRUE ? true : false));
}
CATCH_THROW_AND_RETURN(env, 0)
}
static jobject JNICALL JniNewStringValue(JNIEnv* env, jclass clazz, jlong ptr, jstring value)
{
- AdblockPlus::JsEnginePtr& engine = GetJsEnginePtrRef(ptr);
+ AdblockPlus::JsEngine& jsEngine = GetJsEngineRef(ptr);
try
{
std::string strValue = JniJavaToStdString(env, value);
- return NewJniJsValue(env, engine->NewValue(strValue));
+ return NewJniJsValue(env, jsEngine.NewValue(strValue));
}
CATCH_THROW_AND_RETURN(env, 0)
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld