Import jni headers
authorBenoit Girard <b56girard@gmail.com>
Wed, 01 Feb 2012 11:49:34 -0500
changeset 89047 7ee7e99b22dbbb65189a110548ef9346da5873ae
parent 89046 dc18daa0b61de3c280f9426637beb785dd338ec5
child 89048 e65daf4e910dad56c7fd947d822158e016319371
push id22242
push userkgupta@mozilla.com
push dateWed, 14 Mar 2012 15:19:09 +0000
treeherdermozilla-central@936ef50fa498 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone12.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Import jni headers
widget/android/AndroidFlexViewWrapper.cpp
widget/android/AndroidFlexViewWrapper.h
widget/android/Makefile.in
new file mode 100644
--- /dev/null
+++ b/widget/android/AndroidFlexViewWrapper.cpp
@@ -0,0 +1,1 @@
+#include "AndroidFlexViewWrapper.h"
new file mode 100644
--- /dev/null
+++ b/widget/android/AndroidFlexViewWrapper.h
@@ -0,0 +1,155 @@
+/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
+* ***** BEGIN LICENSE BLOCK *****
+* Version: MPL 1.1/GPL 2.0/LGPL 2.1
+*
+* The contents of this file are subject to the Mozilla Public License Version
+* 1.1 (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+* http://www.mozilla.org/MPL/
+*
+* Software distributed under the License is distributed on an "AS IS" basis,
+* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+* for the specific language governing rights and limitations under the
+* License.
+*
+* The Original Code is Mozilla Android code.
+*
+* The Initial Developer of the Original Code is Mozilla Foundation.
+* Portions created by the Initial Developer are Copyright (C) 2011-2012
+* the Initial Developer. All Rights Reserved.
+*
+* Contributor(s):
+* Patrick Walton <pcwalton@mozilla.com>
+*
+* Alternatively, the contents of this file may be used under the terms of
+* either the GNU General Public License Version 2 or later (the "GPL"), or
+* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+* in which case the provisions of the GPL or the LGPL are applicable instead
+* of those above. If you wish to allow use of your version of this file only
+* under the terms of either the GPL or the LGPL, and not to allow others to
+* use your version of this file under the terms of the MPL, indicate your
+* decision by deleting the provisions above and replace them with the notice
+* and other provisions required by the GPL or the LGPL. If you do not delete
+* the provisions above, a recipient may use your version of this file under
+* the terms of any one of the MPL, the GPL or the LGPL.
+*
+* ***** END LICENSE BLOCK ***** */
+
+#include <jni.h>
+#include <GLES/gl.h>
+#include <GLES/glext.h>
+#include <cassert>
+#include <cstdlib>
+//#include <EGL/egl.h>
+#include <pthread.h>
+
+#define NS_ASSERTION(cond, msg) assert((cond) && msg)
+
+namespace {
+
+JavaVM *sJVM = NULL;
+
+template<typename T>
+class AndroidEGLObject {
+public:
+    AndroidEGLObject(JNIEnv* aJEnv, jobject aJObj)
+    : mPtr(reinterpret_cast<typename T::NativeType>(aJEnv->GetIntField(aJObj, jPointerField))) {}
+
+    static void Init(JNIEnv* aJEnv) {
+        jclass jClass = reinterpret_cast<jclass>
+            (aJEnv->NewGlobalRef(aJEnv->FindClass(sClassName)));
+        jPointerField = aJEnv->GetFieldID(jClass, sPointerFieldName, "I");
+    }
+
+    typename T::NativeType const& operator*() const {
+        return mPtr;
+    }
+
+private:
+    static jfieldID jPointerField;
+    static const char* sClassName;
+    static const char* sPointerFieldName;
+
+    const typename T::NativeType mPtr;
+};
+
+typedef void *EGLConfig;
+typedef void *EGLContext;
+typedef void *EGLDisplay;
+typedef void *EGLSurface;
+
+class AndroidEGLDisplayInfo {
+public:
+    typedef EGLDisplay NativeType;
+private:
+    AndroidEGLDisplayInfo() {}
+};
+
+class AndroidEGLConfigInfo {
+public:
+    typedef EGLConfig NativeType;
+private:
+    AndroidEGLConfigInfo() {}
+};
+
+class AndroidEGLContextInfo {
+public:
+    typedef EGLContext NativeType;
+private:
+    AndroidEGLContextInfo() {}
+};
+
+class AndroidEGLSurfaceInfo {
+public:
+    typedef EGLSurface NativeType;
+private:
+    AndroidEGLSurfaceInfo() {}
+};
+
+typedef AndroidEGLObject<AndroidEGLDisplayInfo> AndroidEGLDisplay;
+typedef AndroidEGLObject<AndroidEGLConfigInfo> AndroidEGLConfig;
+typedef AndroidEGLObject<AndroidEGLContextInfo> AndroidEGLContext;
+typedef AndroidEGLObject<AndroidEGLSurfaceInfo> AndroidEGLSurface;
+
+class AndroidGLController {
+public:
+    static void Init(JNIEnv* aJEnv);
+
+    void Acquire(JNIEnv *aJEnv, jobject aJObj);
+    void Acquire(JNIEnv *aJEnv);
+    void Release();
+
+    void SetGLVersion(int aVersion);
+    void InitGLContext();
+    void DisposeGLContext();
+    EGLDisplay GetEGLDisplay();
+    EGLConfig GetEGLConfig();
+    EGLContext GetEGLContext();
+    EGLSurface GetEGLSurface();
+    bool HasSurface();
+    bool SwapBuffers();
+    bool CheckForLostContext();
+    void WaitForValidSurface();
+    int GetWidth();
+    int GetHeight();
+
+private:
+    static jmethodID jSetGLVersionMethod;
+    static jmethodID jInitGLContextMethod;
+    static jmethodID jDisposeGLContextMethod;
+    static jmethodID jGetEGLDisplayMethod;
+    static jmethodID jGetEGLConfigMethod;
+    static jmethodID jGetEGLContextMethod;
+    static jmethodID jGetEGLSurfaceMethod;
+    static jmethodID jHasSurfaceMethod;
+    static jmethodID jSwapBuffersMethod;
+    static jmethodID jCheckForLostContextMethod;
+    static jmethodID jWaitForValidSurfaceMethod;
+    static jmethodID jGetWidthMethod;
+    static jmethodID jGetHeightMethod;
+
+    JNIEnv *mJEnv;
+    jobject mJObj;
+};
+
+}
--- a/widget/android/Makefile.in
+++ b/widget/android/Makefile.in
@@ -61,16 +61,17 @@ endif
 
 CPPSRCS	= \
 	GfxInfo.cpp \
 	nsWidgetFactory.cpp \
 	nsAppShell.cpp \
 	AndroidJavaWrappers.cpp \
 	AndroidBridge.cpp \
 	AndroidDirectTexture.cpp \
+	AndroidFlexViewWrapper.cpp \
 	AndroidGraphicBuffer.cpp \
 	AndroidJNI.cpp \
 	nsWindow.cpp \
 	nsLookAndFeel.cpp \
 	nsScreenManagerAndroid.cpp \
 	nsIdleServiceAndroid.cpp \
 	nsClipboard.cpp \
 	nsFilePicker.cpp \