Revert D2982150: Revert D2926896 WebWorkers: Move web worker impl to JSCExecutor

Reviewed By: lexs

Differential Revision: D2982364

fb-gh-sync-id: 25f099377acca75298768072d38d77dcb9c1bff3
shipit-source-id: 25f099377acca75298768072d38d77dcb9c1bff3

ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java

@@ -226,24 +226,18 @@ public class CatalystInstanceImpl implements CatalystInstance {
         listener.onTransitionToBridgeIdle();
       }
     }
-
-    Systrace.unregisterListener(mTraceListener);
-
-    // We can access the Bridge from any thread now because we know either we are on the JS thread
-    // or the JS thread has finished via ReactQueueConfiguration#destroy()
-    mBridge.dispose();
   }
 
   private void synchronouslyDisposeBridgeOnJSThread() {
     final SimpleSettableFuture<Void> bridgeDisposeFuture = new SimpleSettableFuture<>();
     mReactQueueConfiguration.getJSQueueThread().runOnQueue(
-      new Runnable() {
-        @Override
-        public void run() {
-          mBridge.dispose();
-          bridgeDisposeFuture.set(null);
-        }
-      });
+        new Runnable() {
+          @Override
+          public void run() {
+            mBridge.dispose();
+            bridgeDisposeFuture.set(null);
+          }
+        });
     bridgeDisposeFuture.getOrThrow();
   }
 

ReactAndroid/src/main/java/com/facebook/react/common/futures/SimpleSettableFuture.java

@@ -30,7 +30,7 @@ public class SimpleSettableFuture<T> implements Future<T> {
    * Sets the result. If another thread has called {@link #get}, they will immediately receive the
    * value. set or setException must only be called once.
    */
-  public void set(T result) {
+  public void set(@Nullable T result) {
     checkNotSet();
     mResult = result;
     mReadyLatch.countDown();