MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-15 02:59:33 +07:00
Code Issues Packages Projects Releases Wiki Activity

Deprecate JBCefBrowserBuilder.createBrowser and some JBCefBrowserBuilder ctors

Browse Source 
GitOrigin-RevId: 23a56543129fd0f0926fd1a151787a678593f6f1
This commit is contained in:
Anton Tarasov
2022-02-16 16:07:46 +03:00
committed by intellij-monorepo-bot
parent 0d8984d6eb
commit 2952d78b25
10 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jupyter/viewOnly/src/org/jetbrains/plugins/notebooks/jupyter/preview/viewOnly/JupyterViewOnlyFileEditor.kt
View File

@@ -35,7 +35,7 @@ import javax.swing.JComponent
class JupyterViewOnlyFileEditor private constructor(val myFile: VirtualFile) : UserDataHolderBase(), FileEditor {
// OSR is slower but doesn't work on Linux when component detached from Swing (i.e. tab switched)
private val browser = JBCefBrowser.createBuilder().setOffScreenRendering(SystemInfo.isLinux).setUrl(
JupyterCefHttpHandlerBase.getJupyterHttpUrl().addPathSegment("index.html").toString()).createBrowser()
JupyterCefHttpHandlerBase.getJupyterHttpUrl().addPathSegment("index.html").toString()).build()
private val browserComponent: JComponent = browser.component
private val darcula: MutableStateFlow<Boolean> = MutableStateFlow(UIUtil.isUnderDarcula())
private val scope = CoroutineScope(Dispatchers.EDT)

9
platform/platform-api/src/com/intellij/ui/jcef/JBCefBrowser.java
View File

@@ -154,6 +154,7 @@ public class JBCefBrowser extends JBCefBrowserBase {
* Creates a browser with the initial URL.
*
* @see #createBuilder
* @see JBCefBrowserBuilder#setUrl(String)
*/
public JBCefBrowser(@NotNull String url) {
this(createBuilder().setUrl(url));
@@ -163,7 +164,11 @@ public class JBCefBrowser extends JBCefBrowserBase {
* Creates a browser with the provided {@code JBCefClient} and initial URL. The client's lifecycle is the responsibility of the caller.
*
* @see #createBuilder
* @see JBCefBrowserBuilder#setClient(JBCefClient)
* @see JBCefBrowserBuilder#setUrl(String)
* @deprecated use {@link JBCefBrowserBuilder} instead
*/
@Deprecated
public JBCefBrowser(@NotNull JBCefClient client, @Nullable String url) {
this(createBuilder().setClient(client).setUrl(url));
}
@@ -172,7 +177,11 @@ public class JBCefBrowser extends JBCefBrowserBase {
* Creates a browser wrapping the provided {@link CefBrowser} with the provided {@link JBCefClient}.
*
* @see #createBuilder
* @see JBCefBrowserBuilder#setCefBrowser(CefBrowser)
* @see JBCefBrowserBuilder#setClient(JBCefClient)
* @deprecated use {@link JBCefBrowserBuilder} instead
*/
@Deprecated
public JBCefBrowser(@NotNull CefBrowser cefBrowser, @NotNull JBCefClient client) {
this(createBuilder().setCefBrowser(cefBrowser).setClient(client));
}

2
platform/platform-api/src/com/intellij/ui/jcef/JBCefBrowserBase.java
View File

@@ -715,7 +715,7 @@ public abstract class JBCefBrowserBase implements JBCefDisposable {
myDevtoolsFrame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
myDevtoolsFrame.setBounds(bounds.width / 4 + 100, bounds.height / 4 + 100, bounds.width / 2, bounds.height / 2);
myDevtoolsFrame.setLayout(new BorderLayout());
JBCefBrowser devTools = JBCefBrowser.createBuilder().setCefBrowser(myCefBrowser.getDevTools()).setClient(myCefClient).createBrowser();
JBCefBrowser devTools = JBCefBrowser.createBuilder().setCefBrowser(myCefBrowser.getDevTools()).setClient(myCefClient).build();
myDevtoolsFrame.add(devTools.getComponent(), BorderLayout.CENTER);
myDevtoolsFrame.addWindowListener(new WindowAdapter() {
@Override

12
platform/platform-api/src/com/intellij/ui/jcef/JBCefBrowserBuilder.java
View File

@@ -2,6 +2,7 @@
package com.intellij.ui.jcef;
import org.cef.browser.CefBrowser;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -111,9 +112,18 @@ public class JBCefBrowserBuilder {
}
/**
* Creates the browser with the set parameters.
* @deprecated use {@link JBCefBrowserBuilder#build()} instead
*/
@Deprecated
@ApiStatus.ScheduledForRemoval(inVersion = "2022.3")
public @NotNull JBCefBrowser createBrowser() {
return build();
}
/**
* Creates and returns the browser with the set parameters.
*/
public @NotNull JBCefBrowser build() {
return JBCefBrowser.create(this);
}
}

2
platform/platform-impl/src/com/intellij/internal/jcef/JBCefBrowserDemo.java
View File

@@ -65,7 +65,7 @@ public class JBCefBrowserDemo extends AnAction implements DumbAware {
.setOffScreenRendering(isOffScreenRendering)
.setUrl(URL)
.setEnableOpenDevToolsMenuItem(true)
.createBrowser();
.build();
myJBCefBrowser.setErrorPage(new JBCefBrowserBase.ErrorPage() {
@Override

2
platform/platform-tests/testSrc/com/intellij/ui/jcef/JBCefBrowserJsCallTest.kt
View File

@@ -123,7 +123,7 @@ class JBCefBrowserJsCallTest {
JBCefBrowser.createBuilder()
.setClient(jbCefClient)
.setUrl("about:blank")
.createBrowser()
.build()
}
JBCefTestHelper.showAndWaitForLoad(browser, "DISPATCH")

2
platform/platform-tests/testSrc/com/intellij/ui/jcef/JBCefHeadlessOsrTest.java
View File

@@ -52,7 +52,7 @@ public class JBCefHeadlessOsrTest {
}
})
.setUrl("chrome:version")
.createBrowser();
.build();
invokeAndWaitForLoad(browser, () -> browser.getCefBrowser().createImmediately());
}

4
platform/platform-tests/testSrc/com/intellij/ui/jcef/JBCefJSQueryOSRTest.java
View File

@@ -73,7 +73,7 @@ public class JBCefJSQueryOSRTest {
.setOffScreenRendering(true)
.setClient(client)
.setCreateImmediately(true)
.createBrowser();
.build();
JBCefJSQuery jsQuery = JBCefJSQuery.create((JBCefBrowserBase)browser);
@@ -84,7 +84,7 @@ public class JBCefJSQueryOSRTest {
public void test4() {
JBCefBrowser browser = JBCefBrowser.createBuilder()
.setOffScreenRendering(true)
.createBrowser();
.build();
JBCefJSQuery jsQuery = JBCefJSQuery.create((JBCefBrowserBase)browser);
browser.createImmediately();

2
platform/platform-tests/testSrc/com/intellij/ui/jcef/JBCefJSQueryPoolSlotReuseTest.java
View File

@@ -42,7 +42,7 @@ public class JBCefJSQueryPoolSlotReuseTest {
var client = JBCefApp.getInstance().createClient();
client.setProperty(JBCefClient.Properties.JS_QUERY_POOL_SIZE, 1);
var browser = new JBCefBrowserBuilder().setUrl("about:blank").setClient(client).createBrowser();
var browser = new JBCefBrowserBuilder().setUrl("about:blank").setClient(client).build();
showAndWaitForLoad(browser, JBCefJSQueryPoolSlotReuseTest.class.getSimpleName());
/*

4
platform/platform-tests/testSrc/com/intellij/ui/jcef/JBCefMultiRenderingModeTest.java
View File

@@ -40,8 +40,8 @@ public class JBCefMultiRenderingModeTest {
@Test
public void test() {
show(JBCefBrowser.createBuilder().setOffScreenRendering(false).setUrl("chrome:version").createBrowser());
show(JBCefBrowser.createBuilder().setOffScreenRendering(true).setUrl("chrome:version").createBrowser());
show(JBCefBrowser.createBuilder().setOffScreenRendering(false).setUrl("chrome:version").build());
show(JBCefBrowser.createBuilder().setOffScreenRendering(true).setUrl("chrome:version").build());
Disposer.dispose(JBCefApp.getInstance().getDisposable());
}