chore: bump chromium to e049d599a8332b9b2785b0178be74 (master) (#20314)

shell/browser/api/atom_api_desktop_capturer.cc

@@ -94,8 +94,9 @@ void DesktopCapturer::StartHandling(bool capture_window,
           content::DesktopMediaID::TYPE_WINDOW,
           content::desktop_capture::CreateWindowCapturer());
       window_capturer_->SetThumbnailSize(thumbnail_size);
-      window_capturer_->AddObserver(this);
-      window_capturer_->StartUpdating();
+      window_capturer_->Update(base::BindOnce(
+          &DesktopCapturer::UpdateSourcesList, weak_ptr_factory_.GetWeakPtr(),
+          window_capturer_.get()));
     }
 
     if (capture_screen) {
@@ -103,34 +104,13 @@ void DesktopCapturer::StartHandling(bool capture_window,
           content::DesktopMediaID::TYPE_SCREEN,
           content::desktop_capture::CreateScreenCapturer());
       screen_capturer_->SetThumbnailSize(thumbnail_size);
-      screen_capturer_->AddObserver(this);
-      screen_capturer_->StartUpdating();
+      screen_capturer_->Update(base::BindOnce(
+          &DesktopCapturer::UpdateSourcesList, weak_ptr_factory_.GetWeakPtr(),
+          screen_capturer_.get()));
     }
   }
 }
 
-void DesktopCapturer::OnSourceAdded(DesktopMediaList* list, int index) {}
-
-void DesktopCapturer::OnSourceRemoved(DesktopMediaList* list, int index) {}
-
-void DesktopCapturer::OnSourceMoved(DesktopMediaList* list,
-                                    int old_index,
-                                    int new_index) {}
-
-void DesktopCapturer::OnSourceNameChanged(DesktopMediaList* list, int index) {}
-
-void DesktopCapturer::OnSourceThumbnailChanged(DesktopMediaList* list,
-                                               int index) {}
-
-void DesktopCapturer::OnSourceUnchanged(DesktopMediaList* list) {
-  UpdateSourcesList(list);
-}
-
-bool DesktopCapturer::ShouldScheduleNextRefresh(DesktopMediaList* list) {
-  UpdateSourcesList(list);
-  return false;
-}
-
 void DesktopCapturer::UpdateSourcesList(DesktopMediaList* list) {
   if (capture_window_ &&
       list->GetMediaListType() == content::DesktopMediaID::TYPE_WINDOW) {

shell/browser/api/atom_api_desktop_capturer.h

@@ -18,8 +18,7 @@ namespace electron {
 
 namespace api {
 
-class DesktopCapturer : public mate::TrackableObject<DesktopCapturer>,
-                        public DesktopMediaListObserver {
+class DesktopCapturer : public mate::TrackableObject<DesktopCapturer> {
  public:
   struct Source {
     DesktopMediaList::Source media_list_source;
@@ -44,17 +43,6 @@ class DesktopCapturer : public mate::TrackableObject<DesktopCapturer>,
   explicit DesktopCapturer(v8::Isolate* isolate);
   ~DesktopCapturer() override;
 
-  // DesktopMediaListObserver overrides.
-  void OnSourceAdded(DesktopMediaList* list, int index) override;
-  void OnSourceRemoved(DesktopMediaList* list, int index) override;
-  void OnSourceMoved(DesktopMediaList* list,
-                     int old_index,
-                     int new_index) override;
-  void OnSourceNameChanged(DesktopMediaList* list, int index) override;
-  void OnSourceThumbnailChanged(DesktopMediaList* list, int index) override;
-  void OnSourceUnchanged(DesktopMediaList* list) override;
-  bool ShouldScheduleNextRefresh(DesktopMediaList* list) override;
-
  private:
   void UpdateSourcesList(DesktopMediaList* list);
 
@@ -68,6 +56,8 @@ class DesktopCapturer : public mate::TrackableObject<DesktopCapturer>,
   bool using_directx_capturer_ = false;
 #endif  // defined(OS_WIN)
 
+  base::WeakPtrFactory<DesktopCapturer> weak_ptr_factory_{this};
+
   DISALLOW_COPY_AND_ASSIGN(DesktopCapturer);
 };
 

shell/browser/api/atom_api_top_level_window.cc

@@ -526,13 +526,9 @@ void TopLevelWindow::SetAlwaysOnTop(bool top, mate::Arguments* args) {
   args->GetNext(&level);
   args->GetNext(&relative_level);
 
-  std::string error;
   ui::ZOrderLevel z_order =
       top ? ui::ZOrderLevel::kFloatingWindow : ui::ZOrderLevel::kNormal;
-  window_->SetAlwaysOnTop(z_order, level, relative_level, &error);
-
-  if (!error.empty())
-    args->ThrowError(error);
+  window_->SetAlwaysOnTop(z_order, level, relative_level);
 }
 
 bool TopLevelWindow::IsAlwaysOnTop() {

shell/browser/api/atom_api_web_contents.cc

@@ -88,6 +88,7 @@
 #include "shell/common/node_includes.h"
 #include "shell/common/options_switches.h"
 #include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
+#include "third_party/blink/public/common/page/page_zoom.h"
 #include "third_party/blink/public/mojom/frame/find_in_page.mojom.h"
 #include "third_party/blink/public/platform/web_cursor_info.h"
 #include "third_party/blink/public/platform/web_input_event.h"
@@ -938,7 +939,7 @@ void WebContents::DidAcquireFullscreen(content::RenderFrameHost* rfh) {
   set_fullscreen_frame(rfh);
 }
 
-void WebContents::DocumentLoadedInFrame(
+void WebContents::DOMContentLoaded(
     content::RenderFrameHost* render_frame_host) {
   if (!render_frame_host->GetParent())
     Emit("dom-ready");
@@ -2316,13 +2317,22 @@ double WebContents::GetZoomLevel() const {
 }
 
 void WebContents::SetZoomFactor(double factor) {
-  auto level = content::ZoomFactorToZoomLevel(factor);
+  auto level = blink::PageZoomFactorToZoomLevel(factor);
   SetZoomLevel(level);
 }
 
 double WebContents::GetZoomFactor() const {
   auto level = GetZoomLevel();
-  return content::ZoomLevelToZoomFactor(level);
+  return blink::PageZoomLevelToZoomFactor(level);
+}
+
+void WebContents::SetZoomLimits(double min_zoom, double max_zoom) {
+  // Round the double to avoid returning incorrect minimum/maximum zoom
+  // percentages.
+  int minimum_percent = round(blink::PageZoomLevelToZoomFactor(min_zoom) * 100);
+  int maximum_percent = round(blink::PageZoomLevelToZoomFactor(max_zoom) * 100);
+  web_contents()->SetMinimumZoomPercent(minimum_percent);
+  web_contents()->SetMaximumZoomPercent(maximum_percent);
 }
 
 void WebContents::SetTemporaryZoomLevel(double level) {

shell/browser/api/atom_api_web_contents.h

@@ -272,6 +272,7 @@ class WebContents : public mate::TrackableObject<WebContents>,
   double GetZoomLevel() const;
   void SetZoomFactor(double factor);
   double GetZoomFactor() const;
+  void SetZoomLimits(double min_zoom, double max_zoom) override;
 
   // Callback triggered on permission response.
   void OnEnterFullscreenModeForTab(content::WebContents* source,
@@ -426,8 +427,7 @@ class WebContents : public mate::TrackableObject<WebContents>,
   void RenderViewDeleted(content::RenderViewHost*) override;
   void RenderProcessGone(base::TerminationStatus status) override;
   void RenderFrameDeleted(content::RenderFrameHost* render_frame_host) override;
-  void DocumentLoadedInFrame(
-      content::RenderFrameHost* render_frame_host) override;
+  void DOMContentLoaded(content::RenderFrameHost* render_frame_host) override;
   void DidFinishLoad(content::RenderFrameHost* render_frame_host,
                      const GURL& validated_url) override;
   void DidFailLoad(content::RenderFrameHost* render_frame_host,

shell/browser/api/gpuinfo_manager.cc

@@ -66,7 +66,7 @@ void GPUInfoManager::CompleteInfoFetcher(
   complete_info_promise_set_.emplace_back(std::move(promise));
 
   if (NeedsCompleteGpuInfoCollection()) {
-    gpu_data_manager_->RequestCompleteGpuInfoIfNeeded(
+    gpu_data_manager_->RequestDxdiagDx12VulkanGpuInfoIfNeeded(
         content::kGpuInfoRequestAll, /* delayed */ false);
   } else {
     GPUInfoManager::OnGpuInfoUpdate();