Bug 1288616 - Part 1. Remove unused AcquireNativeWindowFromSurfaceTexture / ReleaseNativeWindowForSurfaceTexture. r?snorp
MozReview-Commit-ID: 15SfycJX9Wn
--- a/widget/android/AndroidBridge.cpp
+++ b/widget/android/AndroidBridge.cpp
@@ -1355,41 +1355,16 @@ AndroidBridge::GetNativeWindowSize(void*
{
if (!window || !ANativeWindow_getWidth || !ANativeWindow_getHeight) {
return IntSize(0, 0);
}
return IntSize(ANativeWindow_getWidth(window), ANativeWindow_getHeight(window));
}
-void*
-AndroidBridge::AcquireNativeWindowFromSurfaceTexture(JNIEnv* aEnv, jobject aSurfaceTexture)
-{
- OpenGraphicsLibraries();
-
- if (mHasNativeWindowAccess && ANativeWindow_fromSurfaceTexture)
- return ANativeWindow_fromSurfaceTexture(aEnv, aSurfaceTexture);
-
- if (mHasNativeWindowAccess && android_SurfaceTexture_getNativeWindow) {
- android::sp<AndroidRefable> window = android_SurfaceTexture_getNativeWindow(aEnv, aSurfaceTexture);
- return window.get();
- }
-
- return nullptr;
-}
-
-void
-AndroidBridge::ReleaseNativeWindowForSurfaceTexture(void *window)
-{
- if (!window)
- return;
-
- // FIXME: we don't ref the pointer we get, so nothing to do currently. We should ref it.
-}
-
jobject
AndroidBridge::GetGlobalContextRef() {
if (sGlobalContext) {
return sGlobalContext;
}
JNIEnv* const env = GetEnvForThread();
AutoLocalJNIFrame jniFrame(env, 4);
--- a/widget/android/AndroidBridge.h
+++ b/widget/android/AndroidBridge.h
@@ -228,19 +228,16 @@ public:
};
bool HasNativeWindowAccess();
void *AcquireNativeWindow(JNIEnv* aEnv, jobject aSurface);
void ReleaseNativeWindow(void *window);
mozilla::gfx::IntSize GetNativeWindowSize(void* window);
- void *AcquireNativeWindowFromSurfaceTexture(JNIEnv* aEnv, jobject aSurface);
- void ReleaseNativeWindowForSurfaceTexture(void *window);
-
void HandleGeckoMessage(JSContext* cx, JS::HandleObject message);
bool InitCamera(const nsCString& contentType, uint32_t camera, uint32_t *width, uint32_t *height, uint32_t *fps);
void GetCurrentBatteryInformation(hal::BatteryInformation* aBatteryInfo);
nsresult GetSegmentInfoForText(const nsAString& aText,
nsIMobileMessageCallback* aRequest);