Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-15 06:15:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1000287 - Remove unnecessary log lines from 'GLController'. r=kats

Browse Source
This commit is contained in:
Alex Deaconu 2014-04-24 17:33:14 +03:00
parent c9a341617d
commit 435b9006b6
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mobile/android/base/gfx/GLController.java
View File

@ -126,7 +126,6 @@ public class GLController {
synchronized void serverSurfaceDestroyed() { synchronized void serverSurfaceDestroyed() {
ThreadUtils.assertOnUiThread(); ThreadUtils.assertOnUiThread();
Log.w(LOGTAG, "GLController::serverSurfaceDestroyed() with mCompositorCreated=" + mCompositorCreated);
mServerSurfaceValid = false; mServerSurfaceValid = false;
@ -146,12 +145,10 @@ public class GLController {
if (mCompositorCreated) { if (mCompositorCreated) {
GeckoAppShell.sendEventToGeckoSync(GeckoEvent.createCompositorPauseEvent()); GeckoAppShell.sendEventToGeckoSync(GeckoEvent.createCompositorPauseEvent());
} }
Log.w(LOGTAG, "done GLController::serverSurfaceDestroyed()");
} }
synchronized void serverSurfaceChanged(int newWidth, int newHeight) { synchronized void serverSurfaceChanged(int newWidth, int newHeight) {
ThreadUtils.assertOnUiThread(); ThreadUtils.assertOnUiThread();
Log.w(LOGTAG, "GLController::serverSurfaceChanged(" + newWidth + ", " + newHeight + ")");
mWidth = newWidth; mWidth = newWidth;
mHeight = newHeight; mHeight = newHeight;
@ -172,14 +169,12 @@ public class GLController {
void updateCompositor() { void updateCompositor() {
ThreadUtils.assertOnUiThread(); ThreadUtils.assertOnUiThread();
Log.w(LOGTAG, "GLController::updateCompositor with mCompositorCreated=" + mCompositorCreated);
if (mCompositorCreated) { if (mCompositorCreated) {
// If the compositor has already been created, just resume it instead. We don't need // If the compositor has already been created, just resume it instead. We don't need
// to block here because if the surface is destroyed before the compositor grabs it, // to block here because if the surface is destroyed before the compositor grabs it,
// we can handle that gracefully (i.e. the compositor will remain paused). // we can handle that gracefully (i.e. the compositor will remain paused).
resumeCompositor(mWidth, mHeight); resumeCompositor(mWidth, mHeight);
Log.w(LOGTAG, "done GLController::updateCompositor with compositor resume");
return; return;
} }
@ -194,11 +189,9 @@ public class GLController {
if (GeckoThread.checkLaunchState(GeckoThread.LaunchState.GeckoRunning)) { if (GeckoThread.checkLaunchState(GeckoThread.LaunchState.GeckoRunning)) {
GeckoAppShell.sendEventToGeckoSync(GeckoEvent.createCompositorCreateEvent(mWidth, mHeight)); GeckoAppShell.sendEventToGeckoSync(GeckoEvent.createCompositorCreateEvent(mWidth, mHeight));
} }
Log.w(LOGTAG, "done GLController::updateCompositor");
} }
void compositorCreated() { void compositorCreated() {
Log.w(LOGTAG, "GLController::compositorCreated");
// This is invoked on the compositor thread, while the java UI thread // This is invoked on the compositor thread, while the java UI thread
// is blocked on the gecko sync event in updateCompositor() above // is blocked on the gecko sync event in updateCompositor() above
mCompositorCreated = true; mCompositorCreated = true;
@ -329,7 +322,6 @@ public class GLController {
} }
void resumeCompositor(int width, int height) { void resumeCompositor(int width, int height) {
Log.w(LOGTAG, "GLController::resumeCompositor(" + width + ", " + height + ") and mCompositorCreated=" + mCompositorCreated);
// Asking Gecko to resume the compositor takes too long (see // Asking Gecko to resume the compositor takes too long (see
// https://bugzilla.mozilla.org/show_bug.cgi?id=735230#c23), so we // https://bugzilla.mozilla.org/show_bug.cgi?id=735230#c23), so we
// resume the compositor directly. We still need to inform Gecko about // resume the compositor directly. We still need to inform Gecko about
@ -340,7 +332,6 @@ public class GLController {
GeckoAppShell.scheduleResumeComposition(width, height); GeckoAppShell.scheduleResumeComposition(width, height);
GeckoAppShell.sendEventToGecko(GeckoEvent.createCompositorResumeEvent()); GeckoAppShell.sendEventToGecko(GeckoEvent.createCompositorResumeEvent());
} }
Log.w(LOGTAG, "done GLController::resumeCompositor");
} }
public static class GLControllerException extends RuntimeException { public static class GLControllerException extends RuntimeException {