mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 839622 - Remove a native function that hasn't been used since bug 735230, and the unneeded setSurfaceView implementation. r=cpeterson
This commit is contained in:
parent
86703d3edb
commit
108e5d044f
@ -232,11 +232,10 @@ public class GeckoAppShell
|
|||||||
|
|
||||||
public static native void scheduleComposite();
|
public static native void scheduleComposite();
|
||||||
|
|
||||||
// Pausing and resuming the compositor is a synchronous request, so be
|
// Resuming the compositor is a synchronous request, so be
|
||||||
// careful of possible deadlock. Resuming the compositor will also cause
|
// careful of possible deadlock. Resuming the compositor will also cause
|
||||||
// a composition, so there is no need to schedule a composition after
|
// a composition, so there is no need to schedule a composition after
|
||||||
// resuming.
|
// resuming.
|
||||||
public static native void schedulePauseComposition();
|
|
||||||
public static native void scheduleResumeComposition(int width, int height);
|
public static native void scheduleResumeComposition(int width, int height);
|
||||||
|
|
||||||
public static native float computeRenderIntegrity();
|
public static native float computeRenderIntegrity();
|
||||||
|
@ -476,25 +476,6 @@ Java_org_mozilla_gecko_GeckoAppShell_scheduleComposite(JNIEnv * arg0, jclass arg
|
|||||||
|
|
||||||
#ifdef JNI_STUBS
|
#ifdef JNI_STUBS
|
||||||
|
|
||||||
typedef void (*Java_org_mozilla_gecko_GeckoAppShell_schedulePauseComposition_t)(JNIEnv *, jclass);
|
|
||||||
static Java_org_mozilla_gecko_GeckoAppShell_schedulePauseComposition_t f_Java_org_mozilla_gecko_GeckoAppShell_schedulePauseComposition;
|
|
||||||
extern "C" NS_EXPORT void JNICALL
|
|
||||||
Java_org_mozilla_gecko_GeckoAppShell_schedulePauseComposition(JNIEnv * arg0, jclass arg1) {
|
|
||||||
if (!f_Java_org_mozilla_gecko_GeckoAppShell_schedulePauseComposition) {
|
|
||||||
arg0->ThrowNew(arg0->FindClass("java/lang/UnsupportedOperationException"),
|
|
||||||
"JNI Function called before it was loaded");
|
|
||||||
return ;
|
|
||||||
}
|
|
||||||
f_Java_org_mozilla_gecko_GeckoAppShell_schedulePauseComposition(arg0, arg1);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef JNI_BINDINGS
|
|
||||||
xul_dlsym("Java_org_mozilla_gecko_GeckoAppShell_schedulePauseComposition", &f_Java_org_mozilla_gecko_GeckoAppShell_schedulePauseComposition);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef JNI_STUBS
|
|
||||||
|
|
||||||
typedef void (*Java_org_mozilla_gecko_GeckoAppShell_scheduleResumeComposition_t)(JNIEnv *, jclass, jint, jint);
|
typedef void (*Java_org_mozilla_gecko_GeckoAppShell_scheduleResumeComposition_t)(JNIEnv *, jclass, jint, jint);
|
||||||
static Java_org_mozilla_gecko_GeckoAppShell_scheduleResumeComposition_t f_Java_org_mozilla_gecko_GeckoAppShell_scheduleResumeComposition;
|
static Java_org_mozilla_gecko_GeckoAppShell_scheduleResumeComposition_t f_Java_org_mozilla_gecko_GeckoAppShell_scheduleResumeComposition;
|
||||||
extern "C" NS_EXPORT void JNICALL
|
extern "C" NS_EXPORT void JNICALL
|
||||||
|
@ -71,12 +71,6 @@ Java_org_mozilla_gecko_GeckoAppShell_processNextNativeEvent(JNIEnv *jenv, jclass
|
|||||||
nsAppShell::gAppShell->ProcessNextNativeEvent(false);
|
nsAppShell::gAppShell->ProcessNextNativeEvent(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_EXPORT void JNICALL
|
|
||||||
Java_org_mozilla_gecko_GeckoAppShell_setSurfaceView(JNIEnv *jenv, jclass, jobject obj)
|
|
||||||
{
|
|
||||||
AndroidBridge::Bridge()->SetSurfaceView(jenv->NewGlobalRef(obj));
|
|
||||||
}
|
|
||||||
|
|
||||||
NS_EXPORT void JNICALL
|
NS_EXPORT void JNICALL
|
||||||
Java_org_mozilla_gecko_GeckoAppShell_setLayerClient(JNIEnv *jenv, jclass, jobject obj)
|
Java_org_mozilla_gecko_GeckoAppShell_setLayerClient(JNIEnv *jenv, jclass, jobject obj)
|
||||||
{
|
{
|
||||||
@ -671,12 +665,6 @@ Java_org_mozilla_gecko_GeckoAppShell_scheduleComposite(JNIEnv*, jclass)
|
|||||||
nsWindow::ScheduleComposite();
|
nsWindow::ScheduleComposite();
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_EXPORT void JNICALL
|
|
||||||
Java_org_mozilla_gecko_GeckoAppShell_schedulePauseComposition(JNIEnv*, jclass)
|
|
||||||
{
|
|
||||||
nsWindow::SchedulePauseComposition();
|
|
||||||
}
|
|
||||||
|
|
||||||
NS_EXPORT void JNICALL
|
NS_EXPORT void JNICALL
|
||||||
Java_org_mozilla_gecko_GeckoAppShell_scheduleResumeComposition(JNIEnv*, jclass, jint width, jint height)
|
Java_org_mozilla_gecko_GeckoAppShell_scheduleResumeComposition(JNIEnv*, jclass, jint width, jint height)
|
||||||
{
|
{
|
||||||
|
@ -2307,14 +2307,6 @@ nsWindow::ScheduleComposite()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
nsWindow::SchedulePauseComposition()
|
|
||||||
{
|
|
||||||
if (sCompositorParent) {
|
|
||||||
sCompositorParent->SchedulePauseOnCompositorThread();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
nsWindow::ScheduleResumeComposition(int width, int height)
|
nsWindow::ScheduleResumeComposition(int width, int height)
|
||||||
{
|
{
|
||||||
|
@ -154,7 +154,6 @@ public:
|
|||||||
mozilla::layers::CompositorParent* aCompositorParent,
|
mozilla::layers::CompositorParent* aCompositorParent,
|
||||||
mozilla::layers::CompositorChild* aCompositorChild);
|
mozilla::layers::CompositorChild* aCompositorChild);
|
||||||
static void ScheduleComposite();
|
static void ScheduleComposite();
|
||||||
static void SchedulePauseComposition();
|
|
||||||
static void ScheduleResumeComposition(int width, int height);
|
static void ScheduleResumeComposition(int width, int height);
|
||||||
static void ForceIsFirstPaint();
|
static void ForceIsFirstPaint();
|
||||||
static float ComputeRenderIntegrity();
|
static float ComputeRenderIntegrity();
|
||||||
|
Loading…
Reference in New Issue
Block a user