mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 125.0.6422.0 (#1287751)
This commit is contained in:
@@ -59,6 +59,7 @@
|
||||
#include "components/content_settings/core/common/content_settings_types.h"
|
||||
#include "components/nacl/common/nacl_constants.h"
|
||||
#include "components/pdf/common/constants.h"
|
||||
#include "components/pdf/common/pdf_util.h"
|
||||
#include "components/pdf/renderer/internal_plugin_renderer_helpers.h"
|
||||
#include "components/printing/renderer/print_render_frame_helper.h"
|
||||
#include "components/spellcheck/renderer/spellcheck.h"
|
||||
@@ -430,10 +431,11 @@ bool AlloyContentRendererClient::IsOriginIsolatedPepperPlugin(
|
||||
return true;
|
||||
}
|
||||
|
||||
std::unique_ptr<media::KeySystemSupportObserver>
|
||||
std::unique_ptr<media::KeySystemSupportRegistration>
|
||||
AlloyContentRendererClient::GetSupportedKeySystems(
|
||||
content::RenderFrame* render_frame,
|
||||
media::GetSupportedKeySystemsCB cb) {
|
||||
return GetChromeKeySystems(std::move(cb));
|
||||
return GetChromeKeySystems(render_frame, std::move(cb));
|
||||
}
|
||||
|
||||
void AlloyContentRendererClient::RunScriptsAtDocumentStart(
|
||||
|
@@ -20,7 +20,6 @@
|
||||
#include "chrome/common/plugin.mojom.h"
|
||||
#include "content/public/renderer/content_renderer_client.h"
|
||||
#include "content/public/renderer/render_thread.h"
|
||||
#include "media/base/key_systems_support_observer.h"
|
||||
#include "mojo/public/cpp/bindings/generic_pending_receiver.h"
|
||||
#include "services/service_manager/public/cpp/local_interface_provider.h"
|
||||
|
||||
@@ -100,7 +99,8 @@ class AlloyContentRendererClient
|
||||
uint64_t VisitedLinkHash(std::string_view canonical_url) override;
|
||||
bool IsLinkVisited(uint64_t link_hash) override;
|
||||
bool IsOriginIsolatedPepperPlugin(const base::FilePath& plugin_path) override;
|
||||
std::unique_ptr<media::KeySystemSupportObserver> GetSupportedKeySystems(
|
||||
std::unique_ptr<media::KeySystemSupportRegistration> GetSupportedKeySystems(
|
||||
content::RenderFrame* render_frame,
|
||||
media::GetSupportedKeySystemsCB cb) override;
|
||||
void RunScriptsAtDocumentStart(content::RenderFrame* render_frame) override;
|
||||
void RunScriptsAtDocumentEnd(content::RenderFrame* render_frame) override;
|
||||
|
@@ -18,7 +18,6 @@
|
||||
#include "extensions/common/permissions/permissions_data.h"
|
||||
#include "extensions/renderer/api/core_extensions_renderer_api_provider.h"
|
||||
#include "extensions/renderer/dispatcher.h"
|
||||
#include "extensions/renderer/dispatcher_delegate.h"
|
||||
#include "extensions/renderer/extension_frame_helper.h"
|
||||
#include "extensions/renderer/extensions_render_frame_observer.h"
|
||||
#include "extensions/renderer/extensions_renderer_api_provider.h"
|
||||
@@ -87,9 +86,8 @@ bool CefExtensionsRendererClient::ExtensionAPIEnabledForServiceWorkerScript(
|
||||
void CefExtensionsRendererClient::RenderThreadStarted() {
|
||||
content::RenderThread* thread = content::RenderThread::Get();
|
||||
|
||||
extension_dispatcher_ = std::make_unique<extensions::Dispatcher>(
|
||||
std::make_unique<extensions::DispatcherDelegate>(),
|
||||
std::move(api_providers_));
|
||||
extension_dispatcher_ =
|
||||
std::make_unique<extensions::Dispatcher>(std::move(api_providers_));
|
||||
extension_dispatcher_->OnRenderThreadStarted(thread);
|
||||
resource_request_policy_ =
|
||||
std::make_unique<extensions::ResourceRequestPolicy>(
|
||||
|
@@ -358,9 +358,8 @@ void CefFrameImpl::OnDidFinishLoad() {
|
||||
}
|
||||
|
||||
void CefFrameImpl::OnDraggableRegionsChanged() {
|
||||
// Match the behavior in ChromeRenderFrameObserver::DraggableRegionsChanged.
|
||||
// Only the main frame is allowed to control draggable regions, to avoid other
|
||||
// frames manipulate the regions in the browser process.
|
||||
// frames trying to manipulate the regions in the browser process.
|
||||
if (frame_->Parent() != nullptr) {
|
||||
return;
|
||||
}
|
||||
@@ -376,7 +375,7 @@ void CefFrameImpl::OnDraggableRegionsChanged() {
|
||||
auto region = cef::mojom::DraggableRegionEntry::New(webregion.bounds,
|
||||
webregion.draggable);
|
||||
render_frame->ConvertViewportToWindow(®ion->bounds);
|
||||
regions.push_back(std::move(region));
|
||||
regions.emplace_back(std::move(region));
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -85,7 +85,6 @@ class CefFrameImpl
|
||||
void OnWasShown();
|
||||
void OnDidCommitProvisionalLoad();
|
||||
void OnDidFinishLoad();
|
||||
void OnDraggableRegionsChanged();
|
||||
void OnContextCreated(v8::Local<v8::Context> context);
|
||||
void OnContextReleased();
|
||||
void OnDetached();
|
||||
@@ -93,6 +92,11 @@ class CefFrameImpl
|
||||
blink::WebLocalFrame* web_frame() const { return frame_; }
|
||||
|
||||
private:
|
||||
// Called for draggable region changes due to navigation. This is in addition
|
||||
// to the standard notifications delivered via
|
||||
// WebContentsDelegate::DraggableRegionsChanged.
|
||||
void OnDraggableRegionsChanged();
|
||||
|
||||
// Execute an action on the associated WebLocalFrame. This will queue the
|
||||
// action if the JavaScript context is not yet created.
|
||||
using LocalFrameAction =
|
||||
|
@@ -118,12 +118,6 @@ void CefRenderFrameObserver::FocusedElementChanged(
|
||||
documentImpl->Detach();
|
||||
}
|
||||
|
||||
void CefRenderFrameObserver::DraggableRegionsChanged() {
|
||||
if (frame_) {
|
||||
frame_->OnDraggableRegionsChanged();
|
||||
}
|
||||
}
|
||||
|
||||
void CefRenderFrameObserver::DidCreateScriptContext(
|
||||
v8::Handle<v8::Context> context,
|
||||
int world_id) {
|
||||
|
@@ -33,7 +33,6 @@ class CefRenderFrameObserver : public content::RenderFrameObserver {
|
||||
void DidFinishLoad() override;
|
||||
void WillDetach(blink::DetachReason detach_reason) override;
|
||||
void FocusedElementChanged(const blink::WebElement& element) override;
|
||||
void DraggableRegionsChanged() override;
|
||||
void DidCreateScriptContext(v8::Handle<v8::Context> context,
|
||||
int world_id) override;
|
||||
void WillReleaseScriptContext(v8::Handle<v8::Context> context,
|
||||
|
@@ -125,7 +125,7 @@ void CefRenderManager::RenderFrameCreated(
|
||||
// Enable support for draggable regions.
|
||||
// TODO: This has performance consequences so consider making it configurable
|
||||
// (e.g. only enabled for frameless windows). See issue #3636.
|
||||
render_frame->GetWebView()->SetSupportsAppRegion(true);
|
||||
render_frame->GetWebView()->SetSupportsDraggableRegions(true);
|
||||
}
|
||||
|
||||
void CefRenderManager::WebViewCreated(
|
||||
|
@@ -2364,7 +2364,7 @@ bool CefV8ValueImpl::NeuterArrayBuffer() {
|
||||
if (!arr->IsDetachable()) {
|
||||
return false;
|
||||
}
|
||||
arr->Detach();
|
||||
[[maybe_unused]] auto result = arr->Detach(v8::Local<v8::Value>());
|
||||
|
||||
return true;
|
||||
}
|
||||
|
Reference in New Issue
Block a user