Fix empty contents when moving an OSR window between displays.

magreenblatt · magreenblatt · commit bee2ef8762bd · 2020-05-21T14:17:15.000-04:00
The GLContext will be re-initialized when moving the window between displays.
The GLContext.makeCurrent() return value must be checked for
CONTEXT_NOT_CURRENT during this time. Additionally, CefRenderer.cleanup()
should reset the view width/height so that the texture is correctly updated on
the next call to onPaint().
diff --git a/java/org/cef/browser/CefBrowserOsr.java b/java/org/cef/browser/CefBrowserOsr.java
@@ -109,6 +109,8 @@ public void paint(Graphics g) {
             }
         };
 
+        // The GLContext will be re-initialized when changing displays, resulting in calls to
+        // dispose/init/reshape.
         canvas_.addGLEventListener(new GLEventListener() {
             @Override
             public void reshape(
@@ -251,7 +253,11 @@ public void onPaint(CefBrowser browser, boolean popup, Rectangle[] dirtyRects,
             return;
         }
 
-        context.makeCurrent();
+        // This result can occur due to GLContext re-initialization when changing displays.
+        if (context.makeCurrent() == GLContext.CONTEXT_NOT_CURRENT) {
+            return;
+        }
+
         renderer_.onPaint(canvas_.getGL().getGL2(), popup, dirtyRects, buffer, width, height);
         context.release();
         SwingUtilities.invokeLater(new Runnable() {
diff --git a/java/org/cef/browser/CefRenderer.java b/java/org/cef/browser/CefRenderer.java
@@ -4,12 +4,12 @@
 
 package org.cef.browser;
 
+import com.jogamp.opengl.GL2;
+
 import java.awt.Rectangle;
 import java.nio.ByteBuffer;
 import java.nio.FloatBuffer;
 
-import com.jogamp.opengl.GL2;
-
 class CefRenderer {
     private boolean transparent_;
     private GL2 initialized_context_ = null;
@@ -53,7 +53,7 @@ protected void initialize(GL2 gl2) {
 
         // Create the texture.
         gl2.glGenTextures(1, texture_id_, 0);
-        assert(texture_id_[0] != 0);
+        assert (texture_id_[0] != 0);
 
         gl2.glBindTexture(gl2.GL_TEXTURE_2D, texture_id_[0]);
         gl2.glTexParameteri(gl2.GL_TEXTURE_2D, gl2.GL_TEXTURE_MIN_FILTER, gl2.GL_NEAREST);
@@ -63,13 +63,14 @@ protected void initialize(GL2 gl2) {
 
     protected void cleanup(GL2 gl2) {
         if (texture_id_[0] != 0) gl2.glDeleteTextures(1, texture_id_, 0);
+        view_width_ = view_height_ = 0;
     }
 
     @SuppressWarnings("static-access")
     protected void render(GL2 gl2) {
         if (use_draw_pixels_ || view_width_ == 0 || view_height_ == 0) return;
 
-        assert(initialized_context_ != null);
+        assert (initialized_context_ != null);
 
         final float[] vertex_data = {// tu,   tv,     x,     y,    z
                 0.0f, 1.0f, -1.0f, -1.0f, 0.0f, 1.0f, 1.0f, 1.0f, -1.0f, 0.0f, 1.0f, 0.0f, 1.0f,
@@ -114,7 +115,7 @@ protected void render(GL2 gl2) {
         gl2.glEnable(gl2.GL_TEXTURE_2D);
 
         // Draw the facets with the texture.
-        assert(texture_id_[0] != 0);
+        assert (texture_id_[0] != 0);
         gl2.glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
         gl2.glBindTexture(gl2.GL_TEXTURE_2D, texture_id_[0]);
         gl2.glInterleavedArrays(gl2.GL_T2F_V3F, 0, vertices);
@@ -178,7 +179,7 @@ protected void onPaint(GL2 gl2, boolean popup, Rectangle[] dirtyRects, ByteBuffe
         // Enable 2D textures.
         gl2.glEnable(gl2.GL_TEXTURE_2D);
 
-        assert(texture_id_[0] != 0);
+        assert (texture_id_[0] != 0);
         gl2.glBindTexture(gl2.GL_TEXTURE_2D, texture_id_[0]);
 
         if (!popup) {
