wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Back out b35af982b085 (bug 721080) for android-xul bustage

Browse Source
This commit is contained in:
Phil Ringnalda 2012-02-01 12:10:53 -08:00
parent 2da064d89d
commit 4c969ca5d1
5 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mobile/android/base/GeckoAppShell.java
View File

@ -1121,11 +1121,11 @@ public class GeckoAppShell
});
}
public static void setPreventPanning(final boolean aPreventPanning) {
public static void preventPanning() {
getMainHandler().post(new Runnable() {
public void run() {
LayerController layerController = GeckoApp.mAppContext.getLayerController();
layerController.preventPanning(aPreventPanning);
layerController.preventPanning(true);
}
});
}

16
mobile/android/base/gfx/LayerController.java
View File

@ -441,15 +441,13 @@ public class LayerController {
allowDefaultTimer.purge();
allowDefaultTimer = null;
}
if (aValue == allowDefaultActions) {
allowDefaultActions = !aValue;
if (aValue) {
mView.clearEventQueue();
mPanZoomController.cancelTouch();
} else {
mView.processEventQueue();
}
allowDefaultActions = !aValue;
if (aValue) {
mView.clearEventQueue();
mPanZoomController.cancelTouch();
} else {
mView.processEventQueue();
}
}

6
widget/android/AndroidBridge.cpp
View File

@ -125,7 +125,7 @@ AndroidBridge::Init(JNIEnv *jEnv,
jGetDpi = (jmethodID) jEnv->GetStaticMethodID(jGeckoAppShellClass, "getDpi", "()I");
jSetFullScreen = (jmethodID) jEnv->GetStaticMethodID(jGeckoAppShellClass, "setFullScreen", "(Z)V");
jShowInputMethodPicker = (jmethodID) jEnv->GetStaticMethodID(jGeckoAppShellClass, "showInputMethodPicker", "()V");
jSetPreventPanning = (jmethodID) jEnv->GetStaticMethodID(jGeckoAppShellClass, "setPreventPanning", "(Z)V");
jPreventPanning = (jmethodID) jEnv->GetStaticMethodID(jGeckoAppShellClass, "preventPanning", "()V");
jHideProgressDialog = (jmethodID) jEnv->GetStaticMethodID(jGeckoAppShellClass, "hideProgressDialog", "()V");
jPerformHapticFeedback = (jmethodID) jEnv->GetStaticMethodID(jGeckoAppShellClass, "performHapticFeedback", "(Z)V");
jVibrate1 = (jmethodID) jEnv->GetStaticMethodID(jGeckoAppShellClass, "vibrate", "(J)V");
@ -1806,13 +1806,13 @@ NS_IMETHODIMP nsAndroidBridge::SetDrawMetadataProvider(nsIAndroidDrawMetadataPro
}
void
AndroidBridge::SetPreventPanning(bool aPreventPanning) {
AndroidBridge::PreventPanning() {
ALOG_BRIDGE("AndroidBridge::PreventPanning");
JNIEnv *env = GetJNIEnv();
if (!env)
return;
env->CallStaticVoidMethod(mGeckoAppShellClass, jSetPreventPanning, (jboolean)aPreventPanning);
env->CallStaticVoidMethod(mGeckoAppShellClass, jPreventPanning);
}

4
widget/android/AndroidBridge.h
View File

@ -230,7 +230,7 @@ public:
void ShowInputMethodPicker();
void SetPreventPanning(bool aPreventPanning);
void PreventPanning();
void HideProgressDialogOnce();
@ -439,7 +439,7 @@ protected:
jmethodID jGetDpi;
jmethodID jSetFullScreen;
jmethodID jShowInputMethodPicker;
jmethodID jSetPreventPanning;
jmethodID jPreventPanning;
jmethodID jHideProgressDialog;
jmethodID jPerformHapticFeedback;
jmethodID jVibrate1;

5
widget/android/nsWindow.cpp
View File

@ -1579,9 +1579,8 @@ nsWindow::DispatchMultitouchEvent(nsTouchEvent &event, AndroidGeckoEvent *ae)
nsEventStatus status;
DispatchEvent(&event, status);
bool preventPanning = (status == nsEventStatus_eConsumeNoDefault);
if (preventPanning || action == AndroidMotionEvent::ACTION_MOVE) {
AndroidBridge::Bridge()->SetPreventPanning(preventPanning);
if (status == nsEventStatus_eConsumeNoDefault) {
AndroidBridge::Bridge()->PreventPanning();
return true;
}
return false;