status-im
/
react-native
mirror of https://github.com/status-im/react-native.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Don't use the Bridge from CatalystInstance. 

Summary: getBridge() is annotated VisibleForTesting, but still used
in DevSupportManager.  Instead, add the necessary methods to the
CatalystInstance interface.
public

Reviewed By: astreet

Differential Revision: D2651265

fb-gh-sync-id: 395893a961c32843871de4451eeccb33135b7ede
This commit is contained in:
Marc Horowitz 2015-11-20 12:16:39 -08:00 committed by facebook-github-bot-6
parent 5b6b5a64d1
commit c8f3b43984
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java
View File

@ -306,6 +306,27 @@ public class CatalystInstance {
mBridgeIdleListeners.remove(listener);
}
public boolean supportsProfiling() {
if (mBridge == null) {
return false;
}
return mBridge.supportsProfiling();
}
public void startProfiler(String title) {
if (mBridge == null) {
return;
}
mBridge.startProfiler(title);
}
public void stopProfiler(String title, String filename) {
if (mBridge == null) {
return;
}
mBridge.stopProfiler(title, filename);
}
private String buildModulesConfigJSONProperty(
NativeModuleRegistry nativeModuleRegistry,
JavaScriptModulesConfig jsModulesConfig) {

8
ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManager.java
View File

@ -285,8 +285,7 @@ public class DevSupportManager implements NativeModuleCallExceptionHandler {
if (mCurrentContext != null &&
mCurrentContext.getCatalystInstance() != null &&
!mCurrentContext.getCatalystInstance().isDestroyed() &&
mCurrentContext.getCatalystInstance().getBridge() != null &&
mCurrentContext.getCatalystInstance().getBridge().supportsProfiling()) {
mCurrentContext.getCatalystInstance().supportsProfiling()) {
options.put(
mApplicationContext.getString(
mIsCurrentlyProfiling ? R.string.catalyst_stop_profile :
@ -302,7 +301,6 @@ public class DevSupportManager implements NativeModuleCallExceptionHandler {
mProfileIndex++;
Debug.stopMethodTracing();
mCurrentContext.getCatalystInstance()
.getBridge()
.stopProfiler("profile", profileName);
Toast.makeText(
mCurrentContext,
@ -310,7 +308,7 @@ public class DevSupportManager implements NativeModuleCallExceptionHandler {
Toast.LENGTH_LONG).show();
} else {
mIsCurrentlyProfiling = true;
mCurrentContext.getCatalystInstance().getBridge().startProfiler("profile");
mCurrentContext.getCatalystInstance().startProfiler("profile");
Debug.startMethodTracingSampling(
profileName,
JAVA_SAMPLING_PROFILE_MEMORY_BYTES,
@ -476,7 +474,7 @@ public class DevSupportManager implements NativeModuleCallExceptionHandler {
"/profile_" + mProfileIndex + ".json");
mProfileIndex++;
Debug.stopMethodTracing();
mCurrentContext.getCatalystInstance().getBridge().stopProfiler("profile", profileName);
mCurrentContext.getCatalystInstance().stopProfiler("profile", profileName);
}
mCurrentContext = reactContext;