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

Commit 94655a2

Browse files
authored
Finish making shell/platform/android/... compatible with .clang-tidy. (#48296)
1 parent 4a0225a commit 94655a2

File tree

8 files changed

+7
-10
lines changed

8 files changed

+7
-10
lines changed

shell/platform/android/android_context_gl_skia.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ AndroidContextGLSkia::AndroidContextGLSkia(
7171
uint8_t msaa_samples)
7272
: AndroidContext(AndroidRenderingAPI::kOpenGLES),
7373
environment_(std::move(environment)),
74-
config_(nullptr),
7574
task_runners_(task_runners) {
7675
if (!environment_->IsValid()) {
7776
FML_LOG(ERROR) << "Could not create an Android GL environment.";

shell/platform/android/android_display.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ namespace flutter {
1616
/// A |Display| that listens to refresh rate changes.
1717
class AndroidDisplay : public Display {
1818
public:
19-
AndroidDisplay(std::shared_ptr<PlatformViewAndroidJNI> jni_facade);
19+
explicit AndroidDisplay(std::shared_ptr<PlatformViewAndroidJNI> jni_facade);
2020
~AndroidDisplay() = default;
2121

2222
// |Display|

shell/platform/android/android_egl_surface.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,7 @@ AndroidEGLSurface::AndroidEGLSurface(EGLSurface surface,
8787
: surface_(surface),
8888
display_(display),
8989
context_(context),
90-
damage_(std::make_unique<AndroidEGLSurfaceDamage>()),
91-
presentation_time_proc_(nullptr) {
90+
damage_(std::make_unique<AndroidEGLSurfaceDamage>()) {
9291
damage_->init(display_, context);
9392
}
9493

shell/platform/android/android_egl_surface.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ class AndroidEGLSurface {
108108
const EGLDisplay display_;
109109
const EGLContext context_;
110110
std::unique_ptr<AndroidEGLSurfaceDamage> damage_;
111-
PFNEGLPRESENTATIONTIMEANDROIDPROC presentation_time_proc_;
111+
PFNEGLPRESENTATIONTIMEANDROIDPROC presentation_time_proc_ = nullptr;
112112
};
113113

114114
} // namespace flutter

shell/platform/android/android_environment_gl.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66

77
namespace flutter {
88

9-
AndroidEnvironmentGL::AndroidEnvironmentGL()
10-
: display_(EGL_NO_DISPLAY), valid_(false) {
9+
AndroidEnvironmentGL::AndroidEnvironmentGL() : display_(EGL_NO_DISPLAY) {
1110
// Get the display.
1211
display_ = eglGetDisplay(EGL_DEFAULT_DISPLAY);
1312

shell/platform/android/android_environment_gl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class AndroidEnvironmentGL
2828

2929
private:
3030
EGLDisplay display_;
31-
bool valid_;
31+
bool valid_ = false;
3232

3333
FML_FRIEND_MAKE_REF_COUNTED(AndroidEnvironmentGL);
3434
FML_FRIEND_REF_COUNTED_THREAD_SAFE(AndroidEnvironmentGL);

shell/platform/android/flutter_main.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ fml::jni::ScopedJavaGlobalRef<jclass>* g_flutter_jni_class = nullptr;
5959
} // anonymous namespace
6060

6161
FlutterMain::FlutterMain(const flutter::Settings& settings)
62-
: settings_(settings), vm_service_uri_callback_() {}
62+
: settings_(settings) {}
6363

6464
FlutterMain::~FlutterMain() = default;
6565

shell/platform/android/flutter_main.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class FlutterMain {
2525

2626
private:
2727
const flutter::Settings settings_;
28-
DartServiceIsolate::CallbackHandle vm_service_uri_callback_;
28+
DartServiceIsolate::CallbackHandle vm_service_uri_callback_ = 0;
2929

3030
explicit FlutterMain(const flutter::Settings& settings);
3131

0 commit comments

Comments
 (0)