Merge

src/share/classes/sun/awt/datatransfer/DataTransferer.java

@@ -2905,13 +2905,13 @@ search:
                     return comp;
                 }
 
-//                if (flavor1.isFlavorTextType()) {
-//                    return 1;
-//                }
-//
-//                if (flavor2.isFlavorTextType()) {
-//                    return -1;
-//                }
+                if (flavor1.isFlavorTextType()) {
+                    return 1;
+                }
+
+                if (flavor2.isFlavorTextType()) {
+                    return -1;
+                }
 
                 // Next, look for application/x-java-* types. Prefer unknown
                 // MIME types because if the user provides his own data flavor,

src/share/classes/sun/java2d/opengl/OGLContext.java

@@ -194,6 +194,10 @@ public class OGLContext extends BufferedContext {
         /** Indicates the presence of the GL_ARB_texture_rectangle extension. */
         @Native
         static final int CAPS_EXT_TEXRECT      = (FIRST_PRIVATE_CAP << 4);
+        /** Indicates the presence of the GL_NV_texture_barrier extension. */
+        @Native
+        static final int CAPS_EXT_TEXBARRIER = (FIRST_PRIVATE_CAP << 5);
+
 
         OGLContextCaps(int caps, String adapterId) {
             super(caps, adapterId);
@@ -223,6 +227,9 @@ public class OGLContext extends BufferedContext {
             if ((caps & CAPS_EXT_TEXRECT) != 0) {
                 buf.append("CAPS_EXT_TEXRECT|");
             }
+            if ((caps & CAPS_EXT_TEXBARRIER) != 0) {
+                buf.append("CAPS_EXT_TEXBARRIER|");
+            }
             return buf.toString();
         }
     }

src/share/native/sun/java2d/opengl/OGLContext.h

@@ -134,6 +134,8 @@ typedef struct {
     sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_GRAD_SHADER
 #define CAPS_EXT_TEXRECT     \
     sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_TEXRECT
+#define CAPS_EXT_TEXBARRIER  \
+    sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_TEXBARRIER
 
 /**
  * Evaluates to true if the given capability bitmask is present for the