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 733184 - Maple: Remove some Java logging. r=pcwalton

Browse Source
This commit is contained in:
Benoit Girard 2012-03-05 18:50:00 -05:00
parent 60aaf487bb
commit a39be473cc
4 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1733,9 +1733,7 @@ abstract public class GeckoApp
/* /*
* Create a layer client, but don't hook it up to the layer controller yet. * Create a layer client, but don't hook it up to the layer controller yet.
*/ */
Log.e(LOGTAG, "### Creating GeckoLayerClient");
mLayerClient = new GeckoLayerClient(this); mLayerClient = new GeckoLayerClient(this);
Log.e(LOGTAG, "### Done creating GeckoLayerClient");
/* /*
* Hook a placeholder layer client up to the layer controller so that the user can pan * Hook a placeholder layer client up to the layer controller so that the user can pan

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

@ -103,7 +103,6 @@ public class FlexibleGLSurfaceView extends SurfaceView implements SurfaceHolder.
"already in place!"); "already in place!");
} }
Log.e(LOGTAG, "### Creating GL thread!");
mGLThread = new GLThread(mController); mGLThread = new GLThread(mController);
mGLThread.start(); mGLThread.start();
notifyAll(); notifyAll();
@ -115,7 +114,6 @@ public class FlexibleGLSurfaceView extends SurfaceView implements SurfaceHolder.
*/ */
public synchronized Thread destroyGLThread() { public synchronized Thread destroyGLThread() {
// Wait for the GL thread to be started. // Wait for the GL thread to be started.
Log.e(LOGTAG, "### Waiting for GL thread to be created...");
while (mGLThread == null) { while (mGLThread == null) {
try { try {
wait(); wait();
@ -124,7 +122,6 @@ public class FlexibleGLSurfaceView extends SurfaceView implements SurfaceHolder.
} }
} }
Log.e(LOGTAG, "### Destroying GL thread!");
Thread glThread = mGLThread; Thread glThread = mGLThread;
mGLThread.shutdown(); mGLThread.shutdown();
mGLThread = null; mGLThread = null;
@ -182,15 +179,10 @@ public class FlexibleGLSurfaceView extends SurfaceView implements SurfaceHolder.
// Called from the compositor thread // Called from the compositor thread
public static GLController registerCxxCompositor() { public static GLController registerCxxCompositor() {
try { try {
Log.e(LOGTAG, "### registerCxxCompositor point A");
System.out.println("register layer comp");
Log.e(LOGTAG, "### registerCxxCompositor point B");
FlexibleGLSurfaceView flexView = (FlexibleGLSurfaceView)GeckoApp.mAppContext.getLayerController().getView(); FlexibleGLSurfaceView flexView = (FlexibleGLSurfaceView)GeckoApp.mAppContext.getLayerController().getView();
Log.e(LOGTAG, "### registerCxxCompositor point C: " + flexView);
try { try {
flexView.destroyGLThread().join(); flexView.destroyGLThread().join();
} catch (InterruptedException e) {} } catch (InterruptedException e) {}
Log.e(LOGTAG, "### registerCxxCompositor point D: " + flexView.getGLController());
return flexView.getGLController(); return flexView.getGLController();
} catch (Exception e) { } catch (Exception e) {
Log.e(LOGTAG, "### Exception! " + e); Log.e(LOGTAG, "### Exception! " + e);

19
mobile/android/base/gfx/GeckoLayerClient.java
View File

@ -126,8 +126,6 @@ public class GeckoLayerClient implements GeckoEventResponder,
/** This function is invoked by Gecko via JNI; be careful when modifying signature. */ /** This function is invoked by Gecko via JNI; be careful when modifying signature. */
public boolean beginDrawing(int width, int height, String metadata) { public boolean beginDrawing(int width, int height, String metadata) {
Log.e(LOGTAG, "### beginDrawing " + width + " " + height);
// If the viewport has changed but we still don't have the latest viewport // If the viewport has changed but we still don't have the latest viewport
// from Gecko, ignore the viewport passed to us from Gecko since that is going // from Gecko, ignore the viewport passed to us from Gecko since that is going
// to be wrong. // to be wrong.
@ -145,8 +143,6 @@ public class GeckoLayerClient implements GeckoEventResponder,
try { try {
JSONObject viewportObject = new JSONObject(metadata); JSONObject viewportObject = new JSONObject(metadata);
mNewGeckoViewport = new ViewportMetrics(viewportObject); mNewGeckoViewport = new ViewportMetrics(viewportObject);
Log.e(LOGTAG, "### beginDrawing new Gecko viewport " + mNewGeckoViewport);
} catch (JSONException e) { } catch (JSONException e) {
Log.e(LOGTAG, "Aborting draw, bad viewport description: " + metadata); Log.e(LOGTAG, "Aborting draw, bad viewport description: " + metadata);
return false; return false;
@ -173,9 +169,6 @@ public class GeckoLayerClient implements GeckoEventResponder,
RectF position = mGeckoViewport.getViewport(); RectF position = mGeckoViewport.getViewport();
mRootLayer.setPositionAndResolution(RectUtils.round(position), mGeckoViewport.getZoomFactor()); mRootLayer.setPositionAndResolution(RectUtils.round(position), mGeckoViewport.getZoomFactor());
Log.e(LOGTAG, "### updateViewport onlyUpdatePageSize=" + !mUpdateViewportOnEndDraw +
" getTileViewport " + mGeckoViewport);
if (mUpdateViewportOnEndDraw) { if (mUpdateViewportOnEndDraw) {
mLayerController.setViewportMetrics(mGeckoViewport); mLayerController.setViewportMetrics(mGeckoViewport);
mLayerController.abortPanZoomAnimation(); mLayerController.abortPanZoomAnimation();
@ -207,8 +200,6 @@ public class GeckoLayerClient implements GeckoEventResponder,
/* Informs Gecko that the screen size has changed. */ /* Informs Gecko that the screen size has changed. */
private void sendResizeEventIfNecessary(boolean force) { private void sendResizeEventIfNecessary(boolean force) {
Log.d(LOGTAG, "### sendResizeEventIfNecessary " + force);
DisplayMetrics metrics = new DisplayMetrics(); DisplayMetrics metrics = new DisplayMetrics();
GeckoApp.mAppContext.getWindowManager().getDefaultDisplay().getMetrics(metrics); GeckoApp.mAppContext.getWindowManager().getDefaultDisplay().getMetrics(metrics);
@ -243,7 +234,6 @@ public class GeckoLayerClient implements GeckoEventResponder,
return false; return false;
} }
Log.e(LOGTAG, "### Creating virtual layer");
VirtualLayer virtualLayer = new VirtualLayer(getBufferSize()); VirtualLayer virtualLayer = new VirtualLayer(getBufferSize());
mLayerController.setRoot(virtualLayer); mLayerController.setRoot(virtualLayer);
mRootLayer = virtualLayer; mRootLayer = virtualLayer;
@ -284,7 +274,6 @@ public class GeckoLayerClient implements GeckoEventResponder,
/** Implementation of GeckoEventResponder/GeckoEventListener. */ /** Implementation of GeckoEventResponder/GeckoEventListener. */
public void handleMessage(String event, JSONObject message) { public void handleMessage(String event, JSONObject message) {
if ("Viewport:UpdateAndDraw".equals(event)) { if ("Viewport:UpdateAndDraw".equals(event)) {
Log.e(LOGTAG, "### Java side Viewport:UpdateAndDraw()!");
mUpdateViewportOnEndDraw = true; mUpdateViewportOnEndDraw = true;
mIgnorePaintsPendingViewportSizeChange = false; mIgnorePaintsPendingViewportSizeChange = false;
@ -292,7 +281,6 @@ public class GeckoLayerClient implements GeckoEventResponder,
Rect rect = new Rect(0, 0, mBufferSize.width, mBufferSize.height); Rect rect = new Rect(0, 0, mBufferSize.width, mBufferSize.height);
GeckoAppShell.sendEventToGecko(GeckoEvent.createDrawEvent(rect)); GeckoAppShell.sendEventToGecko(GeckoEvent.createDrawEvent(rect));
} else if ("Viewport:UpdateLater".equals(event)) { } else if ("Viewport:UpdateLater".equals(event)) {
Log.e(LOGTAG, "### Java side Viewport:UpdateLater()!");
mUpdateViewportOnEndDraw = true; mUpdateViewportOnEndDraw = true;
mIgnorePaintsPendingViewportSizeChange = false; mIgnorePaintsPendingViewportSizeChange = false;
} }
@ -331,8 +319,6 @@ public class GeckoLayerClient implements GeckoEventResponder,
/** This function is invoked by Gecko via JNI; be careful when modifying signature. */ /** This function is invoked by Gecko via JNI; be careful when modifying signature. */
public ViewTransform getViewTransform() { public ViewTransform getViewTransform() {
Log.e(LOGTAG, "### getViewTransform()");
// NB: We don't begin a transaction here because this can be called in a synchronous // NB: We don't begin a transaction here because this can be called in a synchronous
// manner between beginDrawing() and endDrawing(), and that will cause a deadlock. // manner between beginDrawing() and endDrawing(), and that will cause a deadlock.
@ -342,8 +328,6 @@ public class GeckoLayerClient implements GeckoEventResponder,
float scrollX = viewportOrigin.x; float scrollX = viewportOrigin.x;
float scrollY = viewportOrigin.y; float scrollY = viewportOrigin.y;
float zoomFactor = viewportMetrics.getZoomFactor(); float zoomFactor = viewportMetrics.getZoomFactor();
Log.e(LOGTAG, "### Viewport metrics = " + viewportMetrics + " tile reso = " +
mRootLayer.getResolution());
return new ViewTransform(scrollX, scrollY, zoomFactor); return new ViewTransform(scrollX, scrollY, zoomFactor);
} }
} }
@ -375,19 +359,16 @@ public class GeckoLayerClient implements GeckoEventResponder,
/** Implementation of FlexibleGLSurfaceView.Listener */ /** Implementation of FlexibleGLSurfaceView.Listener */
public void renderRequested() { public void renderRequested() {
Log.e(LOGTAG, "### Render requested, scheduling composite");
GeckoAppShell.scheduleComposite(); GeckoAppShell.scheduleComposite();
} }
/** Implementation of FlexibleGLSurfaceView.Listener */ /** Implementation of FlexibleGLSurfaceView.Listener */
public void compositionPauseRequested() { public void compositionPauseRequested() {
Log.e(LOGTAG, "### Scheduling PauseComposition");
GeckoAppShell.schedulePauseComposition(); GeckoAppShell.schedulePauseComposition();
} }
/** Implementation of FlexibleGLSurfaceView.Listener */ /** Implementation of FlexibleGLSurfaceView.Listener */
public void compositionResumeRequested() { public void compositionResumeRequested() {
Log.e(LOGTAG, "### Scheduling ResumeComposition");
GeckoAppShell.scheduleResumeComposition(); GeckoAppShell.scheduleResumeComposition();
} }

3
mobile/android/base/gfx/LayerRenderer.java
View File

@ -220,9 +220,6 @@ public class LayerRenderer implements GLSurfaceView.Renderer {
// Set the transformation matrix // Set the transformation matrix
GLES20.glUniformMatrix4fv(mTMatrixHandle, 1, false, DEFAULT_TEXTURE_MATRIX, 0); GLES20.glUniformMatrix4fv(mTMatrixHandle, 1, false, DEFAULT_TEXTURE_MATRIX, 0);
Log.e(LOGTAG, "### Position handle is " + mPositionHandle + ", texture handle is " +
mTextureHandle + ", last error is " + GLES20.glGetError());
// Enable the arrays from which we get the vertex and texture coordinates // Enable the arrays from which we get the vertex and texture coordinates
GLES20.glEnableVertexAttribArray(mPositionHandle); GLES20.glEnableVertexAttribArray(mPositionHandle);
GLES20.glEnableVertexAttribArray(mTextureHandle); GLES20.glEnableVertexAttribArray(mTextureHandle);