fix: set supported scale factors on startup (#38836)

shell/browser/browser.cc

@@ -203,13 +203,6 @@ void Browser::DidFinishLaunching(base::Value::Dict launch_info) {
   }
   for (BrowserObserver& observer : observers_)
     observer.OnFinishLaunching(launch_info.Clone());
-
-#if BUILDFLAG(IS_MAC)
-  if (dock_icon_) {
-    DockSetIconImage(*dock_icon_);
-    dock_icon_.reset();
-  }
-#endif
 }
 
 v8::Local<v8::Value> Browser::WhenReady(v8::Isolate* isolate) {

shell/browser/browser.h

@@ -25,9 +25,7 @@
 #endif
 
 #if BUILDFLAG(IS_MAC)
-#include "third_party/abseil-cpp/absl/types/optional.h"
 #include "ui/base/cocoa/secure_password_input.h"
-#include "ui/gfx/image/image.h"
 #endif
 
 namespace base {
@@ -341,10 +339,6 @@ class Browser : public WindowListObserver {
   void OnWindowCloseCancelled(NativeWindow* window) override;
   void OnWindowAllClosed() override;
 
-#if BUILDFLAG(IS_MAC)
-  void DockSetIconImage(gfx::Image const& icon);
-#endif
-
   // Observers of the browser.
   base::ObserverList<BrowserObserver> observers_;
 
@@ -370,10 +364,6 @@ class Browser : public WindowListObserver {
 #if BUILDFLAG(IS_MAC)
   std::unique_ptr<ui::ScopedPasswordInputEnabler> password_input_enabler_;
   base::Time last_dock_show_;
-
-  // DockSetIcon() can't set the icon if is_ready_ is false.
-  // This field caches it until the browser is ready. (#26604)
-  absl::optional<gfx::Image> dock_icon_;
 #endif
 
   base::Value::Dict about_panel_options_;

shell/browser/browser_mac.mm

@@ -32,6 +32,7 @@
 #include "shell/common/gin_helper/error_thrower.h"
 #include "shell/common/gin_helper/promise.h"
 #include "shell/common/platform_util.h"
+#include "ui/base/resource/resource_scale_factor.h"
 #include "ui/gfx/image/image.h"
 #include "url/gurl.h"
 
@@ -501,14 +502,12 @@ void Browser::DockSetIcon(v8::Isolate* isolate, v8::Local<v8::Value> icon) {
     image = native_image->image();
   }
 
-  DockSetIconImage(image);
+  // This is needed to avoid a hard CHECK when this fn is called
-}
+  // before the browser process is ready, since supported scales
-
+  // are normally set by ui::ResourceBundle::InitSharedInstance
-void Browser::DockSetIconImage(gfx::Image const& image) {
+  // during browser process startup.
-  if (!is_ready_) {
+  if (!is_ready())
-    dock_icon_ = image;
+    ui::SetSupportedResourceScaleFactors({ui::k100Percent});
-    return;
-  }
 
   [[AtomApplication sharedApplication]
       setApplicationIconImage:image.AsNSImage()];

shell/common/api/electron_api_native_image.cc

@@ -20,6 +20,7 @@
 #include "gin/per_isolate_data.h"
 #include "gin/wrappable.h"
 #include "net/base/data_url.h"
+#include "shell/browser/browser.h"
 #include "shell/common/asar/asar_util.h"
 #include "shell/common/gin_converters/file_path_converter.h"
 #include "shell/common/gin_converters/gfx_converter.h"
@@ -29,12 +30,14 @@
 #include "shell/common/gin_helper/function_template_extensions.h"
 #include "shell/common/gin_helper/object_template_builder.h"
 #include "shell/common/node_includes.h"
+#include "shell/common/process_util.h"
 #include "shell/common/skia_util.h"
 #include "shell/common/thread_restrictions.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkImageInfo.h"
 #include "third_party/skia/include/core/SkPixelRef.h"
 #include "ui/base/layout.h"
+#include "ui/base/resource/resource_scale_factor.h"
 #include "ui/base/webui/web_ui_util.h"
 #include "ui/gfx/codec/jpeg_codec.h"
 #include "ui/gfx/codec/png_codec.h"
@@ -53,6 +56,18 @@ namespace electron::api {
 
 namespace {
 
+// This is needed to avoid a hard CHECK when certain aspects of
+// ImageSkia are invoked before the browser process is ready,
+// since supported scales are normally set by
+// ui::ResourceBundle::InitSharedInstance during browser process startup.
+void EnsureSupportedScaleFactors() {
+  if (!electron::IsBrowserProcess())
+    return;
+
+  if (!Browser::Get()->is_ready())
+    ui::SetSupportedResourceScaleFactors({ui::k100Percent});
+}
+
 // Get the scale factor from options object at the first argument
 float GetScaleFactorFromOptions(gin::Arguments* args) {
   float scale_factor = 1.0f;
@@ -108,12 +123,15 @@ base::win::ScopedHICON ReadICOFromPath(int size, const base::FilePath& path) {
 
 NativeImage::NativeImage(v8::Isolate* isolate, const gfx::Image& image)
     : image_(image), isolate_(isolate) {
+  EnsureSupportedScaleFactors();
   UpdateExternalAllocatedMemoryUsage();
 }
 
 #if BUILDFLAG(IS_WIN)
 NativeImage::NativeImage(v8::Isolate* isolate, const base::FilePath& hicon_path)
     : hicon_path_(hicon_path), isolate_(isolate) {
+  EnsureSupportedScaleFactors();
+
   // Use the 256x256 icon as fallback icon.
   gfx::ImageSkia image_skia;
   electron::util::ReadImageSkiaFromICO(&image_skia, GetHICON(256));