Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(300)

Unified Diff: talk/app/webrtc/java/android/org/webrtc/EglBase14.java

Issue 1522073002: Revert of Made EglBase an abstract class and cleaned up. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: talk/app/webrtc/java/android/org/webrtc/EglBase14.java
diff --git a/talk/app/webrtc/java/android/org/webrtc/EglBase14.java b/talk/app/webrtc/java/android/org/webrtc/EglBase14.java
index 580a3c6826fb517389e88039e7cc9e0c67edd46b..dc7a454942c1939325ea4d356fc6dc28b86df850 100644
--- a/talk/app/webrtc/java/android/org/webrtc/EglBase14.java
+++ b/talk/app/webrtc/java/android/org/webrtc/EglBase14.java
@@ -47,6 +47,9 @@
private static final String TAG = "EglBase14";
private static final int EGL14_SDK_VERSION = android.os.Build.VERSION_CODES.JELLY_BEAN_MR1;
private static final int CURRENT_SDK_VERSION = android.os.Build.VERSION.SDK_INT;
+ // Android-specific extension.
+ private static final int EGL_RECORDABLE_ANDROID = 0x3142;
+
private EGLContext eglContext;
private EGLConfig eglConfig;
private EGLDisplay eglDisplay;
@@ -62,6 +65,7 @@
private final android.opengl.EGLContext egl14Context;
Context(android.opengl.EGLContext eglContext) {
+ super(null);
this.egl14Context = eglContext;
}
}
@@ -69,6 +73,7 @@
// Create a new context with the specified config type, sharing data with sharedContext.
// |sharedContext| may be null.
EglBase14(EglBase14.Context sharedContext, int[] configAttributes) {
+ super(true /* dummy */);
eglDisplay = getEglDisplay();
eglConfig = getEglConfig(eglDisplay, configAttributes);
eglContext = createEglContext(sharedContext, eglDisplay, eglConfig);

Powered by Google App Engine
This is Rietveld 408576698