зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1288616
- Part 1. Remove unused AcquireNativeWindowFromSurfaceTexture / ReleaseNativeWindowForSurfaceTexture. r=snorp
MozReview-Commit-ID: 15SfycJX9Wn --HG-- extra : rebase_source : b746aca45f437b56911b8034e8919cc2b8b6ce2c extra : histedit_source : f915d9ce02a3fb564d7ff4593c0a2fe022f22de1
This commit is contained in:
Родитель
1fece1e7d7
Коммит
a0e21d5dea
|
@ -1298,31 +1298,6 @@ AndroidBridge::GetNativeWindowSize(void* window)
|
|||
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) {
|
||||
|
|
|
@ -232,9 +232,6 @@ public:
|
|||
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);
|
||||
|
|
Загрузка…
Ссылка в новой задаче