зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1359223 - Add geckoview to checkstyle and correct style issues. r=snorp
MozReview-Commit-ID: AM0bdF8dZQW --HG-- extra : rebase_source : e6f21dafc2fa99cb1ddbac102fad8c3cbafb1516
This commit is contained in:
Родитель
68278092df
Коммит
f9cb2ecf9b
|
@ -261,7 +261,7 @@ dependencies {
|
|||
task checkstyle(type: Checkstyle) {
|
||||
configFile file("checkstyle.xml")
|
||||
// TODO: should use sourceSets from project instead of hard-coded str.
|
||||
source '../base/java/'
|
||||
source = ['../base/java/','../geckoview/src/main/java/']
|
||||
// TODO: This ignores our pre-processed resources.
|
||||
include '**/*.java'
|
||||
// TODO: classpath should probably be something.
|
||||
|
|
|
@ -203,7 +203,7 @@ public class LayerView extends FrameLayout {
|
|||
}
|
||||
|
||||
/* package */ void handleToolbarAnimatorMessage(int message) {
|
||||
switch(message) {
|
||||
switch (message) {
|
||||
case STATIC_TOOLBAR_NEEDS_UPDATE:
|
||||
// Send updated toolbar image to compositor.
|
||||
Bitmap bm = mToolbarAnimator.getBitmapOfToolbarChrome();
|
||||
|
@ -245,7 +245,7 @@ public class LayerView extends FrameLayout {
|
|||
mToolbarAnimator.notifyCompositorControllerOpen();
|
||||
break;
|
||||
default:
|
||||
Log.e(LOGTAG,"Unhandled Toolbar Animator Message: " + message);
|
||||
Log.e(LOGTAG, "Unhandled Toolbar Animator Message: " + message);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -251,7 +251,7 @@ public final class CodecProxy {
|
|||
@WrapForJNI
|
||||
public boolean release() {
|
||||
mCallbacks.setCodecProxyReleased();
|
||||
synchronized(this) {
|
||||
synchronized (this) {
|
||||
if (mRemote == null) {
|
||||
Log.w(LOGTAG, "codec already ended");
|
||||
return true;
|
||||
|
|
|
@ -59,7 +59,7 @@ public final class GeckoProcessManager extends IProcessManager.Stub {
|
|||
|
||||
void waitForChild() {
|
||||
ThreadUtils.assertNotOnUiThread();
|
||||
synchronized(this) {
|
||||
synchronized (this) {
|
||||
if (mWait) {
|
||||
try {
|
||||
this.wait(5000); // 5 seconds
|
||||
|
@ -87,7 +87,7 @@ public final class GeckoProcessManager extends IProcessManager.Stub {
|
|||
} catch (final RemoteException e) {
|
||||
Log.e(LOGTAG, "Failed to get child " + mType + " process PID. Process may have died.", e);
|
||||
}
|
||||
synchronized(this) {
|
||||
synchronized (this) {
|
||||
if (mWait) {
|
||||
mWait = false;
|
||||
this.notifyAll();
|
||||
|
@ -97,10 +97,10 @@ public final class GeckoProcessManager extends IProcessManager.Stub {
|
|||
|
||||
@Override
|
||||
public void onServiceDisconnected(ComponentName name) {
|
||||
synchronized(INSTANCE.mConnections) {
|
||||
synchronized (INSTANCE.mConnections) {
|
||||
INSTANCE.mConnections.remove(mType);
|
||||
}
|
||||
synchronized(this) {
|
||||
synchronized (this) {
|
||||
if (mWait) {
|
||||
mWait = false;
|
||||
this.notifyAll();
|
||||
|
@ -110,11 +110,11 @@ public final class GeckoProcessManager extends IProcessManager.Stub {
|
|||
|
||||
@Override
|
||||
public void binderDied() {
|
||||
Log.e(LOGTAG,"Binder died. Attempt to unbind service: " + mType + " " + mPid);
|
||||
Log.e(LOGTAG, "Binder died. Attempt to unbind service: " + mType + " " + mPid);
|
||||
try {
|
||||
GeckoAppShell.getApplicationContext().unbindService(this);
|
||||
} catch (final java.lang.IllegalArgumentException e) {
|
||||
Log.e(LOGTAG,"Looks like connection was already unbound", e);
|
||||
Log.e(LOGTAG, "Looks like connection was already unbound", e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -127,7 +127,7 @@ public final class GeckoProcessManager extends IProcessManager.Stub {
|
|||
|
||||
public int start(String type, String[] args, int crashFd, int ipcFd) {
|
||||
ChildConnection connection = null;
|
||||
synchronized(mConnections) {
|
||||
synchronized (mConnections) {
|
||||
connection = mConnections.get(type);
|
||||
}
|
||||
if (connection != null) {
|
||||
|
@ -166,7 +166,7 @@ public final class GeckoProcessManager extends IProcessManager.Stub {
|
|||
crashPfd.close();
|
||||
}
|
||||
ipcPfd.close();
|
||||
synchronized(mConnections) {
|
||||
synchronized (mConnections) {
|
||||
mConnections.put(type, connection);
|
||||
}
|
||||
return connection.mPid;
|
||||
|
|
|
@ -111,7 +111,7 @@ public class StringUtils {
|
|||
}
|
||||
|
||||
if (newURL.endsWith("/")) {
|
||||
newURL = newURL.substring(0, newURL.length()-1);
|
||||
newURL = newURL.substring(0, newURL.length() - 1);
|
||||
}
|
||||
|
||||
return newURL;
|
||||
|
|
Загрузка…
Ссылка в новой задаче