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 781220 - Remove the mLayerClient field from GeckoApp. r=sriram

Browse Source
This commit is contained in:
Kartikaya Gupta 2012-08-20 15:43:53 -04:00
parent 91da6e0789
commit c2cd754ccb
4 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mobile/android/base/GeckoApp.java
View File

@ -6,7 +6,6 @@
package org.mozilla.gecko;
import org.mozilla.gecko.db.BrowserDB;
import org.mozilla.gecko.gfx.GeckoLayerClient;
import org.mozilla.gecko.gfx.Layer;
import org.mozilla.gecko.gfx.LayerView;
import org.mozilla.gecko.gfx.PluginLayer;
@ -156,7 +155,6 @@ abstract public class GeckoApp
protected TabsPanel mTabsPanel;
private LayerView mLayerView;
private GeckoLayerClient mLayerClient;
private AbsoluteLayout mPluginContainer;
private FullScreenHolder mFullScreenPluginContainer;
@ -1649,9 +1647,9 @@ abstract public class GeckoApp
cameraView.getHolder().setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
}
if (mLayerClient == null) {
if (mLayerView == null) {
mLayerView = (LayerView) findViewById(R.id.layer_view);
mLayerClient = mLayerView.createLayerClient(GeckoAppShell.getEventDispatcher());
mLayerView.createLayerClient(GeckoAppShell.getEventDispatcher());
}
mPluginContainer = (AbsoluteLayout) findViewById(R.id.plugin_container);
@ -1753,7 +1751,7 @@ abstract public class GeckoApp
if (selectedTab != null)
Tabs.getInstance().selectTab(selectedTab.getId());
connectGeckoLayerClient();
GeckoAppShell.setLayerClient(getLayerClient());
GeckoAppShell.setLayerClient(mLayerView.getLayerClient());
GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("Viewport:Flush", null));
}
}
@ -2069,8 +2067,8 @@ abstract public class GeckoApp
deleteTempFiles();
if (mLayerClient != null)
mLayerClient.destroy();
if (mLayerView != null)
mLayerView.destroy();
if (mDoorHangerPopup != null)
mDoorHangerPopup.destroy();
if (mFormAssistPopup != null)
@ -2539,9 +2537,6 @@ abstract public class GeckoApp
GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("Tab:Add", args.toString()));
}
/* This method is referenced by Robocop via reflection. */
public GeckoLayerClient getLayerClient() { return mLayerClient; }
public LayerView getLayerView() {
return mLayerView;
}
@ -2590,7 +2585,7 @@ abstract public class GeckoApp
}
private void connectGeckoLayerClient() {
mLayerClient.notifyGeckoReady();
mLayerView.getLayerClient().notifyGeckoReady();
mLayerView.getTouchEventHandler().setOnTouchListener(new ContentTouchListener() {
private PointF initialPoint = null;

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

@ -505,7 +505,7 @@ public class GeckoAppShell
Log.i(LOGTAG, "post native init");
// Tell Gecko where the target byte buffer is for rendering
GeckoAppShell.setLayerClient(GeckoApp.mAppContext.getLayerClient());
GeckoAppShell.setLayerClient(GeckoApp.mAppContext.getLayerView().getLayerClient());
Log.i(LOGTAG, "setLayerClient called");

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

@ -35,7 +35,7 @@ public class RobocopAPI {
}
public void setDrawListener(GeckoLayerClient.DrawListener listener) {
mGeckoApp.getLayerClient().setDrawListener(listener);
mGeckoApp.getLayerView().getLayerClient().setDrawListener(listener);
}
public Cursor querySql(String dbPath, String query) {

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

@ -104,7 +104,7 @@ public class LayerView extends FrameLayout {
mCheckerboardShouldShowChecks = true;
}
public GeckoLayerClient createLayerClient(EventDispatcher eventDispatcher) {
public void createLayerClient(EventDispatcher eventDispatcher) {
mLayerClient = new GeckoLayerClient(getContext(), this, eventDispatcher);
mTouchEventHandler = new TouchEventHandler(getContext(), this, mLayerClient);
@ -113,8 +113,12 @@ public class LayerView extends FrameLayout {
setFocusable(true);
setFocusableInTouchMode(true);
}
return mLayerClient;
public void destroy() {
if (mLayerClient != null) {
mLayerClient.destroy();
}
}
@Override