Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 9e33c60

Browse files
author
Chris Yang
committed
fix tests
1 parent bbd5463 commit 9e33c60

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

shell/common/rasterizer.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -473,8 +473,7 @@ RasterStatus Rasterizer::DrawToSurface(flutter::LayerTree& layer_tree) {
473473
FML_DCHECK(!frame->IsSubmitted());
474474
external_view_embedder->SubmitFrame(surface_->GetContext(),
475475
std::move(frame));
476-
}
477-
if (!frame->IsSubmitted()) {
476+
} else {
478477
frame->Submit();
479478
}
480479

shell/platform/darwin/ios/framework/Source/FlutterPlatformViews.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@
473473
// Any UIKit related code has to run on main thread.
474474
FML_DCHECK([[NSThread currentThread] isMainThread]);
475475
if (flutter_view_ == nullptr) {
476-
return false;
476+
return frame->Submit();
477477
}
478478

479479
DisposeViews();

shell/platform/darwin/ios/framework/Source/FlutterPlatformViewsTest.mm

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#import <OCMock/OCMock.h>
66
#import <XCTest/XCTest.h>
77

8+
#include "flutter/flow/surface_frame.h"
89
#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterBinaryMessenger.h"
910
#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h"
1011
#import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterPlatformViews.h"
@@ -645,7 +646,10 @@ - (void)testFlutterPlatformViewControllerSubmitFrameWithoutFlutterViewNotCrashin
645646

646647
flutterPlatformViewsController->PrerollCompositeEmbeddedView(2, std::move(embeddedViewParams));
647648
flutterPlatformViewsController->CompositeEmbeddedView(2);
648-
flutterPlatformViewsController->SubmitFrame(nullptr, nullptr, nullptr);
649+
auto mock_surface = std::make_unique<flutter::SurfaceFrame>(
650+
nullptr, true,
651+
[](const flutter::SurfaceFrame& surface_frame, SkCanvas* canvas) { return true; });
652+
flutterPlatformViewsController->SubmitFrame(nullptr, nullptr, std::move(mock_surface));
649653

650654
flutterPlatformViewsController->Reset();
651655
}

0 commit comments

Comments
 (0)