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

Commit b59b963

Browse files
committed
Reformat some files that were not auto-formatted
The ci/format.sh script was not applying diffs for a few days when it was using version 3.1.0 of the process_runner package.
1 parent 34832cb commit b59b963

File tree

5 files changed

+13
-16
lines changed

5 files changed

+13
-16
lines changed

shell/platform/android/platform_view_android.cc

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ AndroidSurfaceFactoryImpl::AndroidSurfaceFactoryImpl(
3232
std::shared_ptr<AndroidContext> context,
3333
std::shared_ptr<PlatformViewAndroidJNI> jni_facade,
3434
std::weak_ptr<AndroidExternalViewEmbedder> external_view_embedder)
35-
: android_context_(context), jni_facade_(jni_facade),
35+
: android_context_(context),
36+
jni_facade_(jni_facade),
3637
external_view_embedder_(external_view_embedder) {}
3738

3839
AndroidSurfaceFactoryImpl::~AndroidSurfaceFactoryImpl() = default;
@@ -84,12 +85,10 @@ PlatformViewAndroid::PlatformViewAndroid(
8485
FML_CHECK(android_context && android_context->IsValid())
8586
<< "Could not create an Android context.";
8687

87-
external_view_embedder_ =
88-
std::make_shared<AndroidExternalViewEmbedder>(android_context, jni_facade,
89-
surface_factory_);
90-
surface_factory_ =
91-
std::make_shared<AndroidSurfaceFactoryImpl>(android_context, jni_facade,
92-
external_view_embedder_);
88+
external_view_embedder_ = std::make_shared<AndroidExternalViewEmbedder>(
89+
android_context, jni_facade, surface_factory_);
90+
surface_factory_ = std::make_shared<AndroidSurfaceFactoryImpl>(
91+
android_context, jni_facade, external_view_embedder_);
9392

9493
android_surface_ = surface_factory_->CreateSurface();
9594
FML_CHECK(android_surface_ && android_surface_->IsValid())

shell/platform/android/platform_view_android.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,10 @@ namespace flutter {
2424

2525
class AndroidSurfaceFactoryImpl : public AndroidSurfaceFactory {
2626
public:
27-
AndroidSurfaceFactoryImpl(std::shared_ptr<AndroidContext> context,
28-
std::shared_ptr<PlatformViewAndroidJNI> jni_facade,
29-
std::weak_ptr<AndroidExternalViewEmbedder> external_view_embedder);
27+
AndroidSurfaceFactoryImpl(
28+
std::shared_ptr<AndroidContext> context,
29+
std::shared_ptr<PlatformViewAndroidJNI> jni_facade,
30+
std::weak_ptr<AndroidExternalViewEmbedder> external_view_embedder);
3031

3132
~AndroidSurfaceFactoryImpl() override;
3233

shell/platform/android/test/io/flutter/embedding/engine/dart/DartExecutorTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import android.content.res.AssetManager;
1414
import io.flutter.FlutterInjector;
1515
import io.flutter.embedding.engine.FlutterJNI;
16-
import io.flutter.embedding.engine.dart.DartExecutor;
1716
import io.flutter.embedding.engine.dart.DartExecutor.DartEntrypoint;
1817
import io.flutter.embedding.engine.loader.FlutterLoader;
1918
import java.nio.ByteBuffer;

shell/platform/android/test/io/flutter/embedding/engine/dart/DartMessengerTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,3 @@ public void itHandlesErrors() {
5252
currentThread.setUncaughtExceptionHandler(savedHandler);
5353
}
5454
}
55-

vulkan/vulkan_swapchain.cc

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,10 +153,9 @@ VulkanSwapchain::VulkanSwapchain(const VulkanProcTable& p_vk,
153153
nullptr);
154154
}};
155155

156-
if (!CreateSwapchainImages(skia_context,
157-
format_infos[format_index].color_type_,
158-
format_infos[format_index].color_space_,
159-
usage_flags)) {
156+
if (!CreateSwapchainImages(
157+
skia_context, format_infos[format_index].color_type_,
158+
format_infos[format_index].color_space_, usage_flags)) {
160159
FML_DLOG(INFO) << "Could not create swapchain images.";
161160
return;
162161
}

0 commit comments

Comments
 (0)