diff options
| author | Anton Tarasov <anton.tarasov@jetbrains.com> | 2021-01-20 17:51:05 +0300 |
|---|---|---|
| committer | Anton Tarasov <anton.tarasov@jetbrains.com> | 2021-01-20 17:51:05 +0300 |
| commit | 02d12314fcd8fa81628d50de1e21744f2e6077d8 (patch) | |
| tree | b1f155adabbbcbc3177f03e7e225fc486290a44a /java/org/cef/browser/CefRenderer.java | |
| parent | c04edd546efcd86891ed472fa9857aaf1e4d8fc1 (diff) | |
| parent | 304f3e3de03fb3aab5e8212c0f9c699503a55cb4 (diff) | |
| download | jcef-02d12314fcd8fa81628d50de1e21744f2e6077d8.tar.gz | |
Merge branch 'java-cef'
# Conflicts:
# java/org/cef/browser/CefBrowser.java
# java/org/cef/browser/CefBrowserOsr.java
# java/org/cef/browser/CefBrowser_N.java
# java/org/cef/browser/CefFrame.java
# java/org/cef/browser/CefFrame_N.java
# native/CefBrowser_N.cpp
# native/CefFrame_N.cpp
# native/CefFrame_N.h
# native/util_linux.cpp
# native/util_mac.mm
# third_party/jogamp/jar/gluegen-rt-natives-linux-amd64.jar
# third_party/jogamp/jar/gluegen-rt-natives-macosx-universal.jar
# third_party/jogamp/jar/gluegen-rt-natives-windows-amd64.jar
# third_party/jogamp/jar/gluegen-rt.jar
# third_party/jogamp/jar/jogl-all-natives-linux-amd64.jar
# third_party/jogamp/jar/jogl-all-natives-macosx-universal.jar
# third_party/jogamp/jar/jogl-all-natives-windows-amd64.jar
# third_party/jogamp/jar/jogl-all.jar
# tools/compile.sh
# tools/make_distrib.sh
# tools/make_docs.sh
# tools/run.sh
# tools/run_tests.sh
Diffstat (limited to 'java/org/cef/browser/CefRenderer.java')
| -rw-r--r-- | java/org/cef/browser/CefRenderer.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/java/org/cef/browser/CefRenderer.java b/java/org/cef/browser/CefRenderer.java index f5d8e7c..2a29546 100644 --- a/java/org/cef/browser/CefRenderer.java +++ b/java/org/cef/browser/CefRenderer.java @@ -30,6 +30,10 @@ class CefRenderer { return transparent_; } + protected int getTextureID() { + return texture_id_[0]; + } + @SuppressWarnings("static-access") protected void initialize(GL2 gl2) { if (initialized_context_ == gl2) return; |