Use temp void*

Author: GaryQian

runtime/dart_deferred_load_handler.cc

@@ -4,9 +4,11 @@
 
 #include "flutter/runtime/dart_deferred_load_handler.h"
 
+#include "flutter/runtime/runtime_controller.h"
+
 namespace flutter {
 
-RuntimeController* DartDeferredLoadHandler::runtime_controller_ = nullptr;
+void* DartDeferredLoadHandler::runtime_controller_ = nullptr;
 
 Dart_DeferredLoadHandler
     DartDeferredLoadHandler::empty_dart_deferred_load_handler =
@@ -16,14 +18,15 @@ Dart_DeferredLoadHandler DartDeferredLoadHandler::dart_deferred_load_handler =
     &DartDeferredLoadHandler::OnDartLoadLibrary;
 
 void DartDeferredLoadHandler::RegisterRuntimeController(
-    RuntimeController* runtime_controller) {
+    void* runtime_controller) {
   runtime_controller_ = runtime_controller;
 }
 
 Dart_Handle DartDeferredLoadHandler::OnDartLoadLibrary(
     intptr_t loading_unit_id) {
   if (runtime_controller_ != nullptr)
-    return runtime_controller_->OnDartLoadLibrary(loading_unit_id);
+    return static_cast<RuntimeController*>(runtime_controller_)
+        ->OnDartLoadLibrary(loading_unit_id);
   return Dart_Null();
 }
 

runtime/dart_deferred_load_handler.h

@@ -5,17 +5,17 @@
 #ifndef FLUTTER_RUNTIME_DART_DEFERRED_LOAD_HANDLER_H_
 #define FLUTTER_RUNTIME_DART_DEFERRED_LOAD_HANDLER_H_
 
-// #include <memory>
+#include <memory>
 #include <string>
 
-#include "flutter/runtime/runtime_controller.h"
 #include "third_party/dart/runtime/include/dart_api.h"
 
 namespace flutter {
 
 class DartDeferredLoadHandler {
  public:
-  static void RegisterRuntimeController(RuntimeController* runtime_controller);
+  // TODO: Fix deps to not use void*
+  static void RegisterRuntimeController(void* runtime_controller);
 
   static Dart_DeferredLoadHandler empty_dart_deferred_load_handler;
   static Dart_DeferredLoadHandler dart_deferred_load_handler;
@@ -25,7 +25,7 @@ class DartDeferredLoadHandler {
   // No-op function that returns Dart_Null() for when the isolate is not
   // expected to handle deferred libraries.
   static Dart_Handle EmptyDartLoadLibrary(intptr_t loading_unit_id);
-  static RuntimeController* runtime_controller_;
+  static void* runtime_controller_;
 };
 
 }  // namespace flutter