Unified Diff: libadblockplus-android/src/org/adblockplus/libadblockplus/JsEngine.java
Issue 29533564:
Issue 5556 - Update to use libadblockplus revision hg:566f64c8a2a8 (Closed)
Base URL: github.com:abby-sergz/libadblockplus-android.git
Patch Set:
Created Sept. 1, 2017, 9:38 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« libadblockplus-android/jni/JniJsEngine.cpp ('k')
|
libadblockplus-android/src/org/adblockplus/libadblockplus/android/AdblockEngine.java » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: libadblockplus-android/src/org/adblockplus/libadblockplus/JsEngine.java |
| diff --git a/libadblockplus-android/src/org/adblockplus/libadblockplus/JsEngine.java b/libadblockplus-android/src/org/adblockplus/libadblockplus/JsEngine.java |
| index 0ee8ccffc1b3b7e7e4904bc5890771d1143d4048..0d03927c000b25d0d573597760fd9d69368d3259 100644 |
| --- a/libadblockplus-android/src/org/adblockplus/libadblockplus/JsEngine.java |
| +++ b/libadblockplus-android/src/org/adblockplus/libadblockplus/JsEngine.java |
| @@ -30,19 +30,19 @@ public final class JsEngine implements Disposable |
| registerNatives(); |
| } |
| - public JsEngine(final AppInfo appInfo, final LogSystem logSystem, final WebRequest webRequest) |
| + public JsEngine(final AppInfo appInfo, final LogSystem logSystem, final WebRequest webRequest, final String basePath) |
| { |
| - this(ctor(appInfo, logSystem, webRequest)); |
| + this(ctor(appInfo, logSystem, webRequest, basePath)); |
| } |
| - public JsEngine(final AppInfo appInfo, final WebRequest webRequest) |
| + public JsEngine(final AppInfo appInfo, final WebRequest webRequest, final String basePath) |
|
anton
2017/09/01 09:49:50
Since ctor becase too heavy i'd prefer to leave ju
sergei
2017/09/01 09:58:34
Done in https://codereview.adblockplus.org/2953358
|
| { |
| - this(appInfo, null, webRequest); |
| + this(appInfo, null, webRequest, basePath); |
| } |
| public JsEngine(final AppInfo appInfo) |
| { |
| - this(appInfo, null, null); |
| + this(appInfo, null, null, null); |
| } |
| protected JsEngine(final long ptr) |
| @@ -88,11 +88,6 @@ public final class JsEngine implements Disposable |
| triggerEvent(this.ptr, eventName, null); |
| } |
| - public void setDefaultFileSystem(final String basePath) |
| - { |
| - setDefaultFileSystem(this.ptr, basePath); |
| - } |
| - |
| public JsValue newValue(final long value) |
| { |
| return newValue(this.ptr, value); |
| @@ -132,7 +127,8 @@ public final class JsEngine implements Disposable |
| private final static native void registerNatives(); |
| - private final static native long ctor(AppInfo appInfo, LogSystem logSystem, WebRequest webRequest); |
| + private final static native long ctor(AppInfo appInfo, LogSystem logSystem, WebRequest webRequest, |
| + String basePath); |
| private final static native void setEventCallback(long ptr, String eventName, long callback); |
| @@ -142,8 +138,6 @@ public final class JsEngine implements Disposable |
| private final static native void triggerEvent(long ptr, String eventName, long[] args); |
| - private final static native void setDefaultFileSystem(long ptr, String basePath); |
| - |
| private final static native JsValue newValue(long ptr, long value); |
| private final static native JsValue newValue(long ptr, boolean value); |
« no previous file with comments
|
« libadblockplus-android/jni/JniJsEngine.cpp ('k')
|
libadblockplus-android/src/org/adblockplus/libadblockplus/android/AdblockEngine.java » ('j')
|
no next file with comments »
