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

Bug 778468 - Part 6: Inject LayerView's InputConnectionHandler to remove GeckoInputConnection dependency. r=blassey

Browse Source 
--HG--
extra : rebase_source : 7422a54c7c360ef8712c75d865e5e545d922aad1
This commit is contained in:
Chris Peterson 2012-08-02 11:56:52 -07:00
parent 469bd35e11
commit 058219de38
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -541,7 +541,8 @@ public class GeckoAppShell
private static void geckoLoaded() { private static void geckoLoaded() {
final LayerController layerController = GeckoApp.mAppContext.getLayerController(); final LayerController layerController = GeckoApp.mAppContext.getLayerController();
LayerView v = layerController.getView(); LayerView v = layerController.getView();
mInputConnection = v.setInputConnectionHandler(); mInputConnection = GeckoInputConnection.create(v);
v.setInputConnectionHandler(mInputConnection);
layerController.notifyLayerClientOfGeometryChange(); layerController.notifyLayerClientOfGeometryChange();
} }

2
mobile/android/base/GeckoInputConnection.java
View File

@ -43,7 +43,7 @@ import android.view.inputmethod.InputMethodManager;
import java.util.Timer; import java.util.Timer;
import java.util.TimerTask; import java.util.TimerTask;
public class GeckoInputConnection class GeckoInputConnection
extends BaseInputConnection extends BaseInputConnection
implements TextWatcher, InputConnectionHandler { implements TextWatcher, InputConnectionHandler {

7
mobile/android/base/gfx/LayerView.java
View File

@ -6,7 +6,6 @@
package org.mozilla.gecko.gfx; package org.mozilla.gecko.gfx;
import org.mozilla.gecko.GeckoApp; import org.mozilla.gecko.GeckoApp;
import org.mozilla.gecko.GeckoInputConnection;
import android.content.Context; import android.content.Context;
import android.graphics.PixelFormat; import android.graphics.PixelFormat;
@ -131,10 +130,8 @@ public class LayerView extends FrameLayout {
mController.setViewportSize(new FloatSize(size)); mController.setViewportSize(new FloatSize(size));
} }
public GeckoInputConnection setInputConnectionHandler() { public void setInputConnectionHandler(InputConnectionHandler inputConnectionHandler) {
GeckoInputConnection geckoInputConnection = GeckoInputConnection.create(this); mInputConnectionHandler = inputConnectionHandler;
mInputConnectionHandler = geckoInputConnection;
return geckoInputConnection;
} }
@Override @Override