MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Follow the review IDEA-CR-56280

Browse Source 
https://upsource.jetbrains.com/intellij/review/IDEA-CR-56280

GitOrigin-RevId: 57bb8d805783185ab6dc55f931ae447cce83c29d
This commit is contained in:
Anton Tarasov
2019-12-11 07:34:16 +00:00
committed by intellij-monorepo-bot
parent 492fc8ac07
commit 73c3d3231b
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/ui/jcef/JBCefJSQuery.java
+10 -12
View File
@@ -3,6 +3,7 @@ package com.intellij.ui.jcef;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.util.Disposer;
import org.cef.CefClient;
import org.cef.browser.CefBrowser;
import org.cef.browser.CefFrame;
import org.cef.browser.CefMessageRouter;
@@ -28,7 +29,7 @@ import java.util.function.Function;
public class JBCefJSQuery implements Disposable {
@NotNull private final String myJSCallID;
@NotNull private final CefMessageRouter myMsgRouter;
@NotNull private final JBCefBrowser myCefBrowser;
@NotNull private final CefClient myCefClient;
@NotNull private final Map<Function<String, Response>, CefMessageRouterHandler> myHandlerMap = Collections.synchronizedMap(new HashMap<>());
@@ -40,9 +41,9 @@ public class JBCefJSQuery implements Disposable {
config.jsQueryFunction = myJSCallID;
config.jsCancelFunction = myJSCallID;
myMsgRouter = CefMessageRouter.create(config);
myCefBrowser = browser;
myCefBrowser.getJBCefClient().getCefClient().addMessageRouter(myMsgRouter);
Disposer.register(myCefBrowser, this);
myCefClient = browser.getJBCefClient().getCefClient();
myCefClient.addMessageRouter(myMsgRouter);
Disposer.register(browser, this);
}
/**
@@ -70,10 +71,7 @@ public class JBCefJSQuery implements Disposable {
* @param onSuccessCallback JS callback in format: function(response) {}
* @param onFailureCallback JS callback in format: function(error_code, error_message) {}
*/
public String inject(@Nullable String queryResult,
@SuppressWarnings("unused") @NotNull String onSuccessCallback,
@SuppressWarnings("unused") @NotNull String onFailureCallback)
{
public String inject(@Nullable String queryResult, @NotNull String onSuccessCallback, @NotNull String onFailureCallback) {
return "window." + myJSCallID +
"({request: '' + " + queryResult + "," +
"onSuccess: " + onSuccessCallback + "," +
@@ -115,7 +113,7 @@ public class JBCefJSQuery implements Disposable {
@Override
public void dispose() {
myCefBrowser.getJBCefClient().getCefClient().removeMessageRouter(myMsgRouter);
myCefClient.removeMessageRouter(myMsgRouter);
myHandlerMap.clear();
}
@@ -135,9 +133,9 @@ public class JBCefJSQuery implements Disposable {
}
public Response(@Nullable String response, int errCode, @Nullable String errMsg) {
this.myResponse = response;
this.myErrCode = errCode;
this.myErrMsg = errMsg;
myResponse = response;
myErrCode = errCode;
myErrMsg = errMsg;
}
@Nullable