Skip to content

Commit 7cd5030

Browse files
1zun41zun4
committed
feat: accelerated paint
1 parent fb606da commit 7cd5030

15 files changed

Lines changed: 272 additions & 4 deletions

‎java/org/cef/CefBrowserSettings.java‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
package org.cef;
66

7+
import org.cef.handler.CefOsrRendererSettings;
8+
79
/**
810
* Browser initialization settings. Specify NULL or 0 to get the recommended
911
* default values. The consequences of using custom values may not be well
@@ -20,12 +22,29 @@ public class CefBrowserSettings {
2022
*/
2123
public int windowless_frame_rate = 0;
2224

25+
/**
26+
* Set to true to enable shared texture rendering. When enabled, the browser
27+
* will render to a shared texture that can be accessed by the host application
28+
* for hardware-accelerated compositing. This is supported on Windows via D3D11,
29+
* macOS via Metal/OpenGL, and Linux via native buffers.
30+
*/
31+
public boolean shared_texture_enabled = false;
32+
33+
/**
34+
* Set to true to enable external begin frame scheduling. When enabled, the
35+
* client must call CefBrowserHost::SendExternalBeginFrame to trigger frame
36+
* rendering at the specified frame rate.
37+
*/
38+
public boolean external_begin_frame_enabled = false;
39+
2340
public CefBrowserSettings() {}
2441

2542
@Override
2643
public CefBrowserSettings clone() {
2744
CefBrowserSettings tmp = new CefBrowserSettings();
2845
tmp.windowless_frame_rate = windowless_frame_rate;
46+
tmp.shared_texture_enabled = shared_texture_enabled;
47+
tmp.external_begin_frame_enabled = external_begin_frame_enabled;
2948
return tmp;
3049
}
3150
}

‎java/org/cef/CefClient.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -676,6 +676,15 @@ public void onPaint(CefBrowser browser, boolean popup, Rectangle[] dirtyRects,
676676
realHandler.onPaint(browser, popup, dirtyRects, buffer, width, height);
677677
}
678678

679+
@Override
680+
public void onAcceleratedPaint(CefBrowser browser, boolean popup, Rectangle[] dirtyRects, CefAcceleratedPaintInfo info) {
681+
if (browser == null) return;
682+
683+
CefRenderHandler realHandler = browser.getRenderHandler();
684+
if (realHandler != null)
685+
realHandler.onAcceleratedPaint(browser, popup, dirtyRects, info);
686+
}
687+
679688
@Override
680689
public void addOnPaintListener(Consumer<CefPaintEvent> listener) {}
681690

‎java/org/cef/browser/CefBrowser.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,15 @@ public void runFileDialog(FileDialogMode mode, String title, String defaultFileP
399399
*/
400400
public void setWindowlessFrameRate(int frameRate);
401401

402+
/**
403+
* Send an external begin frame to trigger frame rendering when external begin frame
404+
* scheduling is enabled. This method should be called at the desired frame rate when
405+
* CefBrowserSettings.external_begin_frame_enabled is set to true.
406+
*
407+
* @throws UnsupportedOperationException if not supported
408+
*/
409+
public void sendExternalBeginFrame();
410+
402411
/**
403412
* Returns the maximum rate in frames per second (fps) that {@code CefRenderHandler::onPaint}
404413
* will be called for a windowless browser. The actual fps may be lower if the browser cannot

‎java/org/cef/browser/CefBrowserOsr.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import org.cef.CefBrowserSettings;
88
import org.cef.CefClient;
99
import org.cef.callback.CefDragData;
10+
import org.cef.handler.CefAcceleratedPaintInfo;
1011
import org.cef.handler.CefRenderHandler;
1112
import org.cef.handler.CefScreenInfo;
1213

@@ -107,6 +108,10 @@ public void removeOnPaintListener(Consumer<CefPaintEvent> listener) {
107108
public void onPaint(CefBrowser browser, boolean popup, Rectangle[] dirtyRects, ByteBuffer buffer, int width, int height) {
108109
}
109110

111+
@Override
112+
public void onAcceleratedPaint(CefBrowser browser, boolean popup, Rectangle[] dirtyRects, CefAcceleratedPaintInfo info) {
113+
}
114+
110115
@Override
111116
public boolean onCursorChange(CefBrowser browser, final int cursorType) {
112117
return true;

‎java/org/cef/browser/CefBrowser_N.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -767,6 +767,14 @@ public void setWindowlessFrameRate(int frameRate) {
767767
}
768768
}
769769

770+
public void sendExternalBeginFrame() {
771+
try {
772+
N_SendExternalBeginFrame();
773+
} catch (UnsatisfiedLinkError ule) {
774+
ule.printStackTrace();
775+
}
776+
}
777+
770778
public CompletableFuture<Integer> getWindowlessFrameRate() {
771779
final CompletableFuture<Integer> future = new CompletableFuture<>();
772780
try {
@@ -850,5 +858,6 @@ private final native void N_DragTargetDragEnter(
850858
private final native void N_SetParent(long windowHandle, Component canvas);
851859
private final native void N_NotifyMoveOrResizeStarted();
852860
private final native void N_SetWindowlessFrameRate(int frameRate);
861+
private final native void N_SendExternalBeginFrame();
853862
private final native void N_GetWindowlessFrameRate(IntCallback frameRateCallback);
854863
}

‎java/org/cef/handler/CefAcceleratedPaintInfo.java‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights
2+
// reserved. Use of this source code is governed by a BSD-style license that
3+
// can be found in the LICENSE file.
4+
5+
package org.cef.handler;
6+
7+
/**
8+
* Structure representing shared texture info for accelerated painting.
9+
*/
10+
public class CefAcceleratedPaintInfo {
11+
/**
12+
* Shared texture handle. The meaning depends on the platform:
13+
* - Windows: HANDLE to a texture that can be opened with D3D11 OpenSharedResource
14+
* - macOS: IOSurface pointer that can be opened with Metal or OpenGL
15+
* - Linux: Contains several planes, each with an fd to the underlying system native buffer
16+
*/
17+
public long shared_texture_handle = 0;
18+
19+
/**
20+
* Format of the shared texture.
21+
*/
22+
public int format = 0;
23+
24+
/**
25+
* Size information for the shared texture.
26+
*/
27+
public int width = 0;
28+
public int height = 0;
29+
30+
public CefAcceleratedPaintInfo() {}
31+
32+
public CefAcceleratedPaintInfo(long shared_texture_handle, int format, int width, int height) {
33+
this.shared_texture_handle = shared_texture_handle;
34+
this.format = format;
35+
this.width = width;
36+
this.height = height;
37+
}
38+
39+
@Override
40+
public CefAcceleratedPaintInfo clone() {
41+
return new CefAcceleratedPaintInfo(shared_texture_handle, format, width, height);
42+
}
43+
}

‎java/org/cef/handler/CefOsrRendererSettings.java‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights
2+
// reserved. Use of this source code is governed by a BSD-style license that
3+
// can be found in the LICENSE file.
4+
5+
package org.cef.handler;
6+
7+
/**
8+
* Settings for off-screen rendering (OSR) configuration.
9+
* Based on CEF's OsrRendererSettings structure.
10+
*/
11+
public class CefOsrRendererSettings {
12+
13+
/**
14+
* If true draw a border around update rectangles.
15+
*/
16+
public boolean show_update_rect = false;
17+
18+
/**
19+
* If true return real screen bounds from GetRootScreenRect/GetScreenInfo.
20+
* - Allows window.outerWidth/Height and window.screenX/Y to return correct values.
21+
* - Allows JavaScript window.moveTo/By() and window.resizeTo/By() to provide
22+
* bounds that include the window frame.
23+
* - Causes HTML select popups to be cropped (limitation of implementation).
24+
*/
25+
public boolean real_screen_bounds = true;
26+
27+
/**
28+
* Background color. Enables transparency if the alpha component is 0.
29+
* 32-bit ARGB color value, not premultiplied.
30+
*/
31+
public int background_color = 0;
32+
33+
/**
34+
* Render using shared textures. Supported on Windows only via D3D11.
35+
* When enabled, the browser will render to a shared texture that can be
36+
* accessed by the host application for hardware-accelerated compositing.
37+
*/
38+
public boolean shared_texture_enabled = false;
39+
40+
/**
41+
* Client implements a BeginFrame timer by calling
42+
* CefBrowserHost::SendExternalBeginFrame at the specified frame rate.
43+
*/
44+
public boolean external_begin_frame_enabled = false;
45+
46+
/**
47+
* Frame rate for external begin frame when external_begin_frame_enabled is true.
48+
*/
49+
public int begin_frame_rate = 0;
50+
51+
public CefOsrRendererSettings() {}
52+
53+
/**
54+
* Copy constructor.
55+
*/
56+
public CefOsrRendererSettings(CefOsrRendererSettings other) {
57+
this.show_update_rect = other.show_update_rect;
58+
this.real_screen_bounds = other.real_screen_bounds;
59+
this.background_color = other.background_color;
60+
this.shared_texture_enabled = other.shared_texture_enabled;
61+
this.external_begin_frame_enabled = other.external_begin_frame_enabled;
62+
this.begin_frame_rate = other.begin_frame_rate;
63+
}
64+
65+
@Override
66+
public CefOsrRendererSettings clone() {
67+
return new CefOsrRendererSettings(this);
68+
}
69+
}

‎java/org/cef/handler/CefRenderHandler.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,17 @@ public interface CefRenderHandler {
6767
public void onPaint(CefBrowser browser, boolean popup, Rectangle[] dirtyRects,
6868
ByteBuffer buffer, int width, int height);
6969

70+
/**
71+
* Called when an element has been rendered to the shared texture handle.
72+
* This method is only called when CefWindowInfo::shared_texture_enabled is set to true.
73+
* @param browser The browser generating the event.
74+
* @param popup True if painting a popup window.
75+
* @param dirtyRects Array of dirty regions.
76+
* @param info Contains the shared handle and texture information.
77+
*/
78+
public void onAcceleratedPaint(CefBrowser browser, boolean popup, Rectangle[] dirtyRects,
79+
CefAcceleratedPaintInfo info);
80+
7081
/**
7182
* Add provided listener.
7283
* @param listener Code that gets executed after a frame was rendered.

‎java/org/cef/handler/CefRenderHandlerAdapter.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,14 @@
55
package org.cef.handler;
66

77
import org.cef.browser.CefBrowser;
8+
import org.cef.browser.CefPaintEvent;
89
import org.cef.callback.CefDragData;
910

1011
import java.awt.Point;
1112
import java.awt.Rectangle;
1213
import java.nio.ByteBuffer;
14+
import java.util.function.Consumer;
15+
import java.util.function.Consumer;
1316

1417
/**
1518
* An abstract adapter class for receiving render events.
@@ -42,6 +45,10 @@ public void onPopupSize(CefBrowser browser, Rectangle size) {}
4245
public void onPaint(CefBrowser browser, boolean popup, Rectangle[] dirtyRects,
4346
ByteBuffer buffer, int width, int height) {}
4447

48+
@Override
49+
public void onAcceleratedPaint(CefBrowser browser, boolean popup, Rectangle[] dirtyRects,
50+
CefAcceleratedPaintInfo info) {}
51+
4552
@Override
4653
public boolean onCursorChange(CefBrowser browser, int cursorType) {
4754
return false;
@@ -54,4 +61,5 @@ public boolean startDragging(CefBrowser browser, CefDragData dragData, int mask,
5461

5562
@Override
5663
public void updateDragCursor(CefBrowser browser, int operation) {}
64+
5765
}

‎native/CefBrowser_N.cpp‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,7 @@ KeyboardCode KeyboardCodeFromXKeysym(unsigned int keysym) {
575575
return VKEY_OEM_7;
576576
case XK_ISO_Level5_Shift:
577577
return VKEY_OEM_8;
578-
case XK_Shift_L:
578+
case XK_Shift_L:
579579
case XK_Shift_R:
580580
return VKEY_SHIFT;
581581
case XK_Control_L:
@@ -1039,12 +1039,16 @@ void create(std::shared_ptr<JNIObjectsForCreate> objs,
10391039
// Specify an opaque background color (white) to disable transparency.
10401040
settings.background_color = CefColorSetARGB(255, 255, 255, 255);
10411041
}
1042-
1042+
10431043
ScopedJNIClass cefBrowserSettings(env, "org/cef/CefBrowserSettings");
10441044
if (cefBrowserSettings != nullptr &&
10451045
objs->jbrowserSettings != nullptr) { // Dev-tools settings are null
1046-
GetJNIFieldInt(env, cefBrowserSettings, objs->jbrowserSettings,
1047-
"windowless_frame_rate", &settings.windowless_frame_rate);
1046+
GetJNIFieldInt(env, cefBrowserSettings, objs->jbrowserSettings,
1047+
"windowless_frame_rate", &settings.windowless_frame_rate);
1048+
GetJNIFieldBoolean(env, cefBrowserSettings, objs->jbrowserSettings,
1049+
"shared_texture_enabled", &windowInfo.shared_texture_enabled);
1050+
GetJNIFieldBoolean(env, cefBrowserSettings, objs->jbrowserSettings,
1051+
"external_begin_frame_enabled", &windowInfo.external_begin_frame_enabled);
10481052
}
10491053

10501054
CefRefPtr<CefBrowser> browserObj;
@@ -2172,6 +2176,14 @@ Java_org_cef_browser_CefBrowser_1N_N_1SetWindowlessFrameRate(JNIEnv* env,
21722176
host->SetWindowlessFrameRate(frameRate);
21732177
}
21742178

2179+
JNIEXPORT void JNICALL
2180+
Java_org_cef_browser_CefBrowser_1N_N_1SendExternalBeginFrame(JNIEnv* env,
2181+
jobject jbrowser) {
2182+
CefRefPtr<CefBrowser> browser = JNI_GET_BROWSER_OR_RETURN(env, jbrowser);
2183+
CefRefPtr<CefBrowserHost> host = browser->GetHost();
2184+
host->SendExternalBeginFrame();
2185+
}
2186+
21752187
void getWindowlessFrameRate(CefRefPtr<CefBrowserHost> host,
21762188
CefRefPtr<IntCallback> callback) {
21772189
callback->onComplete((jint)host->GetWindowlessFrameRate());

0 commit comments

Comments
 (0)