mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: bump chromium to 140.0.7339.2 (38-x-y) (#47985)

Browse source 
chore: bump chromium to 140.0.7339.2 (main) (#47929)

* chore: bump chromium in DEPS to 140.0.7330.0

* chore: bump chromium in DEPS to 140.0.7331.0

* chore: update patches

* fix: gn check failing on crashpad.h
Not yet sure what caused this

* fix: predictors::PreconnectManager -> content::PreconnectManager
CL: https://chromium-review.googlesource.com/c/chromium/src/+/6788473

* chore: bump chromium in DEPS to 140.0.7333.0

* chore: bump chromium in DEPS to 140.0.7335.0

* chore: bump chromium in DEPS to 140.0.7337.0

* chore: update patches

* chore: restore some gin utility

* 6804057: [Extensions] Validate nodoc is specified as a boolean in schemas
https://chromium-review.googlesource.com/c/chromium/src/+/6804057

* fixup! chore: restore some gin utility

* fixup! fix: predictors::PreconnectManager -> content::PreconnectManager CL: https://chromium-review.googlesource.com/c/chromium/src/+/6788473

* 6772346: Reset MouseWheelPhaseHandler state when trackpoint scroll is detected
https://chromium-review.googlesource.com/c/chromium/src/+/6772346

Not certain about what the "correct" argument to pass here is. A quick dive into the CL suggests that passing `false` is safe to keep things working. The blast radius if this assumption is wrong is that "fling" scroll gestures may not work as expected with the OSR.

* 6789383: Uninstall SODA language pack after 30 days of inactivity
https://chromium-review.googlesource.com/c/chromium/src/+/6789383

* chore: update libcxx filenames

* chore: bump chromium in DEPS to 140.0.7339.0

* chore: update patches

* fixup! 6772346: Reset MouseWheelPhaseHandler state when trackpoint scroll is detected https://chromium-review.googlesource.com/c/chromium/src/+/6772346

* chore: bump chromium in DEPS to 140.0.7339.2

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Samuel Maddock <smaddock@slack-corp.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
This commit is contained in:
Calvin 2025-08-11 14:01:08 -06:00 • committed by GitHub
commit 095ae30f6d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
60 changed files with 392 additions and 218 deletions
Download patch file Download diff file Expand all files Collapse all files

2
shell/browser/api/electron_api_session.cc
View file

@ -21,7 +21,6 @@
#include "base/strings/string_util.h"
#include "base/uuid.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/predictors/preconnect_manager.h"
#include "chrome/browser/predictors/predictors_traffic_annotations.h" // nogncheck
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
@ -40,6 +39,7 @@
#include "content/public/browser/download_item_utils.h"
#include "content/public/browser/download_manager_delegate.h"
#include "content/public/browser/network_service_instance.h"
#include "content/public/browser/preconnect_manager.h"
#include "content/public/browser/preconnect_request.h"
#include "content/public/browser/storage_partition.h"
#include "gin/arguments.h"

6
shell/browser/electron_browser_context.cc
View file

@ -19,7 +19,6 @@
#include "base/strings/escape.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "chrome/browser/predictors/preconnect_manager.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/pref_names.h"
#include "components/keyed_service/content/browser_context_dependency_manager.h"
@ -34,6 +33,7 @@
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/cors_origin_pattern_setter.h"
#include "content/public/browser/host_zoom_map.h"
#include "content/public/browser/preconnect_manager.h"
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/shared_cors_origin_access_list.h"
#include "content/public/browser/storage_partition.h"
@ -558,11 +558,11 @@ std::string ElectronBrowserContext::GetUserAgent() const {
return user_agent_.value_or(ElectronBrowserClient::Get()->GetUserAgent());
}
predictors::PreconnectManager* ElectronBrowserContext::GetPreconnectManager() {
content::PreconnectManager* ElectronBrowserContext::GetPreconnectManager() {
if (!preconnect_manager_) {
preconnect_manager_delegate_ =
std::make_unique<ElectronPreconnectManagerDelegate>();
preconnect_manager_ = predictors::PreconnectManager::Create(
preconnect_manager_ = content::PreconnectManager::Create(
preconnect_manager_delegate_->GetWeakPtr(), this);
}
return preconnect_manager_.get();

12
shell/browser/electron_browser_context.h
View file

@ -22,6 +22,10 @@
class PrefService;
class ValueMapPrefStore;
namespace content {
class PreconnectManager;
} // namespace content
namespace gin {
class Arguments;
}
@ -30,10 +34,6 @@ namespace network {
class SharedURLLoaderFactory;
}
namespace predictors {
class PreconnectManager;
} // namespace predictors
namespace storage {
class SpecialStoragePolicy;
}
@ -88,7 +88,7 @@ class ElectronBrowserContext : public content::BrowserContext {
bool can_use_http_cache() const { return use_cache_; }
int max_cache_size() const { return max_cache_size_; }
ResolveProxyHelper* GetResolveProxyHelper();
predictors::PreconnectManager* GetPreconnectManager();
content::PreconnectManager* GetPreconnectManager();
scoped_refptr<network::SharedURLLoaderFactory> GetURLLoaderFactory();
std::string GetMediaDeviceIDSalt();
@ -192,7 +192,7 @@ class ElectronBrowserContext : public content::BrowserContext {
std::unique_ptr<MediaDeviceIDSalt> media_device_id_salt_;
scoped_refptr<ResolveProxyHelper> resolve_proxy_helper_;
scoped_refptr<storage::SpecialStoragePolicy> storage_policy_;
std::unique_ptr<predictors::PreconnectManager> preconnect_manager_;
std::unique_ptr<content::PreconnectManager> preconnect_manager_;
std::unique_ptr<ElectronPreconnectManagerDelegate>
preconnect_manager_delegate_;
std::unique_ptr<ProtocolRegistry> protocol_registry_;

8
shell/browser/electron_preconnect_manager_delegate.h
View file

@ -8,14 +8,14 @@
#include <memory>
#include "base/memory/weak_ptr.h"
#include "chrome/browser/predictors/preconnect_manager.h"
#include "content/public/browser/preconnect_manager.h"
class GURL;
namespace electron {
class ElectronPreconnectManagerDelegate
: public predictors::PreconnectManager::Delegate {
: public content::PreconnectManager::Delegate {
public:
ElectronPreconnectManagerDelegate();
~ElectronPreconnectManagerDelegate() override;
@ -26,11 +26,11 @@ class ElectronPreconnectManagerDelegate
ElectronPreconnectManagerDelegate& operator=(
const ElectronPreconnectManagerDelegate&) = delete;
// preconnect_manager::Delegate
// content::PreconnectManager::Delegate
void PreconnectInitiated(const GURL& url,
const GURL& preconnect_url) override {}
void PreconnectFinished(
std::unique_ptr<predictors::PreconnectStats> stats) override {}
std::unique_ptr<content::PreconnectStats> stats) override {}
bool IsPreconnectEnabled() override;
base::WeakPtr<ElectronPreconnectManagerDelegate> GetWeakPtr() {

3
shell/browser/electron_speech_recognition_manager_delegate.cc
View file

@ -28,6 +28,7 @@ ElectronSpeechRecognitionManagerDelegate::GetEventListener() {
}
void ElectronSpeechRecognitionManagerDelegate::BindSpeechRecognitionContext(
mojo::PendingReceiver<media::mojom::SpeechRecognitionContext> receiver) {}
mojo::PendingReceiver<media::mojom::SpeechRecognitionContext> receiver,
const std::string& language) {}
} // namespace electron

4
shell/browser/electron_speech_recognition_manager_delegate.h
View file

@ -29,8 +29,8 @@ class ElectronSpeechRecognitionManagerDelegate
override;
content::SpeechRecognitionEventListener* GetEventListener() override;
void BindSpeechRecognitionContext(
mojo::PendingReceiver<media::mojom::SpeechRecognitionContext> receiver)
override;
mojo::PendingReceiver<media::mojom::SpeechRecognitionContext> receiver,
const std::string& language) override;
};
} // namespace electron

2
shell/browser/osr/osr_render_widget_host_view.cc
View file

@ -835,7 +835,7 @@ void OffScreenRenderWidgetHostView::SendMouseWheelEvent(
mouse_wheel_phase_handler_.SendWheelEndForTouchpadScrollingIfNeeded(
should_route_event);
mouse_wheel_phase_handler_.AddPhaseIfNeededAndScheduleEndEvent(
mouse_wheel_event, false);
mouse_wheel_event, false, true);
if (!IsPopupWidget()) {
if (popup_host_view_) {

2
shell/common/extensions/api/tabs.json
View file

@ -67,7 +67,7 @@
"optional": "true",
"description": "The ID of the Split View that the tab belongs to.",
// TODO(crbug.com/433273595): Enable documentation when ready for launch.
"nodoc": "true"
"nodoc": true
},
"windowId": {"type": "integer", "minimum": 0, "description": "The ID of the window that contains the tab."},
"openerTabId": {"type": "integer", "minimum": 0, "optional": true, "description": "The ID of the tab that opened this tab, if any. This property is only present if the opener tab still exists."},

13
shell/common/gin_helper/wrappable.cc
View file

@ -211,3 +211,16 @@ void* FromV8Impl(v8::Isolate* isolate,
} // namespace internal
} // namespace gin_helper
namespace gin {
DeprecatedWrapperInfo* DeprecatedWrapperInfo::From(
v8::Local<v8::Object> object) {
if (object->InternalFieldCount() != kNumberOfInternalFields)
return NULL;
DeprecatedWrapperInfo* info = static_cast<DeprecatedWrapperInfo*>(
object->GetAlignedPointerFromInternalField(kWrapperInfoIndex));
return info->embedder == kEmbedderNativeGin ? info : NULL;
}
} // namespace gin

2
shell/renderer/electron_renderer_client.cc
View file

@ -29,7 +29,7 @@
#if BUILDFLAG(IS_LINUX) && (defined(ARCH_CPU_X86_64) || defined(ARCH_CPU_ARM64))
#define ENABLE_WEB_ASSEMBLY_TRAP_HANDLER_LINUX
#include "components/crash/core/app/crashpad.h"
#include "components/crash/core/app/crashpad.h" // nogncheck
#include "content/public/common/content_switches.h"
#include "v8/include/v8-wasm-trap-handler-posix.h"
#endif