diff --git a/shell/platform/android/android_context_gl_skia.cc b/shell/platform/android/android_context_gl_skia.cc index 8dcdeb5b62fab..a784c6d2259bd 100644 --- a/shell/platform/android/android_context_gl_skia.cc +++ b/shell/platform/android/android_context_gl_skia.cc @@ -71,7 +71,6 @@ AndroidContextGLSkia::AndroidContextGLSkia( uint8_t msaa_samples) : AndroidContext(AndroidRenderingAPI::kOpenGLES), environment_(std::move(environment)), - config_(nullptr), task_runners_(task_runners) { if (!environment_->IsValid()) { FML_LOG(ERROR) << "Could not create an Android GL environment."; diff --git a/shell/platform/android/android_display.h b/shell/platform/android/android_display.h index 495077b1b19bf..04ae63700be8a 100644 --- a/shell/platform/android/android_display.h +++ b/shell/platform/android/android_display.h @@ -16,7 +16,7 @@ namespace flutter { /// A |Display| that listens to refresh rate changes. class AndroidDisplay : public Display { public: - AndroidDisplay(std::shared_ptr jni_facade); + explicit AndroidDisplay(std::shared_ptr jni_facade); ~AndroidDisplay() = default; // |Display| diff --git a/shell/platform/android/android_egl_surface.cc b/shell/platform/android/android_egl_surface.cc index de36a92ebd522..d4f3fc648eead 100644 --- a/shell/platform/android/android_egl_surface.cc +++ b/shell/platform/android/android_egl_surface.cc @@ -87,8 +87,7 @@ AndroidEGLSurface::AndroidEGLSurface(EGLSurface surface, : surface_(surface), display_(display), context_(context), - damage_(std::make_unique()), - presentation_time_proc_(nullptr) { + damage_(std::make_unique()) { damage_->init(display_, context); } diff --git a/shell/platform/android/android_egl_surface.h b/shell/platform/android/android_egl_surface.h index f5a7e74ad0084..7ab45e03666dd 100644 --- a/shell/platform/android/android_egl_surface.h +++ b/shell/platform/android/android_egl_surface.h @@ -108,7 +108,7 @@ class AndroidEGLSurface { const EGLDisplay display_; const EGLContext context_; std::unique_ptr damage_; - PFNEGLPRESENTATIONTIMEANDROIDPROC presentation_time_proc_; + PFNEGLPRESENTATIONTIMEANDROIDPROC presentation_time_proc_ = nullptr; }; } // namespace flutter diff --git a/shell/platform/android/android_environment_gl.cc b/shell/platform/android/android_environment_gl.cc index f384ee2d0835d..88e81e6cec5ae 100644 --- a/shell/platform/android/android_environment_gl.cc +++ b/shell/platform/android/android_environment_gl.cc @@ -6,8 +6,7 @@ namespace flutter { -AndroidEnvironmentGL::AndroidEnvironmentGL() - : display_(EGL_NO_DISPLAY), valid_(false) { +AndroidEnvironmentGL::AndroidEnvironmentGL() : display_(EGL_NO_DISPLAY) { // Get the display. display_ = eglGetDisplay(EGL_DEFAULT_DISPLAY); diff --git a/shell/platform/android/android_environment_gl.h b/shell/platform/android/android_environment_gl.h index 23031a775d390..299a6c5c22b7e 100644 --- a/shell/platform/android/android_environment_gl.h +++ b/shell/platform/android/android_environment_gl.h @@ -28,7 +28,7 @@ class AndroidEnvironmentGL private: EGLDisplay display_; - bool valid_; + bool valid_ = false; FML_FRIEND_MAKE_REF_COUNTED(AndroidEnvironmentGL); FML_FRIEND_REF_COUNTED_THREAD_SAFE(AndroidEnvironmentGL); diff --git a/shell/platform/android/flutter_main.cc b/shell/platform/android/flutter_main.cc index 8b49f7e40b8a6..042e5fd769bae 100644 --- a/shell/platform/android/flutter_main.cc +++ b/shell/platform/android/flutter_main.cc @@ -59,7 +59,7 @@ fml::jni::ScopedJavaGlobalRef* g_flutter_jni_class = nullptr; } // anonymous namespace FlutterMain::FlutterMain(const flutter::Settings& settings) - : settings_(settings), vm_service_uri_callback_() {} + : settings_(settings) {} FlutterMain::~FlutterMain() = default; diff --git a/shell/platform/android/flutter_main.h b/shell/platform/android/flutter_main.h index bc78efce2d46a..6370355f69f23 100644 --- a/shell/platform/android/flutter_main.h +++ b/shell/platform/android/flutter_main.h @@ -25,7 +25,7 @@ class FlutterMain { private: const flutter::Settings settings_; - DartServiceIsolate::CallbackHandle vm_service_uri_callback_; + DartServiceIsolate::CallbackHandle vm_service_uri_callback_ = 0; explicit FlutterMain(const flutter::Settings& settings);