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

--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

View File

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

View File

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

View File

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