Unified Diff: src/org/adblockplus/libadblockplus/FilterEngine.java
Issue 6245218638626816:
Issue 1424 - Update libadblockplus-binaries to 6f79af14ad4e (Closed)
Patch Set:
Created Sept. 22, 2014, 4:44 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« jni/JniFilterEngine.cpp ('K')
|
« src/org/adblockplus/android/AndroidUpdaterCallback.java ('k')
|
src/org/adblockplus/libadblockplus/UpdateCheckDoneCallback.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: src/org/adblockplus/libadblockplus/FilterEngine.java |
| =================================================================== |
| --- a/src/org/adblockplus/libadblockplus/FilterEngine.java |
| +++ b/src/org/adblockplus/libadblockplus/FilterEngine.java |
| @@ -30,6 +30,12 @@ |
| registerNatives(); |
| } |
| + public static enum ContentType |
| + { |
| + OTHER, SCRIPT, IMAGE, STYLESHEET, OBJECT, SUBDOCUMENT, DOCUMENT, XMLHTTPREQUEST, |
| + OBJECT_SUBREQUEST, FONT, MEDIA |
| + } |
| + |
| public FilterEngine(final JsEngine jsEngine) |
| { |
| this.ptr = ctor(jsEngine.ptr); |
| @@ -81,7 +87,7 @@ |
| forceUpdateCheck(this.ptr, 0); |
| } |
| - public void forceUpdateCheck(final UpdaterCallback callback) |
| + public void forceUpdateCheck(final UpdateCheckDoneCallback callback) |
| { |
| forceUpdateCheck(this.ptr, callback != null ? callback.ptr : 0); |
| } |
| @@ -91,12 +97,12 @@ |
| return getElementHidingSelectors(this.ptr, domain); |
| } |
| - public Filter matches(final String url, final String contentType, final String documentUrl) |
| + public Filter matches(final String url, final ContentType contentType, final String documentUrl) |
| { |
| return matches(this.ptr, url, contentType, documentUrl); |
| } |
| - public Filter matches(final String url, final String contentType, final String[] documentUrls) |
| + public Filter matches(final String url, final ContentType contentType, final String[] documentUrls) |
| { |
| return matches(this.ptr, url, contentType, documentUrls); |
| } |
| @@ -159,9 +165,9 @@ |
| private final static native JsValue getPref(long ptr, String pref); |
| - private final static native Filter matches(long ptr, String url, String contentType, String documentUrl); |
| + private final static native Filter matches(long ptr, String url, ContentType contentType, String documentUrl); |
| - private final static native Filter matches(long ptr, String url, String contentType, String[] documentUrls); |
| + private final static native Filter matches(long ptr, String url, ContentType contentType, String[] documentUrls); |
| private final static native void setPref(long ptr, String pref, long valuePtr); |
« jni/JniFilterEngine.cpp ('K')
|
« src/org/adblockplus/android/AndroidUpdaterCallback.java ('k')
|
src/org/adblockplus/libadblockplus/UpdateCheckDoneCallback.java » ('j')
|
no next file with comments »
