Extra changes

Author: dkwingsmt

shell/common/animator.cc

@@ -60,10 +60,6 @@ void Animator::EnqueueTraceFlowId(uint64_t trace_flow_id) {
 
 void Animator::BeginFrame(
     std::unique_ptr<FrameTimingsRecorder> frame_timings_recorder) {
-  // Both frame_timings_recorder_ and layer_trees_tasks_ must be empty if not
-  // between BeginFrame and EndFrame.
-  FML_DCHECK(frame_timings_recorder_ == nullptr);
-  FML_DCHECK(layer_trees_tasks_.empty());
   TRACE_EVENT_ASYNC_END0("flutter", "Frame Request Pending",
                          frame_request_number_);
   // Clear layer trees rendered out of a frame. Only Animator::Render called
@@ -192,6 +188,8 @@ void Animator::EndFrame() {
 void Animator::Render(int64_t view_id,
                       std::unique_ptr<flutter::LayerTree> layer_tree,
                       float device_pixel_ratio) {
+  has_rendered_ = true;
+
   if (!frame_timings_recorder_) {
     // Framework can directly call render with a built scene. A major reason is
     // to render warm up frames.

shell/platform/darwin/macos/framework/Source/FlutterEngine.mm

@@ -549,6 +549,10 @@ - (instancetype)initWithName:(NSString*)labelPrefix
                            object:nil];
 
   _platformViewController = [[FlutterPlatformViewController alloc] init];
+  _macOSCompositor = std::make_unique<flutter::FlutterCompositor>(
+      [[FlutterViewEngineProvider alloc] initWithEngine:self],
+      [[FlutterTimeConverter alloc] initWithEngine:self], _platformViewController);
+
   _threadSynchronizer = [[FlutterThreadSynchronizer alloc] init];
   [self setUpPlatformViewChannel];
   [self setUpAccessibilityChannel];
@@ -881,10 +885,6 @@ - (FlutterViewController*)viewController {
 }
 
 - (FlutterCompositor*)createFlutterCompositor {
-  _macOSCompositor = std::make_unique<flutter::FlutterCompositor>(
-      [[FlutterViewEngineProvider alloc] initWithEngine:self],
-      [[FlutterTimeConverter alloc] initWithEngine:self], _platformViewController);
-
   _compositor = {};
   _compositor.struct_size = sizeof(FlutterCompositor);
   _compositor.user_data = _macOSCompositor.get();