mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Compare commits
27 Commits
5bafd32ee1
...
4515
Author | SHA1 | Date | |
---|---|---|---|
|
274abcf792 | ||
|
9d87c1f976 | ||
|
d15cfa853e | ||
|
4045acff92 | ||
|
01c8529f74 | ||
|
5ffe90cd56 | ||
|
a9ec100d85 | ||
|
7cfecf12ac | ||
|
bc6d8f3bee | ||
|
6bd1124a61 | ||
|
af1a5c6f6b | ||
|
3492b1bd76 | ||
|
159e6553a5 | ||
|
add734afd4 | ||
|
e75b87161d | ||
|
1bed986adb | ||
|
439421f195 | ||
|
108795e566 | ||
|
847fba0d7f | ||
|
d7c630a930 | ||
|
f6aa203222 | ||
|
ad7b8d9a08 | ||
|
2804be0749 | ||
|
023df80e74 | ||
|
bfc5648634 | ||
|
052b61ddd9 | ||
|
008ace03fc |
28
BUILD.gn
28
BUILD.gn
@@ -486,6 +486,8 @@ static_library("libcef_static") {
|
||||
"libcef/browser/extensions/api/storage/sync_value_store_cache.h",
|
||||
"libcef/browser/extensions/api/tabs/tabs_api.cc",
|
||||
"libcef/browser/extensions/api/tabs/tabs_api.h",
|
||||
"libcef/browser/extensions/alloy_extensions_util.cc",
|
||||
"libcef/browser/extensions/alloy_extensions_util.h",
|
||||
"libcef/browser/extensions/browser_extensions_util.cc",
|
||||
"libcef/browser/extensions/browser_extensions_util.h",
|
||||
"libcef/browser/extensions/browser_platform_delegate_background.cc",
|
||||
@@ -1652,6 +1654,29 @@ if (is_mac) {
|
||||
# Executable/app targets.
|
||||
#
|
||||
|
||||
# Source files for TeamCity GTest integration.
|
||||
# See tests/gtest/teamcity/README.cef for details.
|
||||
source_set("gtest_teamcity") {
|
||||
testonly = true
|
||||
|
||||
sources = [
|
||||
"tests/gtest/teamcity/include/teamcity_gtest.h",
|
||||
"tests/gtest/teamcity/src/teamcity_gtest.cpp",
|
||||
"tests/gtest/teamcity/src/teamcity_gtest.h",
|
||||
"tests/gtest/teamcity/src/teamcity_messages.cpp",
|
||||
"tests/gtest/teamcity/src/teamcity_messages.h",
|
||||
]
|
||||
|
||||
deps = [
|
||||
"//testing/gtest",
|
||||
]
|
||||
|
||||
configs += [
|
||||
"libcef/features:config",
|
||||
"//build/config:precompiled_headers",
|
||||
]
|
||||
}
|
||||
|
||||
if (is_mac) {
|
||||
# Helper for generating the CEF app bundle.
|
||||
template("cef_app") {
|
||||
@@ -1979,6 +2004,7 @@ if (is_mac) {
|
||||
gypi_paths2.shared_sources_mac_helper +
|
||||
gypi_paths2.ceftests_sources_mac_helper
|
||||
helper_deps = [
|
||||
":gtest_teamcity",
|
||||
"//testing/gtest",
|
||||
]
|
||||
helper_defines = [
|
||||
@@ -1999,6 +2025,7 @@ if (is_mac) {
|
||||
":ceftests_resources_bundle_data",
|
||||
":ceftests_resources_bundle_data_english",
|
||||
":ceftests_xibs",
|
||||
":gtest_teamcity",
|
||||
"//testing/gtest",
|
||||
]
|
||||
frameworks = [
|
||||
@@ -2217,6 +2244,7 @@ if (is_mac) {
|
||||
deps = [
|
||||
":libcef",
|
||||
":libcef_dll_wrapper",
|
||||
":gtest_teamcity",
|
||||
"//testing/gtest",
|
||||
]
|
||||
|
||||
|
@@ -7,5 +7,6 @@
|
||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||
|
||||
{
|
||||
'chromium_checkout': 'refs/tags/92.0.4515.0'
|
||||
'chromium_checkout': 'refs/tags/92.0.4515.159',
|
||||
'depot_tools_checkout': '58542b7fef'
|
||||
}
|
||||
|
@@ -33,7 +33,7 @@
|
||||
// by hand. See the translator.README.txt file in the tools directory for
|
||||
// more information.
|
||||
//
|
||||
// $hash=d8b5b641cc036a9cd9375442254d558b066ada69$
|
||||
// $hash=f74bf4d33914d56d760f1bf5aadcf2651740c711$
|
||||
//
|
||||
|
||||
#ifndef CEF_INCLUDE_CAPI_CEF_WEB_PLUGIN_CAPI_H_
|
||||
@@ -214,7 +214,7 @@ CEF_EXPORT void cef_is_web_plugin_unstable(
|
||||
// D. "x-cdm-interface-versions": Interface API version (e.g. "8").
|
||||
// E. "x-cdm-host-versions": Host API version (e.g. "8").
|
||||
// F. "version": CDM version (e.g. "1.4.8.903").
|
||||
// G. "x-cdm-codecs": List of supported codecs (e.g. "vp8,vp9.0,avc1").
|
||||
// G. "x-cdm-codecs": List of supported codecs (e.g. "vp8,vp09,avc1").
|
||||
//
|
||||
// A through E are used to verify compatibility with the current Chromium
|
||||
// version. If the CDM is not compatible the registration will fail and
|
||||
|
@@ -191,7 +191,7 @@ class CefRegisterCdmCallback : public virtual CefBaseRefCounted {
|
||||
// D. "x-cdm-interface-versions": Interface API version (e.g. "8").
|
||||
// E. "x-cdm-host-versions": Host API version (e.g. "8").
|
||||
// F. "version": CDM version (e.g. "1.4.8.903").
|
||||
// G. "x-cdm-codecs": List of supported codecs (e.g. "vp8,vp9.0,avc1").
|
||||
// G. "x-cdm-codecs": List of supported codecs (e.g. "vp8,vp09,avc1").
|
||||
//
|
||||
// A through E are used to verify compatibility with the current Chromium
|
||||
// version. If the CDM is not compatible the registration will fail and
|
||||
|
@@ -255,7 +255,7 @@ class CefAllowCertificateErrorCallbackImpl : public CefRequestCallback {
|
||||
CEF_REQUIRE_UIT();
|
||||
std::move(callback).Run(
|
||||
allow ? content::CERTIFICATE_REQUEST_RESULT_TYPE_CONTINUE
|
||||
: content::CERTIFICATE_REQUEST_RESULT_TYPE_CANCEL);
|
||||
: content::CERTIFICATE_REQUEST_RESULT_TYPE_DENY);
|
||||
}
|
||||
|
||||
CallbackType callback_;
|
||||
@@ -855,7 +855,7 @@ void AlloyContentBrowserClient::AllowCertificateError(
|
||||
// A sub-resource has a certificate error. The user doesn't really
|
||||
// have a context for making the right decision, so block the request
|
||||
// hard.
|
||||
std::move(callback).Run(content::CERTIFICATE_REQUEST_RESULT_TYPE_CANCEL);
|
||||
std::move(callback).Run(content::CERTIFICATE_REQUEST_RESULT_TYPE_DENY);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -882,7 +882,7 @@ void AlloyContentBrowserClient::AllowCertificateError(
|
||||
// |callback| may be null if the user executed it despite returning false.
|
||||
callback = callbackImpl->Disconnect();
|
||||
if (!callback.is_null()) {
|
||||
std::move(callback).Run(content::CERTIFICATE_REQUEST_RESULT_TYPE_CANCEL);
|
||||
std::move(callback).Run(content::CERTIFICATE_REQUEST_RESULT_TYPE_DENY);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -110,7 +110,9 @@ void CefAudioCapturer::Capture(const media::AudioBus* source,
|
||||
pts.InMilliseconds());
|
||||
}
|
||||
|
||||
void CefAudioCapturer::OnCaptureError(const std::string& message) {
|
||||
void CefAudioCapturer::OnCaptureError(
|
||||
media::AudioCapturerSource::ErrorCode code,
|
||||
const std::string& message) {
|
||||
audio_handler_->OnAudioStreamError(browser_, message);
|
||||
StopStream();
|
||||
}
|
||||
|
@@ -33,7 +33,8 @@ class CefAudioCapturer : public media::AudioCapturerSource::CaptureCallback {
|
||||
base::TimeTicks audio_capture_time,
|
||||
double volume,
|
||||
bool key_pressed) override;
|
||||
void OnCaptureError(const std::string& message) override;
|
||||
void OnCaptureError(media::AudioCapturerSource::ErrorCode code,
|
||||
const std::string& message) override;
|
||||
void OnCaptureMuted(bool is_muted) override {}
|
||||
|
||||
void StopStream();
|
||||
|
@@ -243,6 +243,13 @@ void CefBrowserContentsDelegate::RenderFrameHostChanged(
|
||||
RenderFrameCreated(new_host);
|
||||
}
|
||||
|
||||
void CefBrowserContentsDelegate::RenderFrameHostStateChanged(
|
||||
content::RenderFrameHost* host,
|
||||
content::RenderFrameHost::LifecycleState old_state,
|
||||
content::RenderFrameHost::LifecycleState new_state) {
|
||||
browser_info_->FrameHostStateChanged(host, old_state, new_state);
|
||||
}
|
||||
|
||||
void CefBrowserContentsDelegate::RenderFrameDeleted(
|
||||
content::RenderFrameHost* render_frame_host) {
|
||||
const auto frame_id = CefFrameHostImpl::MakeFrameId(render_frame_host);
|
||||
|
@@ -108,6 +108,10 @@ class CefBrowserContentsDelegate : public content::WebContentsDelegate,
|
||||
void RenderFrameCreated(content::RenderFrameHost* render_frame_host) override;
|
||||
void RenderFrameHostChanged(content::RenderFrameHost* old_host,
|
||||
content::RenderFrameHost* new_host) override;
|
||||
void RenderFrameHostStateChanged(
|
||||
content::RenderFrameHost* host,
|
||||
content::RenderFrameHost::LifecycleState old_state,
|
||||
content::RenderFrameHost::LifecycleState new_state) override;
|
||||
void RenderFrameDeleted(content::RenderFrameHost* render_frame_host) override;
|
||||
void RenderViewReady() override;
|
||||
void RenderProcessGone(base::TerminationStatus status) override;
|
||||
|
@@ -229,7 +229,9 @@ void CefBrowserContext::RemoveCefRequestContext(
|
||||
// Delete ourselves when the reference count reaches zero.
|
||||
if (request_context_set_.empty()) {
|
||||
Shutdown();
|
||||
delete this;
|
||||
|
||||
// Allow the current call stack to unwind before deleting |this|.
|
||||
content::BrowserThread::DeleteSoon(CEF_UIT, FROM_HERE, this);
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -16,6 +16,7 @@
|
||||
#include "base/callback.h"
|
||||
#include "base/files/file_path.h"
|
||||
#include "base/memory/weak_ptr.h"
|
||||
#include "base/sequenced_task_runner_helpers.h"
|
||||
#include "chrome/common/plugin.mojom.h"
|
||||
#include "services/network/public/mojom/network_context.mojom.h"
|
||||
#include "third_party/abseil-cpp/absl/types/optional.h"
|
||||
@@ -236,6 +237,9 @@ class CefBrowserContext {
|
||||
base::FilePath cache_path_;
|
||||
|
||||
private:
|
||||
// For DeleteSoon().
|
||||
friend class base::DeleteHelper<CefBrowserContext>;
|
||||
|
||||
scoped_refptr<CefIOThreadState> iothread_state_;
|
||||
CookieableSchemes cookieable_schemes_;
|
||||
std::unique_ptr<CefMediaRouterManager> media_router_manager_;
|
||||
|
@@ -153,6 +153,32 @@ void CefBrowserInfo::MaybeCreateFrame(content::RenderFrameHost* host,
|
||||
frame_info_set_.insert(base::WrapUnique(frame_info));
|
||||
}
|
||||
|
||||
void CefBrowserInfo::FrameHostStateChanged(
|
||||
content::RenderFrameHost* host,
|
||||
content::RenderFrameHost::LifecycleState old_state,
|
||||
content::RenderFrameHost::LifecycleState new_state) {
|
||||
CEF_REQUIRE_UIT();
|
||||
|
||||
// We currently only care about BackForwardCache state changes.
|
||||
bool added_to_bfcache =
|
||||
new_state ==
|
||||
content::RenderFrameHost::LifecycleState::kInBackForwardCache;
|
||||
bool removed_from_bfcache =
|
||||
old_state ==
|
||||
content::RenderFrameHost::LifecycleState::kInBackForwardCache;
|
||||
if (!added_to_bfcache && !removed_from_bfcache)
|
||||
return;
|
||||
|
||||
base::AutoLock lock_scope(lock_);
|
||||
|
||||
const auto frame_id = CefFrameHostImpl::MakeFrameId(host);
|
||||
auto it = frame_id_map_.find(frame_id);
|
||||
DCHECK(it != frame_id_map_.end());
|
||||
DCHECK((!it->second->is_in_bfcache_ && added_to_bfcache) ||
|
||||
(it->second->is_in_bfcache_ && removed_from_bfcache));
|
||||
it->second->is_in_bfcache_ = added_to_bfcache;
|
||||
}
|
||||
|
||||
void CefBrowserInfo::RemoveFrame(content::RenderFrameHost* host) {
|
||||
CEF_REQUIRE_UIT();
|
||||
|
||||
@@ -190,8 +216,8 @@ void CefBrowserInfo::RemoveFrame(content::RenderFrameHost* host) {
|
||||
// Explicitly Detach everything but the current main frame.
|
||||
const auto& frame_info = *it2;
|
||||
if (frame_info->frame_ && !frame_info->IsCurrentMainFrame()) {
|
||||
frame_info->frame_->Detach();
|
||||
MaybeNotifyFrameDetached(browser_, frame_info->frame_);
|
||||
if (frame_info->frame_->Detach())
|
||||
MaybeNotifyFrameDetached(browser_, frame_info->frame_);
|
||||
}
|
||||
|
||||
frame_info_set_.erase(it2);
|
||||
@@ -314,8 +340,9 @@ CefBrowserInfo::FrameHostList CefBrowserInfo::GetAllFrames() const {
|
||||
base::AutoLock lock_scope(lock_);
|
||||
FrameHostList frames;
|
||||
for (const auto& info : frame_info_set_) {
|
||||
if (info->frame_ && !info->is_speculative_)
|
||||
if (info->frame_ && !info->is_speculative_ && !info->is_in_bfcache_) {
|
||||
frames.insert(info->frame_);
|
||||
}
|
||||
}
|
||||
return frames;
|
||||
}
|
||||
@@ -438,8 +465,8 @@ void CefBrowserInfo::SetMainFrame(CefRefPtr<CefBrowserHostBase> browser,
|
||||
CefRefPtr<CefFrameHostImpl> old_frame;
|
||||
if (main_frame_) {
|
||||
old_frame = main_frame_;
|
||||
old_frame->Detach();
|
||||
MaybeNotifyFrameDetached(browser, old_frame);
|
||||
if (old_frame->Detach())
|
||||
MaybeNotifyFrameDetached(browser, old_frame);
|
||||
}
|
||||
|
||||
main_frame_ = frame;
|
||||
@@ -520,8 +547,8 @@ void CefBrowserInfo::RemoveAllFrames(
|
||||
// Explicitly Detach everything but the current main frame.
|
||||
for (auto& info : frame_info_set_) {
|
||||
if (info->frame_ && !info->IsCurrentMainFrame()) {
|
||||
info->frame_->Detach();
|
||||
MaybeNotifyFrameDetached(old_browser, info->frame_);
|
||||
if (info->frame_->Detach())
|
||||
MaybeNotifyFrameDetached(old_browser, info->frame_);
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -19,10 +19,7 @@
|
||||
#include "base/memory/weak_ptr.h"
|
||||
#include "base/synchronization/lock.h"
|
||||
#include "base/values.h"
|
||||
|
||||
namespace content {
|
||||
class RenderFrameHost;
|
||||
}
|
||||
#include "content/public/browser/render_frame_host.h"
|
||||
|
||||
class CefBrowserHostBase;
|
||||
class CefFrameHandler;
|
||||
@@ -62,6 +59,13 @@ class CefBrowserInfo : public base::RefCountedThreadSafe<CefBrowserInfo> {
|
||||
// true).
|
||||
void MaybeCreateFrame(content::RenderFrameHost* host, bool is_guest_view);
|
||||
|
||||
// Used to track state changes such as entering/exiting the BackForwardCache.
|
||||
// Called from CefBrowserContentsDelegate::RenderFrameHostStateChanged.
|
||||
void FrameHostStateChanged(
|
||||
content::RenderFrameHost* host,
|
||||
content::RenderFrameHost::LifecycleState old_state,
|
||||
content::RenderFrameHost::LifecycleState new_state);
|
||||
|
||||
// Remove the frame record for |host|. Called for the main frame when the
|
||||
// RenderView is destroyed, or for a sub-frame when the associated RenderFrame
|
||||
// is destroyed in the renderer process.
|
||||
@@ -170,7 +174,7 @@ class CefBrowserInfo : public base::RefCountedThreadSafe<CefBrowserInfo> {
|
||||
~FrameInfo();
|
||||
|
||||
inline bool IsCurrentMainFrame() const {
|
||||
return frame_ && is_main_frame_ && !is_speculative_;
|
||||
return frame_ && is_main_frame_ && !is_speculative_ && !is_in_bfcache_;
|
||||
}
|
||||
|
||||
content::RenderFrameHost* host_;
|
||||
@@ -179,6 +183,7 @@ class CefBrowserInfo : public base::RefCountedThreadSafe<CefBrowserInfo> {
|
||||
bool is_guest_view_;
|
||||
bool is_main_frame_;
|
||||
bool is_speculative_;
|
||||
bool is_in_bfcache_ = false;
|
||||
CefRefPtr<CefFrameHostImpl> frame_;
|
||||
};
|
||||
|
||||
|
@@ -6,8 +6,11 @@
|
||||
|
||||
#include "libcef/browser/thread_util.h"
|
||||
|
||||
#include "base/threading/thread_restrictions.h"
|
||||
#include "chrome/browser/browser_process.h"
|
||||
#include "chrome/browser/profiles/off_the_record_profile_impl.h"
|
||||
#include "chrome/browser/profiles/profile_keep_alive_types.h"
|
||||
#include "chrome/browser/profiles/scoped_profile_keep_alive.h"
|
||||
|
||||
ChromeBrowserContext::ChromeBrowserContext(
|
||||
const CefRequestContextSettings& settings)
|
||||
@@ -16,15 +19,18 @@ ChromeBrowserContext::ChromeBrowserContext(
|
||||
ChromeBrowserContext::~ChromeBrowserContext() = default;
|
||||
|
||||
content::BrowserContext* ChromeBrowserContext::AsBrowserContext() {
|
||||
CHECK(!destroyed_);
|
||||
return profile_;
|
||||
}
|
||||
|
||||
Profile* ChromeBrowserContext::AsProfile() {
|
||||
CHECK(!destroyed_);
|
||||
return profile_;
|
||||
}
|
||||
|
||||
bool ChromeBrowserContext::IsInitialized() const {
|
||||
CEF_REQUIRE_UIT();
|
||||
CHECK(!destroyed_);
|
||||
return !!profile_;
|
||||
}
|
||||
|
||||
@@ -73,13 +79,21 @@ void ChromeBrowserContext::InitializeAsync(base::OnceClosure initialized_cb) {
|
||||
|
||||
void ChromeBrowserContext::Shutdown() {
|
||||
CefBrowserContext::Shutdown();
|
||||
|
||||
// Allow potential deletion of the Profile at some future point (controlled
|
||||
// by ProfileManager).
|
||||
profile_keep_alive_.reset();
|
||||
|
||||
// |g_browser_process| may be nullptr during shutdown.
|
||||
if (should_destroy_ && g_browser_process) {
|
||||
g_browser_process->profile_manager()
|
||||
->GetPrimaryUserProfile()
|
||||
->DestroyOffTheRecordProfile(profile_);
|
||||
if (g_browser_process) {
|
||||
if (should_destroy_) {
|
||||
g_browser_process->profile_manager()
|
||||
->GetPrimaryUserProfile()
|
||||
->DestroyOffTheRecordProfile(profile_);
|
||||
} else if (profile_) {
|
||||
OnProfileWillBeDestroyed(profile_);
|
||||
}
|
||||
}
|
||||
profile_ = nullptr;
|
||||
}
|
||||
|
||||
void ChromeBrowserContext::ProfileCreated(Profile* profile,
|
||||
@@ -92,6 +106,9 @@ void ChromeBrowserContext::ProfileCreated(Profile* profile,
|
||||
CHECK(!profile);
|
||||
CHECK(!profile_);
|
||||
|
||||
// Profile creation may access the filesystem.
|
||||
base::ScopedAllowBlockingForTesting allow_blocking;
|
||||
|
||||
// Creation of a disk-based profile failed for some reason. Create a
|
||||
// new/unique OffTheRecord profile instead.
|
||||
const auto& profile_id = Profile::OTRProfileID::CreateUniqueForCEF();
|
||||
@@ -107,6 +124,9 @@ void ChromeBrowserContext::ProfileCreated(Profile* profile,
|
||||
// *CREATED isn't always sent for a disk-based profile that already
|
||||
// exists.
|
||||
profile_ = profile;
|
||||
profile_->AddObserver(this);
|
||||
profile_keep_alive_.reset(new ScopedProfileKeepAlive(
|
||||
profile_, ProfileKeepAliveOrigin::kAppWindow));
|
||||
}
|
||||
|
||||
if (status == Profile::CreateStatus::CREATE_STATUS_INITIALIZED) {
|
||||
@@ -128,3 +148,10 @@ void ChromeBrowserContext::ProfileCreated(Profile* profile,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void ChromeBrowserContext::OnProfileWillBeDestroyed(Profile* profile) {
|
||||
CHECK_EQ(profile_, profile);
|
||||
profile_->RemoveObserver(this);
|
||||
profile_ = nullptr;
|
||||
destroyed_ = true;
|
||||
}
|
||||
|
@@ -10,10 +10,13 @@
|
||||
|
||||
#include "base/memory/weak_ptr.h"
|
||||
#include "chrome/browser/profiles/profile_manager.h"
|
||||
#include "chrome/browser/profiles/profile_observer.h"
|
||||
|
||||
class ScopedProfileKeepAlive;
|
||||
|
||||
// See CefBrowserContext documentation for usage. Only accessed on the UI thread
|
||||
// unless otherwise indicated.
|
||||
class ChromeBrowserContext : public CefBrowserContext {
|
||||
class ChromeBrowserContext : public CefBrowserContext, public ProfileObserver {
|
||||
public:
|
||||
explicit ChromeBrowserContext(const CefRequestContextSettings& settings);
|
||||
|
||||
@@ -26,6 +29,9 @@ class ChromeBrowserContext : public CefBrowserContext {
|
||||
void StoreOrTriggerInitCallback(base::OnceClosure callback) override;
|
||||
void Shutdown() override;
|
||||
|
||||
// ProfileObserver overrides.
|
||||
void OnProfileWillBeDestroyed(Profile* profile) override;
|
||||
|
||||
private:
|
||||
~ChromeBrowserContext() override;
|
||||
|
||||
@@ -35,6 +41,9 @@ class ChromeBrowserContext : public CefBrowserContext {
|
||||
Profile* profile_ = nullptr;
|
||||
bool should_destroy_ = false;
|
||||
|
||||
bool destroyed_ = false;
|
||||
std::unique_ptr<ScopedProfileKeepAlive> profile_keep_alive_;
|
||||
|
||||
std::vector<base::OnceClosure> init_callbacks_;
|
||||
|
||||
base::WeakPtrFactory<ChromeBrowserContext> weak_ptr_factory_;
|
||||
|
20
libcef/browser/extensions/alloy_extensions_util.cc
Normal file
20
libcef/browser/extensions/alloy_extensions_util.cc
Normal file
@@ -0,0 +1,20 @@
|
||||
// Copyright 2021 The Chromium Embedded Framework Authors. All rights reserved.
|
||||
// Use of this source code is governed by a BSD-style license that can be found
|
||||
// in the LICENSE file.
|
||||
|
||||
#include "libcef/browser/extensions/alloy_extensions_util.h"
|
||||
|
||||
#include "libcef/browser/alloy/alloy_browser_host_impl.h"
|
||||
|
||||
namespace extensions {
|
||||
namespace alloy {
|
||||
|
||||
int GetTabIdForWebContents(content::WebContents* web_contents) {
|
||||
auto browser = AlloyBrowserHostImpl::GetBrowserForContents(web_contents);
|
||||
if (!browser)
|
||||
return -1;
|
||||
return browser->GetIdentifier();
|
||||
}
|
||||
|
||||
} // namespace alloy
|
||||
} // namespace extensions
|
21
libcef/browser/extensions/alloy_extensions_util.h
Normal file
21
libcef/browser/extensions/alloy_extensions_util.h
Normal file
@@ -0,0 +1,21 @@
|
||||
// Copyright 2021 The Chromium Embedded Framework Authors. All rights reserved.
|
||||
// Use of this source code is governed by a BSD-style license that can be found
|
||||
// in the LICENSE file.
|
||||
|
||||
#ifndef CEF_LIBCEF_BROWSER_EXTENSIONS_ALLOY_EXTENSIONS_UTIL_H_
|
||||
#define CEF_LIBCEF_BROWSER_EXTENSIONS_ALLOY_EXTENSIONS_UTIL_H_
|
||||
|
||||
namespace content {
|
||||
class WebContents;
|
||||
}
|
||||
|
||||
namespace extensions {
|
||||
namespace alloy {
|
||||
|
||||
// Returns the tabId for |web_contents|, or -1 if not found.
|
||||
int GetTabIdForWebContents(content::WebContents* web_contents);
|
||||
|
||||
} // namespace alloy
|
||||
} // namespace extensions
|
||||
|
||||
#endif // CEF_LIBCEF_BROWSER_EXTENSIONS_ALLOY_EXTENSIONS_UTIL_H_
|
@@ -6,10 +6,15 @@
|
||||
|
||||
#include "libcef/browser/extensions/extension_web_contents_observer.h"
|
||||
|
||||
#include "base/notreached.h"
|
||||
#include "base/strings/string_number_conversions.h"
|
||||
#include "chrome/browser/extensions/api/tabs/tabs_constants.h"
|
||||
#include "chrome/browser/extensions/extension_tab_util.h"
|
||||
#include "components/zoom/zoom_controller.h"
|
||||
#include "content/public/browser/navigation_controller.h"
|
||||
#include "content/public/browser/navigation_entry.h"
|
||||
#include "content/public/browser/render_frame_host.h"
|
||||
#include "content/public/browser/site_instance.h"
|
||||
#include "extensions/browser/extension_api_frame_id_map.h"
|
||||
#include "extensions/browser/extension_zoom_request_client.h"
|
||||
#include "extensions/common/error_utils.h"
|
||||
@@ -99,6 +104,148 @@ ExtensionFunction::ResponseAction TabsCreateFunction::Run() {
|
||||
: NoArguments());
|
||||
}
|
||||
|
||||
BaseAPIFunction::BaseAPIFunction() : cef_details_(this) {}
|
||||
|
||||
content::WebContents* BaseAPIFunction::GetWebContents(int tab_id) {
|
||||
// Find a browser that we can access, or set |error_| and return nullptr.
|
||||
CefRefPtr<AlloyBrowserHostImpl> browser =
|
||||
cef_details_.GetBrowserForTabIdFirstTime(tab_id, &error_);
|
||||
if (!browser)
|
||||
return nullptr;
|
||||
|
||||
return browser->web_contents();
|
||||
}
|
||||
|
||||
ExtensionFunction::ResponseAction TabsUpdateFunction::Run() {
|
||||
std::unique_ptr<tabs::Update::Params> params(
|
||||
tabs::Update::Params::Create(*args_));
|
||||
EXTENSION_FUNCTION_VALIDATE(params.get());
|
||||
|
||||
tab_id_ = params->tab_id ? *params->tab_id : -1;
|
||||
content::WebContents* web_contents = GetWebContents(tab_id_);
|
||||
if (!web_contents)
|
||||
return RespondNow(Error(std::move(error_)));
|
||||
|
||||
web_contents_ = web_contents;
|
||||
|
||||
// TODO(rafaelw): handle setting remaining tab properties:
|
||||
// -title
|
||||
// -favIconUrl
|
||||
|
||||
// Navigate the tab to a new location if the url is different.
|
||||
if (params->update_properties.url.get()) {
|
||||
std::string updated_url = *params->update_properties.url;
|
||||
if (!UpdateURL(updated_url, tab_id_, &error_))
|
||||
return RespondNow(Error(std::move(error_)));
|
||||
}
|
||||
|
||||
bool active = false;
|
||||
// TODO(rafaelw): Setting |active| from js doesn't make much sense.
|
||||
// Move tab selection management up to window.
|
||||
if (params->update_properties.selected.get())
|
||||
active = *params->update_properties.selected;
|
||||
|
||||
// The 'active' property has replaced 'selected'.
|
||||
if (params->update_properties.active.get())
|
||||
active = *params->update_properties.active;
|
||||
|
||||
if (active) {
|
||||
// TODO: Activate the tab at |tab_id_|.
|
||||
NOTIMPLEMENTED();
|
||||
return RespondNow(Error(tabs_constants::kTabStripNotEditableError));
|
||||
}
|
||||
|
||||
if (params->update_properties.highlighted.get() &&
|
||||
*params->update_properties.highlighted) {
|
||||
// TODO: Highlight the tab at |tab_id_|.
|
||||
NOTIMPLEMENTED();
|
||||
return RespondNow(Error(tabs_constants::kTabStripNotEditableError));
|
||||
}
|
||||
|
||||
if (params->update_properties.pinned.get() &&
|
||||
*params->update_properties.pinned) {
|
||||
// TODO: Pin the tab at |tab_id_|.
|
||||
NOTIMPLEMENTED();
|
||||
return RespondNow(Error(tabs_constants::kTabStripNotEditableError));
|
||||
}
|
||||
|
||||
if (params->update_properties.muted.get()) {
|
||||
// TODO: Mute/unmute the tab at |tab_id_|.
|
||||
NOTIMPLEMENTED();
|
||||
return RespondNow(Error(ErrorUtils::FormatErrorMessage(
|
||||
tabs_constants::kCannotUpdateMuteCaptured,
|
||||
base::NumberToString(tab_id_))));
|
||||
}
|
||||
|
||||
if (params->update_properties.opener_tab_id.get()) {
|
||||
int opener_id = *params->update_properties.opener_tab_id;
|
||||
if (opener_id == tab_id_)
|
||||
return RespondNow(Error("Cannot set a tab's opener to itself."));
|
||||
|
||||
// TODO: Set the opener for the tab at |tab_id_|.
|
||||
NOTIMPLEMENTED();
|
||||
return RespondNow(Error(tabs_constants::kTabStripNotEditableError));
|
||||
}
|
||||
|
||||
if (params->update_properties.auto_discardable.get()) {
|
||||
// TODO: Set auto-discardable state for the tab at |tab_id_|.
|
||||
NOTIMPLEMENTED();
|
||||
}
|
||||
|
||||
return RespondNow(GetResult());
|
||||
}
|
||||
|
||||
bool TabsUpdateFunction::UpdateURL(const std::string& url_string,
|
||||
int tab_id,
|
||||
std::string* error) {
|
||||
GURL url;
|
||||
if (!ExtensionTabUtil::PrepareURLForNavigation(url_string, extension(), &url,
|
||||
error)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
const bool is_javascript_scheme = url.SchemeIs(url::kJavaScriptScheme);
|
||||
// JavaScript URLs are forbidden in chrome.tabs.update().
|
||||
if (is_javascript_scheme) {
|
||||
*error = tabs_constants::kJavaScriptUrlsNotAllowedInTabsUpdate;
|
||||
return false;
|
||||
}
|
||||
|
||||
content::NavigationController::LoadURLParams load_params(url);
|
||||
|
||||
// Treat extension-initiated navigations as renderer-initiated so that the URL
|
||||
// does not show in the omnibox until it commits. This avoids URL spoofs
|
||||
// since URLs can be opened on behalf of untrusted content.
|
||||
load_params.is_renderer_initiated = true;
|
||||
// All renderer-initiated navigations need to have an initiator origin.
|
||||
load_params.initiator_origin = extension()->origin();
|
||||
// |source_site_instance| needs to be set so that a renderer process
|
||||
// compatible with |initiator_origin| is picked by Site Isolation.
|
||||
load_params.source_site_instance = content::SiteInstance::CreateForURL(
|
||||
web_contents_->GetBrowserContext(),
|
||||
load_params.initiator_origin->GetURL());
|
||||
|
||||
// Marking the navigation as initiated via an API means that the focus
|
||||
// will stay in the omnibox - see https://crbug.com/1085779.
|
||||
load_params.transition_type = ui::PAGE_TRANSITION_FROM_API;
|
||||
|
||||
web_contents_->GetController().LoadURLWithParams(load_params);
|
||||
|
||||
DCHECK_EQ(url,
|
||||
web_contents_->GetController().GetPendingEntry()->GetVirtualURL());
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
ExtensionFunction::ResponseValue TabsUpdateFunction::GetResult() {
|
||||
if (!has_callback())
|
||||
return NoArguments();
|
||||
|
||||
return ArgumentList(tabs::Get::Results::Create(*cef_details_.CreateTabObject(
|
||||
AlloyBrowserHostImpl::GetBrowserForContents(web_contents_),
|
||||
/*opener_browser_id=*/-1, /*active=*/true, tab_id_)));
|
||||
}
|
||||
|
||||
ExecuteCodeInTabFunction::ExecuteCodeInTabFunction()
|
||||
: cef_details_(this), execute_tab_id_(-1) {}
|
||||
|
||||
@@ -246,18 +393,6 @@ bool TabsRemoveCSSFunction::ShouldRemoveCSS() const {
|
||||
return true;
|
||||
}
|
||||
|
||||
ZoomAPIFunction::ZoomAPIFunction() : cef_details_(this) {}
|
||||
|
||||
content::WebContents* ZoomAPIFunction::GetWebContents(int tab_id) {
|
||||
// Find a browser that we can access, or set |error_| and return nullptr.
|
||||
CefRefPtr<AlloyBrowserHostImpl> browser =
|
||||
cef_details_.GetBrowserForTabIdFirstTime(tab_id, &error_);
|
||||
if (!browser)
|
||||
return nullptr;
|
||||
|
||||
return browser->web_contents();
|
||||
}
|
||||
|
||||
ExtensionFunction::ResponseAction TabsSetZoomFunction::Run() {
|
||||
std::unique_ptr<tabs::SetZoom::Params> params(
|
||||
tabs::SetZoom::Params::Create(*args_));
|
||||
|
@@ -42,6 +42,37 @@ class TabsCreateFunction : public ExtensionFunction {
|
||||
const CefExtensionFunctionDetails cef_details_;
|
||||
};
|
||||
|
||||
class BaseAPIFunction : public ExtensionFunction {
|
||||
public:
|
||||
BaseAPIFunction();
|
||||
|
||||
protected:
|
||||
~BaseAPIFunction() override {}
|
||||
|
||||
// Gets the WebContents for |tab_id| if it is specified. Otherwise get the
|
||||
// WebContents for the active tab in the current window. Calling this function
|
||||
// may set |error_|.
|
||||
content::WebContents* GetWebContents(int tab_id);
|
||||
|
||||
std::string error_;
|
||||
const CefExtensionFunctionDetails cef_details_;
|
||||
};
|
||||
|
||||
class TabsUpdateFunction : public BaseAPIFunction {
|
||||
private:
|
||||
~TabsUpdateFunction() override {}
|
||||
|
||||
ResponseAction Run() override;
|
||||
|
||||
bool UpdateURL(const std::string& url, int tab_id, std::string* error);
|
||||
ResponseValue GetResult();
|
||||
|
||||
DECLARE_EXTENSION_FUNCTION("tabs.update", TABS_UPDATE)
|
||||
|
||||
int tab_id_ = -1;
|
||||
content::WebContents* web_contents_ = nullptr;
|
||||
};
|
||||
|
||||
// Implement API calls tabs.executeScript, tabs.insertCSS, and tabs.removeCSS.
|
||||
class ExecuteCodeInTabFunction : public ExecuteCodeFunction {
|
||||
public:
|
||||
@@ -114,7 +145,7 @@ class ZoomAPIFunction : public ExtensionFunction {
|
||||
const CefExtensionFunctionDetails cef_details_;
|
||||
};
|
||||
|
||||
class TabsSetZoomFunction : public ZoomAPIFunction {
|
||||
class TabsSetZoomFunction : public BaseAPIFunction {
|
||||
private:
|
||||
~TabsSetZoomFunction() override {}
|
||||
|
||||
@@ -123,7 +154,7 @@ class TabsSetZoomFunction : public ZoomAPIFunction {
|
||||
DECLARE_EXTENSION_FUNCTION("tabs.setZoom", TABS_SETZOOM)
|
||||
};
|
||||
|
||||
class TabsGetZoomFunction : public ZoomAPIFunction {
|
||||
class TabsGetZoomFunction : public BaseAPIFunction {
|
||||
private:
|
||||
~TabsGetZoomFunction() override {}
|
||||
|
||||
@@ -132,7 +163,7 @@ class TabsGetZoomFunction : public ZoomAPIFunction {
|
||||
DECLARE_EXTENSION_FUNCTION("tabs.getZoom", TABS_GETZOOM)
|
||||
};
|
||||
|
||||
class TabsSetZoomSettingsFunction : public ZoomAPIFunction {
|
||||
class TabsSetZoomSettingsFunction : public BaseAPIFunction {
|
||||
private:
|
||||
~TabsSetZoomSettingsFunction() override {}
|
||||
|
||||
@@ -141,7 +172,7 @@ class TabsSetZoomSettingsFunction : public ZoomAPIFunction {
|
||||
DECLARE_EXTENSION_FUNCTION("tabs.setZoomSettings", TABS_SETZOOMSETTINGS)
|
||||
};
|
||||
|
||||
class TabsGetZoomSettingsFunction : public ZoomAPIFunction {
|
||||
class TabsGetZoomSettingsFunction : public BaseAPIFunction {
|
||||
private:
|
||||
~TabsGetZoomSettingsFunction() override {}
|
||||
|
||||
|
@@ -51,6 +51,7 @@ const char* const kSupportedAPIs[] = {
|
||||
"tabs",
|
||||
EXTENSION_FUNCTION_NAME(cefimpl::TabsGetFunction),
|
||||
EXTENSION_FUNCTION_NAME(cefimpl::TabsCreateFunction),
|
||||
EXTENSION_FUNCTION_NAME(cefimpl::TabsUpdateFunction),
|
||||
EXTENSION_FUNCTION_NAME(cefimpl::TabsExecuteScriptFunction),
|
||||
EXTENSION_FUNCTION_NAME(cefimpl::TabsInsertCSSFunction),
|
||||
EXTENSION_FUNCTION_NAME(cefimpl::TabsRemoveCSSFunction),
|
||||
@@ -95,6 +96,7 @@ void ChromeFunctionRegistry::RegisterAll(ExtensionFunctionRegistry* registry) {
|
||||
registry->RegisterFunction<cefimpl::TabsRemoveCSSFunction>();
|
||||
registry->RegisterFunction<cefimpl::TabsGetFunction>();
|
||||
registry->RegisterFunction<cefimpl::TabsCreateFunction>();
|
||||
registry->RegisterFunction<cefimpl::TabsUpdateFunction>();
|
||||
registry->RegisterFunction<cefimpl::TabsSetZoomFunction>();
|
||||
registry->RegisterFunction<cefimpl::TabsGetZoomFunction>();
|
||||
registry->RegisterFunction<cefimpl::TabsSetZoomSettingsFunction>();
|
||||
|
@@ -318,24 +318,12 @@ base::DictionaryValue* CefExtensionFunctionDetails::OpenTab(
|
||||
GURL url;
|
||||
if (params.url.get()) {
|
||||
std::string url_string = *params.url;
|
||||
url = ExtensionTabUtil::ResolvePossiblyRelativeURL(url_string,
|
||||
function()->extension());
|
||||
if (!url.is_valid()) {
|
||||
if (error_message) {
|
||||
*error_message =
|
||||
ErrorUtils::FormatErrorMessage(keys::kInvalidUrlError, url_string);
|
||||
}
|
||||
if (!ExtensionTabUtil::PrepareURLForNavigation(
|
||||
url_string, function()->extension(), &url, error_message)) {
|
||||
return nullptr;
|
||||
}
|
||||
}
|
||||
|
||||
// Don't let extensions crash the browser or renderers.
|
||||
if (ExtensionTabUtil::IsKillURL(url)) {
|
||||
if (error_message)
|
||||
*error_message = keys::kNoCrashBrowserError;
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
// Default to foreground for the new tab. The presence of 'active' property
|
||||
// will override this default.
|
||||
bool active = true;
|
||||
|
@@ -427,18 +427,22 @@ content::RenderFrameHost* CefFrameHostImpl::GetRenderFrameHost() const {
|
||||
return render_frame_host_;
|
||||
}
|
||||
|
||||
void CefFrameHostImpl::Detach() {
|
||||
bool CefFrameHostImpl::Detach() {
|
||||
CEF_REQUIRE_UIT();
|
||||
|
||||
// May be called multiple times (e.g. from CefBrowserInfo SetMainFrame and
|
||||
// RemoveFrame).
|
||||
bool first_detach = false;
|
||||
|
||||
// Should not be called for temporary frames.
|
||||
DCHECK(!is_temporary());
|
||||
|
||||
{
|
||||
base::AutoLock lock_scope(state_lock_);
|
||||
|
||||
// Should be called only once.
|
||||
DCHECK(browser_info_);
|
||||
browser_info_ = nullptr;
|
||||
if (browser_info_) {
|
||||
first_detach = true;
|
||||
browser_info_ = nullptr;
|
||||
}
|
||||
}
|
||||
|
||||
// In case we never attached, clean up.
|
||||
@@ -449,6 +453,8 @@ void CefFrameHostImpl::Detach() {
|
||||
render_frame_.reset();
|
||||
render_frame_host_ = nullptr;
|
||||
is_attached_ = false;
|
||||
|
||||
return first_detach;
|
||||
}
|
||||
|
||||
// static
|
||||
|
@@ -115,8 +115,9 @@ class CefFrameHostImpl : public CefFrame, public cef::mojom::BrowserFrame {
|
||||
|
||||
// Owned frame objects will be detached explicitly when the associated
|
||||
// RenderFrame is deleted. Temporary frame objects will be detached
|
||||
// implicitly via CefBrowserInfo::browser() returning nullptr.
|
||||
void Detach();
|
||||
// implicitly via CefBrowserInfo::browser() returning nullptr. Returns true
|
||||
// if this was the first call to Detach() for the frame.
|
||||
bool Detach();
|
||||
|
||||
// cef::mojom::BrowserFrame methods forwarded from CefBrowserFrame.
|
||||
void SendMessage(const std::string& name, base::Value arguments) override;
|
||||
|
@@ -8,10 +8,12 @@
|
||||
#include "libcef/browser/context.h"
|
||||
#include "libcef/browser/origin_whitelist_impl.h"
|
||||
#include "libcef/browser/thread_util.h"
|
||||
#include "libcef/common/cef_switches.h"
|
||||
#include "libcef/common/net/scheme_registration.h"
|
||||
#include "libcef/common/net_service/net_service_util.h"
|
||||
|
||||
#include "base/barrier_closure.h"
|
||||
#include "base/command_line.h"
|
||||
#include "base/strings/string_number_conversions.h"
|
||||
#include "components/safe_browsing/core/common/safebrowsing_constants.h"
|
||||
#include "content/public/browser/browser_context.h"
|
||||
@@ -52,6 +54,14 @@ void CreateProxyHelper(
|
||||
std::move(request_handler));
|
||||
}
|
||||
|
||||
bool DisableRequestHandlingForTesting() {
|
||||
static bool disabled([]() -> bool {
|
||||
return base::CommandLine::ForCurrentProcess()->HasSwitch(
|
||||
switches::kDisableRequestHandlingForTesting);
|
||||
}());
|
||||
return disabled;
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
// Owns all of the ProxyURLLoaderFactorys for a given BrowserContext. Since
|
||||
@@ -1302,8 +1312,7 @@ void ProxyURLLoaderFactory::CreateLoaderAndStart(
|
||||
return;
|
||||
}
|
||||
|
||||
bool pass_through = false;
|
||||
if (pass_through) {
|
||||
if (DisableRequestHandlingForTesting()) {
|
||||
// This is the so-called pass-through, no-op option.
|
||||
if (target_factory_) {
|
||||
target_factory_->CreateLoaderAndStart(std::move(receiver), request_id,
|
||||
|
@@ -182,6 +182,7 @@ class CaptionlessFrameView : public views::NonClientFrameView {
|
||||
|
||||
void Layout() override {
|
||||
client_view_bounds_.SetRect(0, 0, width(), height());
|
||||
views::NonClientFrameView::Layout();
|
||||
}
|
||||
|
||||
gfx::Size CalculatePreferredSize() const override {
|
||||
|
@@ -129,6 +129,11 @@ const char kDisableChromeLoginPrompt[] = "disable-chrome-login-prompt";
|
||||
// Override the product component of the default User-Agent string.
|
||||
const char kUserAgentProductAndVersion[] = "user-agent-product";
|
||||
|
||||
// Disable request handling in CEF to faciliate debugging of network-related
|
||||
// issues.
|
||||
const char kDisableRequestHandlingForTesting[] =
|
||||
"disable-request-handling-for-testing";
|
||||
|
||||
#if defined(OS_MAC)
|
||||
// Path to the framework directory.
|
||||
const char kFrameworkDirPath[] = "framework-dir-path";
|
||||
|
@@ -56,6 +56,7 @@ extern const char kDevToolsProtocolLogFile[];
|
||||
extern const char kEnableChromeRuntime[];
|
||||
extern const char kDisableChromeLoginPrompt[];
|
||||
extern const char kUserAgentProductAndVersion[];
|
||||
extern const char kDisableRequestHandlingForTesting[];
|
||||
|
||||
#if defined(OS_MAC)
|
||||
extern const char kFrameworkDirPath[];
|
||||
|
@@ -6,6 +6,23 @@
|
||||
|
||||
#include "base/macros.h"
|
||||
|
||||
#if defined(OS_WIN)
|
||||
#include <limits>
|
||||
|
||||
namespace {
|
||||
|
||||
// From MSDN, FILETIME "Contains a 64-bit value representing the number of
|
||||
// 100-nanosecond intervals since January 1, 1601 (UTC)." This value must
|
||||
// be less than 0x8000000000000000. Otherwise, the function
|
||||
// FileTimeToSystemTime fails.
|
||||
// From base/time/time_win.cc:
|
||||
bool CanConvertToFileTime(int64_t us) {
|
||||
return us >= 0 && us <= (std::numeric_limits<int64_t>::max() / 10);
|
||||
}
|
||||
|
||||
} // namespace
|
||||
#endif // defined(OS_WIN)
|
||||
|
||||
void cef_time_to_basetime(const cef_time_t& cef_time, base::Time& time) {
|
||||
base::Time::Exploded exploded;
|
||||
exploded.year = cef_time.year;
|
||||
@@ -22,11 +39,7 @@ void cef_time_to_basetime(const cef_time_t& cef_time, base::Time& time) {
|
||||
void cef_time_from_basetime(const base::Time& time, cef_time_t& cef_time) {
|
||||
#if defined(OS_WIN)
|
||||
int64_t t = time.ToDeltaSinceWindowsEpoch().InMicroseconds();
|
||||
// From MSDN, FILETIME "Contains a 64-bit value representing the number of
|
||||
// 100-nanosecond intervals since January 1, 1601 (UTC)." This value must
|
||||
// be less than 0x8000000000000000. Otherwise, the function
|
||||
// FileTimeToSystemTime fails.
|
||||
if (t < 0 || static_cast<uint64_t>(t * 10) >= 0x8000000000000000)
|
||||
if (!CanConvertToFileTime(t))
|
||||
return;
|
||||
#endif
|
||||
|
||||
|
@@ -51,7 +51,9 @@ const char kWidevineCdmArch[] =
|
||||
"ia32"; // This differs from the component updater which uses "x86".
|
||||
#elif defined(ARCH_CPU_X86_64)
|
||||
"x64";
|
||||
#else // TODO(viettrungluu): Support an ARM check?
|
||||
#elif defined(ARCH_CPU_ARM64)
|
||||
"arm64";
|
||||
#else
|
||||
"???";
|
||||
#endif
|
||||
|
||||
@@ -90,7 +92,7 @@ const char kCdmSupportedEncryptionSchemesName[] =
|
||||
// The following strings are used to specify supported codecs in the
|
||||
// parameter |kCdmCodecsListName|.
|
||||
const char kCdmSupportedCodecVp8[] = "vp8";
|
||||
const char kCdmSupportedCodecVp9[] = "vp9.0";
|
||||
const char kCdmSupportedCodecVp9[] = "vp09";
|
||||
#if BUILDFLAG(USE_PROPRIETARY_CODECS)
|
||||
const char kCdmSupportedCodecAvc1[] = "avc1";
|
||||
#endif
|
||||
|
@@ -126,20 +126,20 @@ void CefRenderFrameObserver::DidCreateScriptContext(
|
||||
CefRefPtr<CefApp> application = CefAppManager::Get()->GetApplication();
|
||||
if (application)
|
||||
handler = application->GetRenderProcessHandler();
|
||||
if (!handler)
|
||||
return;
|
||||
|
||||
CefRefPtr<CefFrameImpl> framePtr = browserPtr->GetWebFrameImpl(frame);
|
||||
|
||||
v8::Isolate* isolate = blink::MainThreadIsolate();
|
||||
v8::HandleScope handle_scope(isolate);
|
||||
v8::Context::Scope scope(context);
|
||||
v8::MicrotasksScope microtasks_scope(isolate,
|
||||
v8::MicrotasksScope::kRunMicrotasks);
|
||||
if (handler) {
|
||||
v8::Isolate* isolate = blink::MainThreadIsolate();
|
||||
v8::HandleScope handle_scope(isolate);
|
||||
v8::Context::Scope scope(context);
|
||||
v8::MicrotasksScope microtasks_scope(isolate,
|
||||
v8::MicrotasksScope::kRunMicrotasks);
|
||||
|
||||
CefRefPtr<CefV8Context> contextPtr(new CefV8ContextImpl(isolate, context));
|
||||
CefRefPtr<CefV8Context> contextPtr(new CefV8ContextImpl(isolate, context));
|
||||
|
||||
handler->OnContextCreated(browserPtr.get(), framePtr.get(), contextPtr);
|
||||
handler->OnContextCreated(browserPtr.get(), framePtr.get(), contextPtr);
|
||||
}
|
||||
|
||||
// Do this last, in case the client callback modified the window object.
|
||||
framePtr->OnContextCreated();
|
||||
|
@@ -41,13 +41,24 @@ void cef_sandbox_info_destroy(void* sandbox_info) {
|
||||
}
|
||||
|
||||
#if BUILDFLAG(IS_CEF_SANDBOX_BUILD)
|
||||
// Implementation from third_party/abseil-cpp/absl/types/bad_variant_access.cc
|
||||
// to avoid bringing in absl dependencies.
|
||||
// Avoid bringing in absl dependencies.
|
||||
namespace absl {
|
||||
|
||||
// From third_party/abseil-cpp/absl/types/bad_optional_access.cc
|
||||
namespace optional_internal {
|
||||
void throw_bad_optional_access() {
|
||||
LOG(FATAL) << "Bad optional access";
|
||||
abort();
|
||||
}
|
||||
} // namespace optional_internal
|
||||
|
||||
// From third_party/abseil-cpp/absl/types/bad_variant_access.cc
|
||||
namespace variant_internal {
|
||||
void ThrowBadVariantAccess() {
|
||||
LOG(FATAL) << "Bad variant access";
|
||||
abort();
|
||||
}
|
||||
} // namespace variant_internal
|
||||
|
||||
} // namespace absl
|
||||
#endif // BUILDFLAG(IS_CEF_SANDBOX_BUILD)
|
||||
|
@@ -70,6 +70,10 @@ patches = [
|
||||
# https://bitbucket.org/chromiumembedded/cef/issues/2345
|
||||
'name': 'webkit_popups_and_background',
|
||||
},
|
||||
{
|
||||
# Fix assertion when client handles HTTPS URL without certificate.
|
||||
'name': 'blink_web_url_loader',
|
||||
},
|
||||
{
|
||||
# Give AlloyContentRendererClient access to protected
|
||||
# RuntimeEnabledFeatures methods.
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git base/BUILD.gn base/BUILD.gn
|
||||
index 6f993be10f692..bce42da34941f 100644
|
||||
index 6f993be10f69..bce42da34941 100644
|
||||
--- base/BUILD.gn
|
||||
+++ base/BUILD.gn
|
||||
@@ -34,6 +34,7 @@ import("//build/config/ui.gni")
|
||||
@@ -37,7 +37,7 @@ index 6f993be10f692..bce42da34941f 100644
|
||||
configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
|
||||
|
||||
diff --git base/hash/md5.h base/hash/md5.h
|
||||
index 8a49f08dcb04d..2f03d7a6d1b34 100644
|
||||
index 8a49f08dcb04..2f03d7a6d1b3 100644
|
||||
--- base/hash/md5.h
|
||||
+++ base/hash/md5.h
|
||||
@@ -10,8 +10,9 @@
|
||||
@@ -52,7 +52,7 @@ index 8a49f08dcb04d..2f03d7a6d1b34 100644
|
||||
#else
|
||||
#include "base/hash/md5_boringssl.h"
|
||||
diff --git base/hash/sha1.h base/hash/sha1.h
|
||||
index 5bb10fe069850..206344d0fd3b1 100644
|
||||
index 5bb10fe06985..206344d0fd3b 100644
|
||||
--- base/hash/sha1.h
|
||||
+++ base/hash/sha1.h
|
||||
@@ -14,7 +14,9 @@
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git base/strings/string_piece.h base/strings/string_piece.h
|
||||
index 85a63d103a7f7..c17412d9c191a 100644
|
||||
index 85a63d103a7f..c17412d9c191 100644
|
||||
--- base/strings/string_piece.h
|
||||
+++ base/strings/string_piece.h
|
||||
@@ -23,6 +23,7 @@
|
||||
|
12
patch/patches/blink_web_url_loader.patch
Normal file
12
patch/patches/blink_web_url_loader.patch
Normal file
@@ -0,0 +1,12 @@
|
||||
diff --git third_party/blink/renderer/platform/loader/fetch/url_loader/web_url_loader.cc third_party/blink/renderer/platform/loader/fetch/url_loader/web_url_loader.cc
|
||||
index c346490cdf4f..fff11e84cce5 100644
|
||||
--- third_party/blink/renderer/platform/loader/fetch/url_loader/web_url_loader.cc
|
||||
+++ third_party/blink/renderer/platform/loader/fetch/url_loader/web_url_loader.cc
|
||||
@@ -250,7 +250,6 @@ void SetSecurityStyleAndDetails(const GURL& url,
|
||||
sct_list[i] = NetSCTToBlinkSCT(ssl_info.signed_certificate_timestamps[i]);
|
||||
|
||||
if (!ssl_info.cert) {
|
||||
- NOTREACHED();
|
||||
response->SetSecurityStyle(SecurityStyle::kUnknown);
|
||||
return;
|
||||
}
|
@@ -1,8 +1,8 @@
|
||||
diff --git content/browser/scheduler/browser_task_executor.cc content/browser/scheduler/browser_task_executor.cc
|
||||
index cf85dd542a27a..d663df4fa92af 100644
|
||||
index 996d88ddbcc2..6125045c5003 100644
|
||||
--- content/browser/scheduler/browser_task_executor.cc
|
||||
+++ content/browser/scheduler/browser_task_executor.cc
|
||||
@@ -240,7 +240,7 @@ void BrowserTaskExecutor::PostFeatureListSetup() {
|
||||
@@ -250,7 +250,7 @@ BrowserTaskExecutor::OnUserInputStart() {
|
||||
|
||||
// static
|
||||
void BrowserTaskExecutor::Shutdown() {
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git content/browser/child_process_security_policy_impl.cc content/browser/child_process_security_policy_impl.cc
|
||||
index d548b3d7e0a0a..cb93301271cda 100644
|
||||
index d548b3d7e0a0..cb93301271cd 100644
|
||||
--- content/browser/child_process_security_policy_impl.cc
|
||||
+++ content/browser/child_process_security_policy_impl.cc
|
||||
@@ -1719,6 +1719,16 @@ bool ChildProcessSecurityPolicyImpl::CanAccessDataForOrigin(
|
||||
@@ -20,7 +20,7 @@ index d548b3d7e0a0a..cb93301271cda 100644
|
||||
|
||||
// TODO(wjmaclean): We should update the ProcessLock comparison API
|
||||
diff --git content/browser/renderer_host/navigation_request.cc content/browser/renderer_host/navigation_request.cc
|
||||
index 751ee13227ae6..d4676b47955f8 100644
|
||||
index 7963b39ec4e7..39e3c664f127 100644
|
||||
--- content/browser/renderer_host/navigation_request.cc
|
||||
+++ content/browser/renderer_host/navigation_request.cc
|
||||
@@ -5314,6 +5314,12 @@ url::Origin NavigationRequest::GetOriginForURLLoaderFactory() {
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git build/config/compiler/BUILD.gn build/config/compiler/BUILD.gn
|
||||
index 96545ed8a9e5b..6987659bff52b 100644
|
||||
index 96545ed8a9e5..6987659bff52 100644
|
||||
--- build/config/compiler/BUILD.gn
|
||||
+++ build/config/compiler/BUILD.gn
|
||||
@@ -1849,8 +1849,6 @@ config("thin_archive") {
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
|
||||
index e0409fb795f27..8a3023ae62e82 100644
|
||||
index b9ccfc0cb1cd..d89deb893e27 100644
|
||||
--- chrome/browser/BUILD.gn
|
||||
+++ chrome/browser/BUILD.gn
|
||||
@@ -13,6 +13,7 @@ import("//build/config/features.gni")
|
||||
@@ -10,7 +10,7 @@ index e0409fb795f27..8a3023ae62e82 100644
|
||||
import("//chrome/browser/buildflags.gni")
|
||||
import("//chrome/browser/downgrade/buildflags.gni")
|
||||
import("//chrome/common/features.gni")
|
||||
@@ -1923,6 +1924,7 @@ static_library("browser") {
|
||||
@@ -1927,6 +1928,7 @@ static_library("browser") {
|
||||
"//build:chromeos_buildflags",
|
||||
"//build/config/compiler:compiler_buildflags",
|
||||
"//cc",
|
||||
@@ -18,7 +18,7 @@ index e0409fb795f27..8a3023ae62e82 100644
|
||||
"//chrome:extra_resources",
|
||||
"//chrome:resources",
|
||||
"//chrome:strings",
|
||||
@@ -2480,6 +2482,10 @@ static_library("browser") {
|
||||
@@ -2485,6 +2487,10 @@ static_library("browser") {
|
||||
]
|
||||
}
|
||||
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git chrome/browser/app_controller_mac.mm chrome/browser/app_controller_mac.mm
|
||||
index c7780ede01c83..6b856949d3c0a 100644
|
||||
index 71dce6d8be27..8349c3f0de41 100644
|
||||
--- chrome/browser/app_controller_mac.mm
|
||||
+++ chrome/browser/app_controller_mac.mm
|
||||
@@ -31,6 +31,7 @@
|
||||
@@ -10,7 +10,7 @@ index c7780ede01c83..6b856949d3c0a 100644
|
||||
#include "chrome/app/chrome_command_ids.h"
|
||||
#include "chrome/browser/apps/app_shim/app_shim_manager_mac.h"
|
||||
#include "chrome/browser/apps/app_shim/app_shim_termination_manager.h"
|
||||
@@ -1290,6 +1291,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
|
||||
@@ -1336,6 +1337,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
|
||||
|
||||
// Run a (background) application in a new tab.
|
||||
- (void)executeApplication:(id)sender {
|
||||
@@ -18,7 +18,7 @@ index c7780ede01c83..6b856949d3c0a 100644
|
||||
NSInteger tag = [sender tag];
|
||||
Profile* profile = [self lastProfile];
|
||||
DCHECK(profile);
|
||||
@@ -1298,6 +1300,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
|
||||
@@ -1344,6 +1346,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
|
||||
tag < static_cast<int>(applications.size()));
|
||||
const extensions::Extension* extension = applications.GetExtension(tag);
|
||||
BackgroundModeManager::LaunchBackgroundApplication(profile, extension);
|
||||
@@ -26,7 +26,7 @@ index c7780ede01c83..6b856949d3c0a 100644
|
||||
}
|
||||
|
||||
// Same as |-commandDispatch:|, but executes commands using a disposition
|
||||
@@ -1693,6 +1696,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
|
||||
@@ -1739,6 +1742,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
|
||||
// TODO(rickcam): Mock out BackgroundApplicationListModel, then add unit
|
||||
// tests which use the mock in place of the profile-initialized model.
|
||||
|
||||
@@ -34,7 +34,7 @@ index c7780ede01c83..6b856949d3c0a 100644
|
||||
// Avoid breaking unit tests which have no profile.
|
||||
if (profile) {
|
||||
BackgroundApplicationListModel applications(profile);
|
||||
@@ -1719,6 +1723,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
|
||||
@@ -1765,6 +1769,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -42,7 +42,7 @@ index c7780ede01c83..6b856949d3c0a 100644
|
||||
|
||||
return dockMenu;
|
||||
}
|
||||
@@ -1948,11 +1953,13 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
|
||||
@@ -1994,11 +1999,13 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
|
||||
namespace {
|
||||
|
||||
void UpdateProfileInUse(Profile* profile, Profile::CreateStatus status) {
|
||||
@@ -57,7 +57,7 @@ index c7780ede01c83..6b856949d3c0a 100644
|
||||
|
||||
} // namespace
|
||||
diff --git chrome/browser/browser_process.h chrome/browser/browser_process.h
|
||||
index 3d634db18900a..96e44ad48e5e5 100644
|
||||
index 3d634db18900..96e44ad48e5e 100644
|
||||
--- chrome/browser/browser_process.h
|
||||
+++ chrome/browser/browser_process.h
|
||||
@@ -197,9 +197,9 @@ class BrowserProcess {
|
||||
@@ -72,10 +72,10 @@ index 3d634db18900a..96e44ad48e5e5 100644
|
||||
std::unique_ptr<BackgroundModeManager> manager) = 0;
|
||||
#endif
|
||||
diff --git chrome/browser/browser_process_impl.cc chrome/browser/browser_process_impl.cc
|
||||
index cce917cdc65db..5da3a16aef1c7 100644
|
||||
index a7eb216d72f4..bf5647b4514f 100644
|
||||
--- chrome/browser/browser_process_impl.cc
|
||||
+++ chrome/browser/browser_process_impl.cc
|
||||
@@ -952,18 +952,14 @@ DownloadRequestLimiter* BrowserProcessImpl::download_request_limiter() {
|
||||
@@ -946,18 +946,14 @@ DownloadRequestLimiter* BrowserProcessImpl::download_request_limiter() {
|
||||
return download_request_limiter_.get();
|
||||
}
|
||||
|
||||
@@ -96,7 +96,7 @@ index cce917cdc65db..5da3a16aef1c7 100644
|
||||
std::unique_ptr<BackgroundModeManager> manager) {
|
||||
background_mode_manager_ = std::move(manager);
|
||||
diff --git chrome/browser/browser_process_impl.h chrome/browser/browser_process_impl.h
|
||||
index b4ceefbccd083..7d60206c83b13 100644
|
||||
index b4ceefbccd08..7d60206c83b1 100644
|
||||
--- chrome/browser/browser_process_impl.h
|
||||
+++ chrome/browser/browser_process_impl.h
|
||||
@@ -169,8 +169,8 @@ class BrowserProcessImpl : public BrowserProcess,
|
||||
@@ -110,7 +110,7 @@ index b4ceefbccd083..7d60206c83b13 100644
|
||||
std::unique_ptr<BackgroundModeManager> manager) override;
|
||||
#endif
|
||||
diff --git chrome/browser/lifetime/browser_close_manager.cc chrome/browser/lifetime/browser_close_manager.cc
|
||||
index e0cafee5eedd6..06ded156be3cc 100644
|
||||
index e0cafee5eedd..06ded156be3c 100644
|
||||
--- chrome/browser/lifetime/browser_close_manager.cc
|
||||
+++ chrome/browser/lifetime/browser_close_manager.cc
|
||||
@@ -148,12 +148,14 @@ void BrowserCloseManager::CloseBrowsers() {
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git chrome/browser/browser_about_handler.cc chrome/browser/browser_about_handler.cc
|
||||
index ba0c5c3fc0446..b4df9af95ecd1 100644
|
||||
index ba0c5c3fc044..b4df9af95ecd 100644
|
||||
--- chrome/browser/browser_about_handler.cc
|
||||
+++ chrome/browser/browser_about_handler.cc
|
||||
@@ -70,6 +70,9 @@ bool HandleNonNavigationAboutURL(const GURL& url) {
|
||||
@@ -13,7 +13,7 @@ index ba0c5c3fc0446..b4df9af95ecd1 100644
|
||||
return false;
|
||||
}
|
||||
diff --git chrome/browser/ui/browser.cc chrome/browser/ui/browser.cc
|
||||
index 268f6547ff84b..29e1b4b1b4dba 100644
|
||||
index 268f6547ff84..29e1b4b1b4db 100644
|
||||
--- chrome/browser/ui/browser.cc
|
||||
+++ chrome/browser/ui/browser.cc
|
||||
@@ -263,6 +263,20 @@
|
||||
@@ -200,7 +200,7 @@ index 268f6547ff84b..29e1b4b1b4dba 100644
|
||||
|
||||
void Browser::TabDetachedAtImpl(content::WebContents* contents,
|
||||
diff --git chrome/browser/ui/browser.h chrome/browser/ui/browser.h
|
||||
index 946c447afbde1..cce4aaade2ea3 100644
|
||||
index 946c447afbde..cce4aaade2ea 100644
|
||||
--- chrome/browser/ui/browser.h
|
||||
+++ chrome/browser/ui/browser.h
|
||||
@@ -21,6 +21,7 @@
|
||||
@@ -294,7 +294,7 @@ index 946c447afbde1..cce4aaade2ea3 100644
|
||||
|
||||
// The following factory is used for chrome update coalescing.
|
||||
diff --git chrome/browser/ui/browser_navigator.cc chrome/browser/ui/browser_navigator.cc
|
||||
index 29890d8b342a4..514affa254df4 100644
|
||||
index 29890d8b342a..514affa254df 100644
|
||||
--- chrome/browser/ui/browser_navigator.cc
|
||||
+++ chrome/browser/ui/browser_navigator.cc
|
||||
@@ -456,6 +456,13 @@ std::unique_ptr<content::WebContents> CreateTargetContents(
|
||||
@@ -312,7 +312,7 @@ index 29890d8b342a4..514affa254df4 100644
|
||||
// tab helpers, so the entire set of tab helpers needs to be set up
|
||||
// immediately.
|
||||
diff --git chrome/browser/ui/browser_tabstrip.cc chrome/browser/ui/browser_tabstrip.cc
|
||||
index 72ad734682957..668a1b950df6b 100644
|
||||
index 72ad73468295..668a1b950df6 100644
|
||||
--- chrome/browser/ui/browser_tabstrip.cc
|
||||
+++ chrome/browser/ui/browser_tabstrip.cc
|
||||
@@ -30,9 +30,13 @@ void AddTabAt(Browser* browser,
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git chrome/browser/content_settings/host_content_settings_map_factory.cc chrome/browser/content_settings/host_content_settings_map_factory.cc
|
||||
index 173582c7c4904..bbf57904b6de9 100644
|
||||
index 173582c7c490..bbf57904b6de 100644
|
||||
--- chrome/browser/content_settings/host_content_settings_map_factory.cc
|
||||
+++ chrome/browser/content_settings/host_content_settings_map_factory.cc
|
||||
@@ -8,6 +8,7 @@
|
||||
@@ -54,7 +54,7 @@ index 173582c7c4904..bbf57904b6de9 100644
|
||||
#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
|
||||
SupervisedUserSettingsService* supervised_service =
|
||||
diff --git components/content_settings/renderer/content_settings_agent_impl.cc components/content_settings/renderer/content_settings_agent_impl.cc
|
||||
index ab24e00ee02aa..818fb4e7d1841 100644
|
||||
index 3ef8da910ced..03d8cdb6a137 100644
|
||||
--- components/content_settings/renderer/content_settings_agent_impl.cc
|
||||
+++ components/content_settings/renderer/content_settings_agent_impl.cc
|
||||
@@ -172,7 +172,7 @@ ContentSetting GetContentSettingFromRulesImpl(
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git chrome/browser/renderer_context_menu/render_view_context_menu.cc chrome/browser/renderer_context_menu/render_view_context_menu.cc
|
||||
index 41b804eef6426..b1e54d8e95008 100644
|
||||
index b590b86c8d77..469c213ca4da 100644
|
||||
--- chrome/browser/renderer_context_menu/render_view_context_menu.cc
|
||||
+++ chrome/browser/renderer_context_menu/render_view_context_menu.cc
|
||||
@@ -264,6 +264,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
|
||||
@@ -42,7 +42,7 @@ index 41b804eef6426..b1e54d8e95008 100644
|
||||
}
|
||||
|
||||
RenderViewContextMenu::~RenderViewContextMenu() = default;
|
||||
@@ -983,6 +1002,12 @@ void RenderViewContextMenu::InitMenu() {
|
||||
@@ -984,6 +1003,12 @@ void RenderViewContextMenu::InitMenu() {
|
||||
// menu, meaning that each menu item added/removed in this function will cause
|
||||
// it to visibly jump on the screen (see b/173569669).
|
||||
AppendQuickAnswersItems();
|
||||
@@ -55,7 +55,7 @@ index 41b804eef6426..b1e54d8e95008 100644
|
||||
}
|
||||
|
||||
Profile* RenderViewContextMenu::GetProfile() const {
|
||||
@@ -2636,6 +2661,12 @@ void RenderViewContextMenu::RegisterMenuShownCallbackForTesting(
|
||||
@@ -2641,6 +2666,12 @@ void RenderViewContextMenu::RegisterMenuShownCallbackForTesting(
|
||||
*GetMenuShownCallback() = std::move(cb);
|
||||
}
|
||||
|
||||
@@ -69,10 +69,10 @@ index 41b804eef6426..b1e54d8e95008 100644
|
||||
RenderViewContextMenu::GetHandlersForLinkUrl() {
|
||||
ProtocolHandlerRegistry::ProtocolHandlerList handlers =
|
||||
diff --git chrome/browser/renderer_context_menu/render_view_context_menu.h chrome/browser/renderer_context_menu/render_view_context_menu.h
|
||||
index b6d55e7322c45..014d89c4c7bfe 100644
|
||||
index f4bc78469e2e..398d2194bf62 100644
|
||||
--- chrome/browser/renderer_context_menu/render_view_context_menu.h
|
||||
+++ chrome/browser/renderer_context_menu/render_view_context_menu.h
|
||||
@@ -92,6 +92,12 @@ class RenderViewContextMenu : public RenderViewContextMenuBase {
|
||||
@@ -95,6 +95,12 @@ class RenderViewContextMenu : public RenderViewContextMenuBase,
|
||||
static void RegisterMenuShownCallbackForTesting(
|
||||
base::OnceCallback<void(RenderViewContextMenu*)> cb);
|
||||
|
||||
@@ -85,9 +85,9 @@ index b6d55e7322c45..014d89c4c7bfe 100644
|
||||
protected:
|
||||
Profile* GetProfile() const;
|
||||
|
||||
@@ -266,6 +272,9 @@ class RenderViewContextMenu : public RenderViewContextMenuBase {
|
||||
ui::SimpleMenuModel protocol_handler_submenu_model_;
|
||||
ProtocolHandlerRegistry* protocol_handler_registry_;
|
||||
@@ -283,6 +289,9 @@ class RenderViewContextMenu : public RenderViewContextMenuBase,
|
||||
// built.
|
||||
bool is_protocol_submenu_valid_ = false;
|
||||
|
||||
+ // An observer returned via MenuCreatedCallback that will be called first.
|
||||
+ std::unique_ptr<RenderViewContextMenuObserver> first_observer_;
|
||||
@@ -96,7 +96,7 @@ index b6d55e7322c45..014d89c4c7bfe 100644
|
||||
// "Use enhanced spell check" items.
|
||||
std::unique_ptr<SpellingMenuObserver> spelling_suggestions_menu_observer_;
|
||||
diff --git chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc
|
||||
index 0271d19c5c33b..40d2063e4ed98 100644
|
||||
index 0271d19c5c33..40d2063e4ed9 100644
|
||||
--- chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc
|
||||
+++ chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc
|
||||
@@ -136,6 +136,9 @@ void RenderViewContextMenuViews::RunMenuAt(views::Widget* parent,
|
||||
@@ -110,7 +110,7 @@ index 0271d19c5c33b..40d2063e4ed98 100644
|
||||
// that Ctrl+C, Ctrl+V, Ctrl+X, Ctrl-A, etc do what they normally do.
|
||||
switch (command_id) {
|
||||
diff --git components/renderer_context_menu/render_view_context_menu_base.cc components/renderer_context_menu/render_view_context_menu_base.cc
|
||||
index 6585ac1d01907..d2e939fce0df6 100644
|
||||
index 6585ac1d0190..d2e939fce0df 100644
|
||||
--- components/renderer_context_menu/render_view_context_menu_base.cc
|
||||
+++ components/renderer_context_menu/render_view_context_menu_base.cc
|
||||
@@ -376,6 +376,17 @@ bool RenderViewContextMenuBase::IsCommandIdChecked(int id) const {
|
||||
@@ -132,7 +132,7 @@ index 6585ac1d01907..d2e939fce0df6 100644
|
||||
command_executed_ = true;
|
||||
RecordUsedItem(id);
|
||||
diff --git components/renderer_context_menu/render_view_context_menu_base.h components/renderer_context_menu/render_view_context_menu_base.h
|
||||
index 051953091fd4f..7e771526ce52a 100644
|
||||
index 051953091fd4..7e771526ce52 100644
|
||||
--- components/renderer_context_menu/render_view_context_menu_base.h
|
||||
+++ components/renderer_context_menu/render_view_context_menu_base.h
|
||||
@@ -82,6 +82,9 @@ class RenderViewContextMenuBase : public ui::SimpleMenuModel::Delegate,
|
||||
@@ -176,7 +176,7 @@ index 051953091fd4f..7e771526ce52a 100644
|
||||
bool IsCustomItemEnabled(int id) const;
|
||||
|
||||
diff --git components/renderer_context_menu/render_view_context_menu_observer.cc components/renderer_context_menu/render_view_context_menu_observer.cc
|
||||
index 2e2d05f91c646..85b256b2be9bd 100644
|
||||
index 2e2d05f91c64..85b256b2be9b 100644
|
||||
--- components/renderer_context_menu/render_view_context_menu_observer.cc
|
||||
+++ components/renderer_context_menu/render_view_context_menu_observer.cc
|
||||
@@ -15,3 +15,8 @@ bool RenderViewContextMenuObserver::IsCommandIdChecked(int command_id) {
|
||||
@@ -189,7 +189,7 @@ index 2e2d05f91c646..85b256b2be9bd 100644
|
||||
+ return false;
|
||||
+}
|
||||
diff --git components/renderer_context_menu/render_view_context_menu_observer.h components/renderer_context_menu/render_view_context_menu_observer.h
|
||||
index b360a8eb4e820..6f9023a629046 100644
|
||||
index b360a8eb4e82..6f9023a62904 100644
|
||||
--- components/renderer_context_menu/render_view_context_menu_observer.h
|
||||
+++ components/renderer_context_menu/render_view_context_menu_observer.h
|
||||
@@ -11,6 +11,10 @@ namespace content {
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
|
||||
index adadb4264e6b7..b7c910f035fe6 100644
|
||||
index 71810d671161..5bc6eaf53fa0 100644
|
||||
--- chrome/browser/ui/BUILD.gn
|
||||
+++ chrome/browser/ui/BUILD.gn
|
||||
@@ -12,6 +12,7 @@ import("//build/config/features.gni")
|
||||
@@ -29,7 +29,7 @@ index adadb4264e6b7..b7c910f035fe6 100644
|
||||
"//chrome:extra_resources",
|
||||
"//chrome:resources",
|
||||
"//chrome:strings",
|
||||
@@ -4774,6 +4780,7 @@ static_library("ui") {
|
||||
@@ -4782,6 +4788,7 @@ static_library("ui") {
|
||||
if (enable_basic_printing) {
|
||||
deps += [
|
||||
"//components/printing/browser",
|
||||
@@ -38,7 +38,7 @@ index adadb4264e6b7..b7c910f035fe6 100644
|
||||
]
|
||||
if (use_cups) {
|
||||
diff --git chrome/browser/ui/webui/net_export_ui.cc chrome/browser/ui/webui/net_export_ui.cc
|
||||
index fcd1f66b3a7a4..4f135460de918 100644
|
||||
index fcd1f66b3a7a..4f135460de91 100644
|
||||
--- chrome/browser/ui/webui/net_export_ui.cc
|
||||
+++ chrome/browser/ui/webui/net_export_ui.cc
|
||||
@@ -21,6 +21,7 @@
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git chrome/browser/profiles/profile_window.cc chrome/browser/profiles/profile_window.cc
|
||||
index e0010fdd55000..f89c622c6fd96 100644
|
||||
index e0010fdd5500..f89c622c6fd9 100644
|
||||
--- chrome/browser/profiles/profile_window.cc
|
||||
+++ chrome/browser/profiles/profile_window.cc
|
||||
@@ -273,7 +273,9 @@ void BubbleViewModeFromAvatarBubbleMode(BrowserWindow::AvatarBubbleMode mode,
|
||||
@@ -14,7 +14,7 @@ index e0010fdd55000..f89c622c6fd96 100644
|
||||
: profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER;
|
||||
}
|
||||
diff --git chrome/browser/ui/views/profiles/incognito_menu_view.cc chrome/browser/ui/views/profiles/incognito_menu_view.cc
|
||||
index ae41e1031c95e..16ee4f7766a78 100644
|
||||
index ae41e1031c95..16ee4f7766a7 100644
|
||||
--- chrome/browser/ui/views/profiles/incognito_menu_view.cc
|
||||
+++ chrome/browser/ui/views/profiles/incognito_menu_view.cc
|
||||
@@ -37,7 +37,9 @@
|
||||
@@ -29,7 +29,7 @@ index ae41e1031c95e..16ee4f7766a78 100644
|
||||
|
||||
chrome::RecordDialogCreation(
|
||||
diff --git chrome/browser/ui/views/profiles/profile_menu_view_base.cc chrome/browser/ui/views/profiles/profile_menu_view_base.cc
|
||||
index 905c775ba0471..b1cf9288f4975 100644
|
||||
index 905c775ba047..b1cf9288f497 100644
|
||||
--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc
|
||||
+++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc
|
||||
@@ -511,7 +511,9 @@ void ProfileMenuViewBase::ShowBubble(
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git chrome/browser/profiles/off_the_record_profile_impl.cc chrome/browser/profiles/off_the_record_profile_impl.cc
|
||||
index 0fbe58dcd4d28..57fab623ec276 100644
|
||||
index 0fbe58dcd4d2..57fab623ec27 100644
|
||||
--- chrome/browser/profiles/off_the_record_profile_impl.cc
|
||||
+++ chrome/browser/profiles/off_the_record_profile_impl.cc
|
||||
@@ -633,7 +633,9 @@ std::unique_ptr<Profile> Profile::CreateOffTheRecordProfile(
|
||||
@@ -14,7 +14,7 @@ index 0fbe58dcd4d28..57fab623ec276 100644
|
||||
}
|
||||
|
||||
diff --git chrome/browser/profiles/profile.cc chrome/browser/profiles/profile.cc
|
||||
index 7ee045c66e37b..65cb34a7a7e1c 100644
|
||||
index 7ee045c66e37..65cb34a7a7e1 100644
|
||||
--- chrome/browser/profiles/profile.cc
|
||||
+++ chrome/browser/profiles/profile.cc
|
||||
@@ -85,6 +85,7 @@ base::LazyInstance<std::set<content::BrowserContext*>>::Leaky
|
||||
@@ -52,7 +52,7 @@ index 7ee045c66e37b..65cb34a7a7e1c 100644
|
||||
Profile::OTRProfileID Profile::OTRProfileID::CreateUniqueForDevTools() {
|
||||
return CreateUnique(kDevToolsOTRProfileIDPrefix);
|
||||
diff --git chrome/browser/profiles/profile.h chrome/browser/profiles/profile.h
|
||||
index 92baa51c80944..9726edaea9c4d 100644
|
||||
index 92baa51c8094..9726edaea9c4 100644
|
||||
--- chrome/browser/profiles/profile.h
|
||||
+++ chrome/browser/profiles/profile.h
|
||||
@@ -119,6 +119,10 @@ class Profile : public content::BrowserContext {
|
||||
@@ -85,7 +85,7 @@ index 92baa51c80944..9726edaea9c4d 100644
|
||||
virtual bool IsSignedIn() = 0;
|
||||
|
||||
diff --git chrome/browser/profiles/profile_impl.cc chrome/browser/profiles/profile_impl.cc
|
||||
index 0f051ffa90eb2..7def9e1f948e3 100644
|
||||
index 0f051ffa90eb..7def9e1f948e 100644
|
||||
--- chrome/browser/profiles/profile_impl.cc
|
||||
+++ chrome/browser/profiles/profile_impl.cc
|
||||
@@ -982,7 +982,9 @@ Profile* ProfileImpl::GetOffTheRecordProfile(const OTRProfileID& otr_profile_id,
|
||||
@@ -100,7 +100,7 @@ index 0f051ffa90eb2..7def9e1f948e3 100644
|
||||
return raw_otr_profile;
|
||||
}
|
||||
diff --git chrome/browser/profiles/profile_manager.cc chrome/browser/profiles/profile_manager.cc
|
||||
index e5227bb58f532..e9620f11a256a 100644
|
||||
index 682327014fb2..bea08e0accd0 100644
|
||||
--- chrome/browser/profiles/profile_manager.cc
|
||||
+++ chrome/browser/profiles/profile_manager.cc
|
||||
@@ -511,7 +511,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir)
|
||||
@@ -113,7 +113,7 @@ index e5227bb58f532..e9620f11a256a 100644
|
||||
}
|
||||
|
||||
diff --git chrome/browser/profiles/profile_manager.h chrome/browser/profiles/profile_manager.h
|
||||
index cd6fdbba9b435..0fbc56702d7a3 100644
|
||||
index cd6fdbba9b43..0fbc56702d7a 100644
|
||||
--- chrome/browser/profiles/profile_manager.h
|
||||
+++ chrome/browser/profiles/profile_manager.h
|
||||
@@ -118,7 +118,7 @@ class ProfileManager : public Profile::Delegate {
|
||||
@@ -135,7 +135,7 @@ index cd6fdbba9b435..0fbc56702d7a3 100644
|
||||
// Returns the directory where the first created profile is stored,
|
||||
// relative to the user data directory currently in use.
|
||||
diff --git chrome/browser/profiles/renderer_updater.cc chrome/browser/profiles/renderer_updater.cc
|
||||
index 5e71c1f56da15..db5c46cb5f85f 100644
|
||||
index 5e71c1f56da1..db5c46cb5f85 100644
|
||||
--- chrome/browser/profiles/renderer_updater.cc
|
||||
+++ chrome/browser/profiles/renderer_updater.cc
|
||||
@@ -8,6 +8,7 @@
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git chrome/browser/safe_browsing/BUILD.gn chrome/browser/safe_browsing/BUILD.gn
|
||||
index 4d46dbb1c0a44..022b7021fd245 100644
|
||||
index a74149c048b7..f88475575fd4 100644
|
||||
--- chrome/browser/safe_browsing/BUILD.gn
|
||||
+++ chrome/browser/safe_browsing/BUILD.gn
|
||||
@@ -27,6 +27,7 @@ static_library("safe_browsing") {
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git chrome/browser/sharesheet/sharesheet_service_delegate.cc chrome/browser/sharesheet/sharesheet_service_delegate.cc
|
||||
index f250b1b444de0..d0b7efeadbe18 100644
|
||||
index f250b1b444de..d0b7efeadbe1 100644
|
||||
--- chrome/browser/sharesheet/sharesheet_service_delegate.cc
|
||||
+++ chrome/browser/sharesheet/sharesheet_service_delegate.cc
|
||||
@@ -19,8 +19,10 @@ SharesheetServiceDelegate::SharesheetServiceDelegate(
|
||||
@@ -51,7 +51,7 @@ index f250b1b444de0..d0b7efeadbe18 100644
|
||||
|
||||
} // namespace sharesheet
|
||||
diff --git chrome/browser/sharesheet/sharesheet_service_delegate.h chrome/browser/sharesheet/sharesheet_service_delegate.h
|
||||
index 24dc55adca062..236eb65db6a45 100644
|
||||
index 24dc55adca06..236eb65db6a4 100644
|
||||
--- chrome/browser/sharesheet/sharesheet_service_delegate.h
|
||||
+++ chrome/browser/sharesheet/sharesheet_service_delegate.h
|
||||
@@ -77,7 +77,9 @@ class SharesheetServiceDelegate : public SharesheetController {
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git chrome/browser/themes/theme_service.cc chrome/browser/themes/theme_service.cc
|
||||
index ca830ceefd5d5..8b3af9620670d 100644
|
||||
index ca830ceefd5d..8b3af9620670 100644
|
||||
--- chrome/browser/themes/theme_service.cc
|
||||
+++ chrome/browser/themes/theme_service.cc
|
||||
@@ -27,6 +27,7 @@
|
||||
@@ -42,7 +42,7 @@ index ca830ceefd5d5..8b3af9620670d 100644
|
||||
theme_syncable_service_ =
|
||||
std::make_unique<ThemeSyncableService>(profile_, this);
|
||||
diff --git chrome/browser/themes/theme_service_factory.cc chrome/browser/themes/theme_service_factory.cc
|
||||
index dc2350f0b2443..7f4b9283534f3 100644
|
||||
index dc2350f0b244..7f4b9283534f 100644
|
||||
--- chrome/browser/themes/theme_service_factory.cc
|
||||
+++ chrome/browser/themes/theme_service_factory.cc
|
||||
@@ -7,6 +7,7 @@
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git chrome/browser/plugins/plugin_info_host_impl.cc chrome/browser/plugins/plugin_info_host_impl.cc
|
||||
index 168f980572c10..ffdc06beb2b77 100644
|
||||
index 168f980572c1..ffdc06beb2b7 100644
|
||||
--- chrome/browser/plugins/plugin_info_host_impl.cc
|
||||
+++ chrome/browser/plugins/plugin_info_host_impl.cc
|
||||
@@ -18,6 +18,7 @@
|
||||
@@ -115,7 +115,7 @@ index 168f980572c10..ffdc06beb2b77 100644
|
||||
bool enabled = i < matching_plugins.size();
|
||||
if (!enabled) {
|
||||
diff --git chrome/browser/plugins/plugin_utils.cc chrome/browser/plugins/plugin_utils.cc
|
||||
index a0b3175223f3e..a1117001ad1fc 100644
|
||||
index a0b3175223f3..a1117001ad1f 100644
|
||||
--- chrome/browser/plugins/plugin_utils.cc
|
||||
+++ chrome/browser/plugins/plugin_utils.cc
|
||||
@@ -5,6 +5,7 @@
|
||||
@@ -151,7 +151,7 @@ index a0b3175223f3e..a1117001ad1fc 100644
|
||||
Profile* profile = Profile::FromBrowserContext(browser_context);
|
||||
const std::vector<std::string>& allowlist =
|
||||
diff --git chrome/common/google_url_loader_throttle.cc chrome/common/google_url_loader_throttle.cc
|
||||
index e42b4e7dbdec2..a2bebe0128a04 100644
|
||||
index e42b4e7dbdec..a2bebe0128a0 100644
|
||||
--- chrome/common/google_url_loader_throttle.cc
|
||||
+++ chrome/common/google_url_loader_throttle.cc
|
||||
@@ -7,6 +7,7 @@
|
||||
@@ -186,7 +186,7 @@ index e42b4e7dbdec2..a2bebe0128a04 100644
|
||||
// that the X-Frame-Options protection mechanism is set to either DENY or
|
||||
// SAMEORIGIN.
|
||||
diff --git chrome/renderer/chrome_content_renderer_client.cc chrome/renderer/chrome_content_renderer_client.cc
|
||||
index 21bc479c64b31..ce00212ed4f86 100644
|
||||
index 21bc479c64b3..ce00212ed4f8 100644
|
||||
--- chrome/renderer/chrome_content_renderer_client.cc
|
||||
+++ chrome/renderer/chrome_content_renderer_client.cc
|
||||
@@ -895,6 +895,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||
@@ -238,7 +238,7 @@ index 21bc479c64b31..ce00212ed4f86 100644
|
||||
}
|
||||
}
|
||||
diff --git content/browser/browser_plugin/browser_plugin_guest.h content/browser/browser_plugin/browser_plugin_guest.h
|
||||
index bc13113e725e0..2bc15de23ec4a 100644
|
||||
index bc13113e725e..2bc15de23ec4 100644
|
||||
--- content/browser/browser_plugin/browser_plugin_guest.h
|
||||
+++ content/browser/browser_plugin/browser_plugin_guest.h
|
||||
@@ -113,6 +113,8 @@ class CONTENT_EXPORT BrowserPluginGuest : public GuestHost,
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git chrome/browser/ui/prefs/pref_watcher.h chrome/browser/ui/prefs/pref_watcher.h
|
||||
index 78d5b763970c2..de98bd0b325b1 100644
|
||||
index 78d5b763970c..de98bd0b325b 100644
|
||||
--- chrome/browser/ui/prefs/pref_watcher.h
|
||||
+++ chrome/browser/ui/prefs/pref_watcher.h
|
||||
@@ -29,10 +29,10 @@ class PrefWatcher : public KeyedService {
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git chrome/renderer/BUILD.gn chrome/renderer/BUILD.gn
|
||||
index 5f60593886e37..34d8abbc0acbd 100644
|
||||
index 5f60593886e3..34d8abbc0acb 100644
|
||||
--- chrome/renderer/BUILD.gn
|
||||
+++ chrome/renderer/BUILD.gn
|
||||
@@ -5,6 +5,7 @@
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git chrome/app/chrome_main_delegate.cc chrome/app/chrome_main_delegate.cc
|
||||
index c64f406ba5b8f..75453789a6052 100644
|
||||
index c64f406ba5b8..75453789a605 100644
|
||||
--- chrome/app/chrome_main_delegate.cc
|
||||
+++ chrome/app/chrome_main_delegate.cc
|
||||
@@ -29,6 +29,7 @@
|
||||
@@ -78,7 +78,7 @@ index c64f406ba5b8f..75453789a6052 100644
|
||||
|
||||
#endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
|
||||
diff --git chrome/browser/chrome_browser_main.cc chrome/browser/chrome_browser_main.cc
|
||||
index cf7f295bf92f6..1a7859d698a8c 100644
|
||||
index c832319917cb..603cf7a0ef17 100644
|
||||
--- chrome/browser/chrome_browser_main.cc
|
||||
+++ chrome/browser/chrome_browser_main.cc
|
||||
@@ -49,6 +49,7 @@
|
||||
@@ -89,7 +89,7 @@ index cf7f295bf92f6..1a7859d698a8c 100644
|
||||
#include "chrome/browser/about_flags.h"
|
||||
#include "chrome/browser/active_use_util.h"
|
||||
#include "chrome/browser/after_startup_task_utils.h"
|
||||
@@ -906,8 +907,10 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
|
||||
@@ -924,8 +925,10 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
|
||||
#if !defined(OS_ANDROID)
|
||||
// Create the RunLoop for MainMessageLoopRun() to use, and pass a copy of
|
||||
// its QuitClosure to the BrowserProcessImpl to call when it is time to exit.
|
||||
@@ -101,7 +101,7 @@ index cf7f295bf92f6..1a7859d698a8c 100644
|
||||
|
||||
// These members must be initialized before returning from this function.
|
||||
// Android doesn't use StartupBrowserCreator.
|
||||
@@ -1665,11 +1668,14 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
|
||||
@@ -1683,11 +1686,14 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
|
||||
// This step is costly and is already measured in
|
||||
// Startup.StartupBrowserCreator_Start.
|
||||
// See the comment above for an explanation of |process_command_line|.
|
||||
@@ -118,7 +118,7 @@ index cf7f295bf92f6..1a7859d698a8c 100644
|
||||
// of lacros-chrome is complete.
|
||||
#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
|
||||
diff --git chrome/browser/chrome_browser_main_mac.mm chrome/browser/chrome_browser_main_mac.mm
|
||||
index 95d1ebc190910..13cdfa52db108 100644
|
||||
index 95d1ebc19091..13cdfa52db10 100644
|
||||
--- chrome/browser/chrome_browser_main_mac.mm
|
||||
+++ chrome/browser/chrome_browser_main_mac.mm
|
||||
@@ -16,6 +16,7 @@
|
||||
@@ -156,7 +156,7 @@ index 95d1ebc190910..13cdfa52db108 100644
|
||||
+#endif
|
||||
}
|
||||
diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
|
||||
index af089ae5fa35a..b7498d1a2ee79 100644
|
||||
index 71a78730b9d1..00da54de4260 100644
|
||||
--- chrome/browser/chrome_content_browser_client.cc
|
||||
+++ chrome/browser/chrome_content_browser_client.cc
|
||||
@@ -37,6 +37,7 @@
|
||||
@@ -167,7 +167,7 @@ index af089ae5fa35a..b7498d1a2ee79 100644
|
||||
#include "chrome/browser/accessibility/accessibility_labels_service.h"
|
||||
#include "chrome/browser/accessibility/accessibility_labels_service_factory.h"
|
||||
#include "chrome/browser/after_startup_task_utils.h"
|
||||
@@ -3590,9 +3591,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
|
||||
@@ -3599,9 +3600,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
|
||||
&search::HandleNewTabURLReverseRewrite);
|
||||
#endif // defined(OS_ANDROID)
|
||||
|
||||
@@ -180,7 +180,7 @@ index af089ae5fa35a..b7498d1a2ee79 100644
|
||||
|
||||
base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() {
|
||||
diff --git chrome/browser/notifications/alert_dispatcher_xpc.mm chrome/browser/notifications/alert_dispatcher_xpc.mm
|
||||
index ab4c2b03755d3..8e813496f9df6 100644
|
||||
index ab4c2b03755d..8e813496f9df 100644
|
||||
--- chrome/browser/notifications/alert_dispatcher_xpc.mm
|
||||
+++ chrome/browser/notifications/alert_dispatcher_xpc.mm
|
||||
@@ -19,6 +19,7 @@
|
||||
@@ -205,7 +205,7 @@ index ab4c2b03755d3..8e813496f9df6 100644
|
||||
base::mac::ScopedMachSendRight exceptionPort(
|
||||
crash_reporter::GetCrashpadClient().GetHandlerMachPort());
|
||||
diff --git chrome/browser/prefs/browser_prefs.cc chrome/browser/prefs/browser_prefs.cc
|
||||
index b18cc56bb82b0..4760db368c6e0 100644
|
||||
index 6a1866ce6d6b..f4124005eadb 100644
|
||||
--- chrome/browser/prefs/browser_prefs.cc
|
||||
+++ chrome/browser/prefs/browser_prefs.cc
|
||||
@@ -10,6 +10,7 @@
|
||||
@@ -216,7 +216,7 @@ index b18cc56bb82b0..4760db368c6e0 100644
|
||||
#include "chrome/browser/about_flags.h"
|
||||
#include "chrome/browser/accessibility/accessibility_labels_service.h"
|
||||
#include "chrome/browser/accessibility/accessibility_ui.h"
|
||||
@@ -161,6 +162,10 @@
|
||||
@@ -162,6 +163,10 @@
|
||||
#include "chrome/browser/background/background_mode_manager.h"
|
||||
#endif
|
||||
|
||||
@@ -227,7 +227,7 @@ index b18cc56bb82b0..4760db368c6e0 100644
|
||||
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
||||
#include "chrome/browser/accessibility/animation_policy_prefs.h"
|
||||
#include "chrome/browser/apps/platform_apps/shortcut_manager.h"
|
||||
@@ -1019,6 +1024,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
|
||||
@@ -1022,6 +1027,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
|
||||
SessionDataService::RegisterProfilePrefs(registry);
|
||||
#endif
|
||||
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git chrome/browser/ui/browser_command_controller.cc chrome/browser/ui/browser_command_controller.cc
|
||||
index cfefe1f227283..402d848368269 100644
|
||||
index cfefe1f22728..402d84836826 100644
|
||||
--- chrome/browser/ui/browser_command_controller.cc
|
||||
+++ chrome/browser/ui/browser_command_controller.cc
|
||||
@@ -351,8 +351,10 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
|
||||
@@ -31,7 +31,7 @@ index cfefe1f227283..402d848368269 100644
|
||||
|
||||
void BrowserCommandController::InitCommandState() {
|
||||
diff --git chrome/browser/ui/views/frame/browser_frame.cc chrome/browser/ui/views/frame/browser_frame.cc
|
||||
index 3fca382fde67e..6adddf506bb16 100644
|
||||
index 3fca382fde67..6adddf506bb1 100644
|
||||
--- chrome/browser/ui/views/frame/browser_frame.cc
|
||||
+++ chrome/browser/ui/views/frame/browser_frame.cc
|
||||
@@ -69,15 +69,23 @@ bool IsUsingGtkTheme(Profile* profile) {
|
||||
@@ -106,7 +106,7 @@ index 3fca382fde67e..6adddf506bb16 100644
|
||||
// or not we always use the dark ui instance.
|
||||
if (base::FeatureList::IsEnabled(
|
||||
diff --git chrome/browser/ui/views/frame/browser_frame.h chrome/browser/ui/views/frame/browser_frame.h
|
||||
index 0ce7abdeb7d9f..8197a6bb7da98 100644
|
||||
index 0ce7abdeb7d9..8197a6bb7da9 100644
|
||||
--- chrome/browser/ui/views/frame/browser_frame.h
|
||||
+++ chrome/browser/ui/views/frame/browser_frame.h
|
||||
@@ -54,7 +54,9 @@ enum class TabDragKind {
|
||||
@@ -120,7 +120,7 @@ index 0ce7abdeb7d9f..8197a6bb7da98 100644
|
||||
|
||||
// Initialize the frame (creates the underlying native window).
|
||||
diff --git chrome/browser/ui/views/frame/browser_view.cc chrome/browser/ui/views/frame/browser_view.cc
|
||||
index e852eb7d20ed6..bb73d3055936d 100644
|
||||
index e852eb7d20ed..bb73d3055936 100644
|
||||
--- chrome/browser/ui/views/frame/browser_view.cc
|
||||
+++ chrome/browser/ui/views/frame/browser_view.cc
|
||||
@@ -586,11 +586,22 @@ class BrowserView::AccessibilityModeObserver : public ui::AXModeObserver {
|
||||
@@ -234,7 +234,7 @@ index e852eb7d20ed6..bb73d3055936d 100644
|
||||
|
||||
MaybeInitializeWebUITabStrip();
|
||||
diff --git chrome/browser/ui/views/frame/browser_view.h chrome/browser/ui/views/frame/browser_view.h
|
||||
index f6db8a6928831..a5302d7f73ba6 100644
|
||||
index f6db8a692883..a5302d7f73ba 100644
|
||||
--- chrome/browser/ui/views/frame/browser_view.h
|
||||
+++ chrome/browser/ui/views/frame/browser_view.h
|
||||
@@ -114,7 +114,9 @@ class BrowserView : public BrowserWindow,
|
||||
@@ -261,7 +261,7 @@ index f6db8a6928831..a5302d7f73ba6 100644
|
||||
// Do not friend BrowserViewLayout. Use the BrowserViewLayoutDelegate
|
||||
// interface to keep these two classes decoupled and testable.
|
||||
diff --git chrome/browser/ui/views/frame/browser_view_layout.cc chrome/browser/ui/views/frame/browser_view_layout.cc
|
||||
index 0e810789a99d7..14d69bd755fa2 100644
|
||||
index 0e810789a99d..14d69bd755fa 100644
|
||||
--- chrome/browser/ui/views/frame/browser_view_layout.cc
|
||||
+++ chrome/browser/ui/views/frame/browser_view_layout.cc
|
||||
@@ -420,6 +420,12 @@ int BrowserViewLayout::LayoutWebUITabStrip(int top) {
|
||||
@@ -278,7 +278,7 @@ index 0e810789a99d7..14d69bd755fa2 100644
|
||||
bool toolbar_visible = delegate_->IsToolbarVisible();
|
||||
int height = toolbar_visible ? toolbar_->GetPreferredSize().height() : 0;
|
||||
diff --git chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
|
||||
index 50c10d73b9102..46f375b11d82c 100644
|
||||
index 50c10d73b910..46f375b11d82 100644
|
||||
--- chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
|
||||
+++ chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
|
||||
@@ -582,37 +582,53 @@ gfx::Range BrowserTabStripController::ListTabsInGroup(
|
||||
@@ -336,7 +336,7 @@ index 50c10d73b9102..46f375b11d82c 100644
|
||||
}
|
||||
|
||||
diff --git chrome/browser/ui/views/toolbar/toolbar_view.cc chrome/browser/ui/views/toolbar/toolbar_view.cc
|
||||
index 650fb98f63b0b..fd3d28bd70aac 100644
|
||||
index 650fb98f63b0..fd3d28bd70aa 100644
|
||||
--- chrome/browser/ui/views/toolbar/toolbar_view.cc
|
||||
+++ chrome/browser/ui/views/toolbar/toolbar_view.cc
|
||||
@@ -160,12 +160,13 @@ auto& GetViewCommandMap() {
|
||||
@@ -365,7 +365,7 @@ index 650fb98f63b0b..fd3d28bd70aac 100644
|
||||
size_animation_.Reset(1);
|
||||
|
||||
diff --git chrome/browser/ui/views/toolbar/toolbar_view.h chrome/browser/ui/views/toolbar/toolbar_view.h
|
||||
index c232c1c703500..d3b1593be5496 100644
|
||||
index c232c1c70350..d3b1593be549 100644
|
||||
--- chrome/browser/ui/views/toolbar/toolbar_view.h
|
||||
+++ chrome/browser/ui/views/toolbar/toolbar_view.h
|
||||
@@ -91,7 +91,8 @@ class ToolbarView : public views::AccessiblePaneView,
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git third_party/widevine/cdm/BUILD.gn third_party/widevine/cdm/BUILD.gn
|
||||
index 24668a4acf22d..ac1f02c0779e4 100644
|
||||
index 24668a4acf22..ac1f02c0779e 100644
|
||||
--- third_party/widevine/cdm/BUILD.gn
|
||||
+++ third_party/widevine/cdm/BUILD.gn
|
||||
@@ -7,6 +7,7 @@ import("//build/config/chrome_build.gni")
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git content/browser/devtools/devtools_instrumentation.h content/browser/devtools/devtools_instrumentation.h
|
||||
index 7edfd5dd9c140..f018b8f085e65 100644
|
||||
index 7edfd5dd9c14..f018b8f085e6 100644
|
||||
--- content/browser/devtools/devtools_instrumentation.h
|
||||
+++ content/browser/devtools/devtools_instrumentation.h
|
||||
@@ -11,6 +11,7 @@
|
||||
@@ -20,7 +20,7 @@ index 7edfd5dd9c140..f018b8f085e65 100644
|
||||
bool is_navigation,
|
||||
bool is_download,
|
||||
diff --git content/browser/renderer_host/input/synthetic_gesture_target_base.h content/browser/renderer_host/input/synthetic_gesture_target_base.h
|
||||
index eef661b3e0950..6c0dacfa4bc3a 100644
|
||||
index eef661b3e095..6c0dacfa4bc3 100644
|
||||
--- content/browser/renderer_host/input/synthetic_gesture_target_base.h
|
||||
+++ content/browser/renderer_host/input/synthetic_gesture_target_base.h
|
||||
@@ -9,6 +9,7 @@
|
||||
@@ -42,7 +42,7 @@ index eef661b3e0950..6c0dacfa4bc3a 100644
|
||||
explicit SyntheticGestureTargetBase(RenderWidgetHostImpl* host);
|
||||
~SyntheticGestureTargetBase() override;
|
||||
diff --git content/common/content_switches_internal.h content/common/content_switches_internal.h
|
||||
index 57072bf1263ae..0a93446e4d21c 100644
|
||||
index 57072bf1263a..0a93446e4d21 100644
|
||||
--- content/common/content_switches_internal.h
|
||||
+++ content/common/content_switches_internal.h
|
||||
@@ -15,7 +15,7 @@ class CommandLine;
|
||||
@@ -55,7 +55,7 @@ index 57072bf1263ae..0a93446e4d21c 100644
|
||||
blink::mojom::V8CacheOptions GetV8CacheOptions();
|
||||
|
||||
diff --git third_party/blink/renderer/controller/BUILD.gn third_party/blink/renderer/controller/BUILD.gn
|
||||
index 8003cd409ff37..8ac3fefade6de 100644
|
||||
index 8003cd409ff3..8ac3fefade6d 100644
|
||||
--- third_party/blink/renderer/controller/BUILD.gn
|
||||
+++ third_party/blink/renderer/controller/BUILD.gn
|
||||
@@ -29,6 +29,7 @@ component("controller") {
|
||||
@@ -76,7 +76,7 @@ index 8003cd409ff37..8ac3fefade6de 100644
|
||||
|
||||
if (is_linux || is_chromeos) {
|
||||
diff --git ui/events/keycodes/BUILD.gn ui/events/keycodes/BUILD.gn
|
||||
index 86bbf620ff0d9..6c06b461c6da1 100644
|
||||
index 86bbf620ff0d..6c06b461c6da 100644
|
||||
--- ui/events/keycodes/BUILD.gn
|
||||
+++ ui/events/keycodes/BUILD.gn
|
||||
@@ -19,6 +19,8 @@ source_set("xkb") {
|
||||
@@ -89,7 +89,7 @@ index 86bbf620ff0d9..6c06b461c6da1 100644
|
||||
"//base",
|
||||
"//build:chromeos_buildflags",
|
||||
diff --git ui/events/keycodes/keyboard_code_conversion_xkb.h ui/events/keycodes/keyboard_code_conversion_xkb.h
|
||||
index e1fefa4cead9e..8213402ff263d 100644
|
||||
index e1fefa4cead9..8213402ff263 100644
|
||||
--- ui/events/keycodes/keyboard_code_conversion_xkb.h
|
||||
+++ ui/events/keycodes/keyboard_code_conversion_xkb.h
|
||||
@@ -9,6 +9,7 @@
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git chrome/browser/download/download_target_determiner.cc chrome/browser/download/download_target_determiner.cc
|
||||
index 181732fa49c2d..29eeb60091ce6 100644
|
||||
index 181732fa49c2..29eeb60091ce 100644
|
||||
--- chrome/browser/download/download_target_determiner.cc
|
||||
+++ chrome/browser/download/download_target_determiner.cc
|
||||
@@ -677,7 +677,7 @@ void IsHandledBySafePlugin(int render_process_id,
|
||||
@@ -12,7 +12,7 @@ index 181732fa49c2d..29eeb60091ce6 100644
|
||||
if (is_stale && stale_plugin_action == RETRY_IF_STALE_PLUGIN_LIST) {
|
||||
// The GetPlugins call causes the plugin list to be refreshed. Once that's
|
||||
diff --git chrome/browser/plugins/chrome_plugin_service_filter.cc chrome/browser/plugins/chrome_plugin_service_filter.cc
|
||||
index 27f7028908745..35e1cdb72874f 100644
|
||||
index 27f702890874..35e1cdb72874 100644
|
||||
--- chrome/browser/plugins/chrome_plugin_service_filter.cc
|
||||
+++ chrome/browser/plugins/chrome_plugin_service_filter.cc
|
||||
@@ -133,6 +133,7 @@ bool ChromePluginServiceFilter::IsPluginAvailable(
|
||||
@@ -24,7 +24,7 @@ index 27f7028908745..35e1cdb72874f 100644
|
||||
content::WebPluginInfo* plugin) {
|
||||
base::AutoLock auto_lock(lock_);
|
||||
diff --git chrome/browser/plugins/chrome_plugin_service_filter.h chrome/browser/plugins/chrome_plugin_service_filter.h
|
||||
index 937d3d5bc84fd..ac327392dcf37 100644
|
||||
index 937d3d5bc84f..ac327392dcf3 100644
|
||||
--- chrome/browser/plugins/chrome_plugin_service_filter.h
|
||||
+++ chrome/browser/plugins/chrome_plugin_service_filter.h
|
||||
@@ -64,6 +64,7 @@ class ChromePluginServiceFilter : public content::PluginServiceFilter,
|
||||
@@ -36,7 +36,7 @@ index 937d3d5bc84fd..ac327392dcf37 100644
|
||||
content::WebPluginInfo* plugin) override;
|
||||
|
||||
diff --git chrome/browser/plugins/pdf_iframe_navigation_throttle.cc chrome/browser/plugins/pdf_iframe_navigation_throttle.cc
|
||||
index d0a5a12620bd3..a02e13bbd8154 100644
|
||||
index d0a5a12620bd..a02e13bbd815 100644
|
||||
--- chrome/browser/plugins/pdf_iframe_navigation_throttle.cc
|
||||
+++ chrome/browser/plugins/pdf_iframe_navigation_throttle.cc
|
||||
@@ -65,7 +65,7 @@ bool IsPDFPluginEnabled(content::NavigationHandle* navigation_handle,
|
||||
@@ -49,7 +49,7 @@ index d0a5a12620bd3..a02e13bbd8154 100644
|
||||
false /* allow_wildcard */, is_stale, &plugin_info,
|
||||
nullptr /* actual_mime_type */);
|
||||
diff --git chrome/browser/ui/views/frame/browser_root_view.cc chrome/browser/ui/views/frame/browser_root_view.cc
|
||||
index 92dced6c08aa4..73cdaf388123b 100644
|
||||
index 92dced6c08aa..73cdaf388123 100644
|
||||
--- chrome/browser/ui/views/frame/browser_root_view.cc
|
||||
+++ chrome/browser/ui/views/frame/browser_root_view.cc
|
||||
@@ -82,7 +82,7 @@ void OnFindURLMimeType(const GURL& url,
|
||||
@@ -62,7 +62,7 @@ index 92dced6c08aa4..73cdaf388123b 100644
|
||||
#endif
|
||||
|
||||
diff --git content/browser/devtools/devtools_http_handler.cc content/browser/devtools/devtools_http_handler.cc
|
||||
index 30267bc6d214e..c01f4ff040c05 100644
|
||||
index 30267bc6d214..c01f4ff040c0 100644
|
||||
--- content/browser/devtools/devtools_http_handler.cc
|
||||
+++ content/browser/devtools/devtools_http_handler.cc
|
||||
@@ -574,7 +574,7 @@ void DevToolsHttpHandler::OnJsonRequest(
|
||||
@@ -75,7 +75,7 @@ index 30267bc6d214e..c01f4ff040c05 100644
|
||||
GetContentClient()->browser()->GetUserAgent());
|
||||
version.SetString("V8-Version", V8_VERSION_STRING);
|
||||
diff --git content/browser/loader/navigation_url_loader_impl.cc content/browser/loader/navigation_url_loader_impl.cc
|
||||
index 178a234311337..51555a02e2409 100644
|
||||
index 178a23431133..51555a02e240 100644
|
||||
--- content/browser/loader/navigation_url_loader_impl.cc
|
||||
+++ content/browser/loader/navigation_url_loader_impl.cc
|
||||
@@ -633,6 +633,13 @@ NavigationURLLoaderImpl::PrepareForNonInterceptedRequest(
|
||||
@@ -102,7 +102,7 @@ index 178a234311337..51555a02e2409 100644
|
||||
|
||||
if (stale) {
|
||||
diff --git content/browser/plugin_service_impl.cc content/browser/plugin_service_impl.cc
|
||||
index 9be14f9a03219..00e2520112d81 100644
|
||||
index 9be14f9a0321..00e2520112d8 100644
|
||||
--- content/browser/plugin_service_impl.cc
|
||||
+++ content/browser/plugin_service_impl.cc
|
||||
@@ -270,6 +270,7 @@ bool PluginServiceImpl::GetPluginInfoArray(
|
||||
@@ -124,7 +124,7 @@ index 9be14f9a03219..00e2520112d81 100644
|
||||
if (actual_mime_type)
|
||||
*actual_mime_type = mime_types[i];
|
||||
diff --git content/browser/plugin_service_impl.h content/browser/plugin_service_impl.h
|
||||
index b0fb11b4d5ba7..1bce64c6b20ee 100644
|
||||
index b0fb11b4d5ba..1bce64c6b20e 100644
|
||||
--- content/browser/plugin_service_impl.h
|
||||
+++ content/browser/plugin_service_impl.h
|
||||
@@ -54,6 +54,7 @@ class CONTENT_EXPORT PluginServiceImpl : public PluginService {
|
||||
@@ -136,7 +136,7 @@ index b0fb11b4d5ba7..1bce64c6b20ee 100644
|
||||
const std::string& mime_type,
|
||||
bool allow_wildcard,
|
||||
diff --git content/browser/renderer_host/plugin_registry_impl.cc content/browser/renderer_host/plugin_registry_impl.cc
|
||||
index 68ccb16a86ad0..7e9aeed8c8c32 100644
|
||||
index 68ccb16a86ad..7e9aeed8c8c3 100644
|
||||
--- content/browser/renderer_host/plugin_registry_impl.cc
|
||||
+++ content/browser/renderer_host/plugin_registry_impl.cc
|
||||
@@ -30,6 +30,7 @@ void PluginRegistryImpl::Bind(
|
||||
@@ -169,7 +169,7 @@ index 68ccb16a86ad0..7e9aeed8c8c32 100644
|
||||
auto plugin_blink = blink::mojom::PluginInfo::New();
|
||||
plugin_blink->name = plugin.name;
|
||||
diff --git content/browser/renderer_host/plugin_registry_impl.h content/browser/renderer_host/plugin_registry_impl.h
|
||||
index 632ae86c6fd69..55b749ec12421 100644
|
||||
index 632ae86c6fd6..55b749ec1242 100644
|
||||
--- content/browser/renderer_host/plugin_registry_impl.h
|
||||
+++ content/browser/renderer_host/plugin_registry_impl.h
|
||||
@@ -24,11 +24,13 @@ class PluginRegistryImpl : public blink::mojom::PluginRegistry {
|
||||
@@ -188,10 +188,10 @@ index 632ae86c6fd69..55b749ec12421 100644
|
||||
const std::vector<WebPluginInfo>& all_plugins);
|
||||
|
||||
diff --git content/browser/renderer_host/render_frame_host_impl.cc content/browser/renderer_host/render_frame_host_impl.cc
|
||||
index b4c2b23799188..3bdc6327c2c18 100644
|
||||
index f7fe7e4a2790..c78ad7b958a0 100644
|
||||
--- content/browser/renderer_host/render_frame_host_impl.cc
|
||||
+++ content/browser/renderer_host/render_frame_host_impl.cc
|
||||
@@ -11216,6 +11216,7 @@ void RenderFrameHostImpl::BindHungDetectorHost(
|
||||
@@ -11308,6 +11308,7 @@ void RenderFrameHostImpl::BindHungDetectorHost(
|
||||
}
|
||||
|
||||
void RenderFrameHostImpl::GetPluginInfo(const GURL& url,
|
||||
@@ -199,7 +199,7 @@ index b4c2b23799188..3bdc6327c2c18 100644
|
||||
const url::Origin& main_frame_origin,
|
||||
const std::string& mime_type,
|
||||
GetPluginInfoCallback callback) {
|
||||
@@ -11223,7 +11224,8 @@ void RenderFrameHostImpl::GetPluginInfo(const GURL& url,
|
||||
@@ -11315,7 +11316,8 @@ void RenderFrameHostImpl::GetPluginInfo(const GURL& url,
|
||||
WebPluginInfo info;
|
||||
std::string actual_mime_type;
|
||||
bool found = PluginServiceImpl::GetInstance()->GetPluginInfo(
|
||||
@@ -210,10 +210,10 @@ index b4c2b23799188..3bdc6327c2c18 100644
|
||||
std::move(callback).Run(found, info, actual_mime_type);
|
||||
}
|
||||
diff --git content/browser/renderer_host/render_frame_host_impl.h content/browser/renderer_host/render_frame_host_impl.h
|
||||
index a2eb6268b937d..625518ccf5971 100644
|
||||
index 3456986091ab..09a053e23c51 100644
|
||||
--- content/browser/renderer_host/render_frame_host_impl.h
|
||||
+++ content/browser/renderer_host/render_frame_host_impl.h
|
||||
@@ -2383,6 +2383,7 @@ class CONTENT_EXPORT RenderFrameHostImpl
|
||||
@@ -2397,6 +2397,7 @@ class CONTENT_EXPORT RenderFrameHostImpl
|
||||
int32_t plugin_child_id,
|
||||
const base::FilePath& path) override;
|
||||
void GetPluginInfo(const GURL& url,
|
||||
@@ -222,7 +222,7 @@ index a2eb6268b937d..625518ccf5971 100644
|
||||
const std::string& mime_type,
|
||||
GetPluginInfoCallback callback) override;
|
||||
diff --git content/common/pepper_plugin.mojom content/common/pepper_plugin.mojom
|
||||
index a544bfed7ed85..60aad01350c2f 100644
|
||||
index a544bfed7ed8..60aad01350c2 100644
|
||||
--- content/common/pepper_plugin.mojom
|
||||
+++ content/common/pepper_plugin.mojom
|
||||
@@ -29,6 +29,7 @@ interface PepperHost {
|
||||
@@ -234,7 +234,7 @@ index a544bfed7ed85..60aad01350c2f 100644
|
||||
string mime_type) =>
|
||||
(bool found,
|
||||
diff --git content/public/browser/content_browser_client.cc content/public/browser/content_browser_client.cc
|
||||
index 0a22650086512..847cea49a484d 100644
|
||||
index e51417f75154..13a66af8502b 100644
|
||||
--- content/public/browser/content_browser_client.cc
|
||||
+++ content/public/browser/content_browser_client.cc
|
||||
@@ -9,7 +9,7 @@
|
||||
@@ -247,7 +247,7 @@ index 0a22650086512..847cea49a484d 100644
|
||||
#include <utility>
|
||||
|
||||
diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h
|
||||
index 71d40028ce3ea..440305180e643 100644
|
||||
index a16296493332..5d666e468cde 100644
|
||||
--- content/public/browser/content_browser_client.h
|
||||
+++ content/public/browser/content_browser_client.h
|
||||
@@ -32,6 +32,7 @@
|
||||
@@ -258,7 +258,7 @@ index 71d40028ce3ea..440305180e643 100644
|
||||
#include "content/public/common/page_visibility_state.h"
|
||||
#include "content/public/common/window_container_type.mojom-forward.h"
|
||||
#include "device/vr/buildflags/buildflags.h"
|
||||
@@ -1763,6 +1764,14 @@ class CONTENT_EXPORT ContentBrowserClient {
|
||||
@@ -1770,6 +1771,14 @@ class CONTENT_EXPORT ContentBrowserClient {
|
||||
const absl::optional<url::Origin>& initiating_origin,
|
||||
mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory);
|
||||
|
||||
@@ -273,7 +273,7 @@ index 71d40028ce3ea..440305180e643 100644
|
||||
// Creates an OverlayWindow to be used for Picture-in-Picture. This window
|
||||
// will house the content shown when in Picture-in-Picture mode. This will
|
||||
// return a new OverlayWindow.
|
||||
@@ -1836,6 +1845,10 @@ class CONTENT_EXPORT ContentBrowserClient {
|
||||
@@ -1843,6 +1852,10 @@ class CONTENT_EXPORT ContentBrowserClient {
|
||||
// Used as part of the user agent string.
|
||||
virtual std::string GetProduct();
|
||||
|
||||
@@ -285,7 +285,7 @@ index 71d40028ce3ea..440305180e643 100644
|
||||
virtual std::string GetUserAgent();
|
||||
|
||||
diff --git content/public/browser/plugin_service.h content/public/browser/plugin_service.h
|
||||
index 90fb0fcfa822b..d48e64b1573ca 100644
|
||||
index 90fb0fcfa822..d48e64b1573c 100644
|
||||
--- content/public/browser/plugin_service.h
|
||||
+++ content/public/browser/plugin_service.h
|
||||
@@ -73,6 +73,7 @@ class CONTENT_EXPORT PluginService {
|
||||
@@ -297,7 +297,7 @@ index 90fb0fcfa822b..d48e64b1573ca 100644
|
||||
const std::string& mime_type,
|
||||
bool allow_wildcard,
|
||||
diff --git content/public/browser/plugin_service_filter.h content/public/browser/plugin_service_filter.h
|
||||
index 570b5a4738b94..923a5f7195c53 100644
|
||||
index 570b5a4738b9..923a5f7195c5 100644
|
||||
--- content/public/browser/plugin_service_filter.h
|
||||
+++ content/public/browser/plugin_service_filter.h
|
||||
@@ -30,6 +30,7 @@ class PluginServiceFilter {
|
||||
@@ -309,7 +309,7 @@ index 570b5a4738b94..923a5f7195c53 100644
|
||||
WebPluginInfo* plugin) = 0;
|
||||
|
||||
diff --git content/public/renderer/content_renderer_client.h content/public/renderer/content_renderer_client.h
|
||||
index 601633452b5f9..03bc3f8e5f70a 100644
|
||||
index 601633452b5f..03bc3f8e5f70 100644
|
||||
--- content/public/renderer/content_renderer_client.h
|
||||
+++ content/public/renderer/content_renderer_client.h
|
||||
@@ -81,6 +81,9 @@ class CONTENT_EXPORT ContentRendererClient {
|
||||
@@ -334,10 +334,10 @@ index 601633452b5f9..03bc3f8e5f70a 100644
|
||||
// started.
|
||||
virtual void SetRuntimeFeaturesDefaultsBeforeBlinkInitialization() {}
|
||||
diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc
|
||||
index aa5503a16409a..b1da8198722e2 100644
|
||||
index 14627b6297bb..c2c1827e3d0c 100644
|
||||
--- content/renderer/render_frame_impl.cc
|
||||
+++ content/renderer/render_frame_impl.cc
|
||||
@@ -3177,7 +3177,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
|
||||
@@ -3153,7 +3153,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
|
||||
WebPluginInfo info;
|
||||
std::string mime_type;
|
||||
bool found = false;
|
||||
@@ -348,7 +348,7 @@ index aa5503a16409a..b1da8198722e2 100644
|
||||
&mime_type);
|
||||
if (!found)
|
||||
diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc
|
||||
index 5bb7fec55d93e..634ccfc09889a 100644
|
||||
index 5bb7fec55d93..634ccfc09889 100644
|
||||
--- content/renderer/render_thread_impl.cc
|
||||
+++ content/renderer/render_thread_impl.cc
|
||||
@@ -599,6 +599,8 @@ void RenderThreadImpl::Init() {
|
||||
@@ -361,7 +361,7 @@ index 5bb7fec55d93e..634ccfc09889a 100644
|
||||
&RenderThreadImpl::OnRendererInterfaceReceiver, base::Unretained(this)));
|
||||
|
||||
diff --git content/renderer/renderer_blink_platform_impl.cc content/renderer/renderer_blink_platform_impl.cc
|
||||
index 1ee1fdf477745..74e3ddf4d19dc 100644
|
||||
index 1ee1fdf47774..74e3ddf4d19d 100644
|
||||
--- content/renderer/renderer_blink_platform_impl.cc
|
||||
+++ content/renderer/renderer_blink_platform_impl.cc
|
||||
@@ -1110,6 +1110,15 @@ SkBitmap* RendererBlinkPlatformImpl::GetSadPageBitmap() {
|
||||
@@ -381,7 +381,7 @@ index 1ee1fdf477745..74e3ddf4d19dc 100644
|
||||
if (!code_cache_host_) {
|
||||
code_cache_host_ = mojo::SharedRemote<blink::mojom::CodeCacheHost>(
|
||||
diff --git content/renderer/renderer_blink_platform_impl.h content/renderer/renderer_blink_platform_impl.h
|
||||
index faa1d91bf74a9..81e367bfb9b10 100644
|
||||
index faa1d91bf74a..81e367bfb9b1 100644
|
||||
--- content/renderer/renderer_blink_platform_impl.h
|
||||
+++ content/renderer/renderer_blink_platform_impl.h
|
||||
@@ -255,6 +255,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
|
||||
@@ -395,7 +395,7 @@ index faa1d91bf74a9..81e367bfb9b10 100644
|
||||
// plus eTLD+1, such as https://google.com), or to a more specific origin.
|
||||
void SetIsLockedToSite();
|
||||
diff --git content/shell/browser/shell_plugin_service_filter.cc content/shell/browser/shell_plugin_service_filter.cc
|
||||
index c25b7d1a18432..7e007d964f1a1 100644
|
||||
index c25b7d1a1843..7e007d964f1a 100644
|
||||
--- content/shell/browser/shell_plugin_service_filter.cc
|
||||
+++ content/shell/browser/shell_plugin_service_filter.cc
|
||||
@@ -17,6 +17,7 @@ bool ShellPluginServiceFilter::IsPluginAvailable(
|
||||
@@ -407,7 +407,7 @@ index c25b7d1a18432..7e007d964f1a1 100644
|
||||
WebPluginInfo* plugin) {
|
||||
return plugin->name == u"Blink Test Plugin" ||
|
||||
diff --git content/shell/browser/shell_plugin_service_filter.h content/shell/browser/shell_plugin_service_filter.h
|
||||
index 337b4b0653fe2..107ab4c9d8a85 100644
|
||||
index 337b4b0653fe..107ab4c9d8a8 100644
|
||||
--- content/shell/browser/shell_plugin_service_filter.h
|
||||
+++ content/shell/browser/shell_plugin_service_filter.h
|
||||
@@ -20,6 +20,7 @@ class ShellPluginServiceFilter : public PluginServiceFilter {
|
||||
@@ -419,7 +419,7 @@ index 337b4b0653fe2..107ab4c9d8a85 100644
|
||||
WebPluginInfo* plugin) override;
|
||||
|
||||
diff --git content/test/fake_plugin_service.cc content/test/fake_plugin_service.cc
|
||||
index f816fe5382c7e..7846e2b908675 100644
|
||||
index f816fe5382c7..7846e2b90867 100644
|
||||
--- content/test/fake_plugin_service.cc
|
||||
+++ content/test/fake_plugin_service.cc
|
||||
@@ -28,6 +28,7 @@ bool FakePluginService::GetPluginInfoArray(
|
||||
@@ -431,7 +431,7 @@ index f816fe5382c7e..7846e2b908675 100644
|
||||
const std::string& mime_type,
|
||||
bool allow_wildcard,
|
||||
diff --git content/test/fake_plugin_service.h content/test/fake_plugin_service.h
|
||||
index e5f53ee41161e..b9d73ebee4ec8 100644
|
||||
index e5f53ee41161..b9d73ebee4ec 100644
|
||||
--- content/test/fake_plugin_service.h
|
||||
+++ content/test/fake_plugin_service.h
|
||||
@@ -29,6 +29,7 @@ class FakePluginService : public PluginService {
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git content/app/content_main.cc content/app/content_main.cc
|
||||
index e953579110eb9..1caa761f4297c 100644
|
||||
index e953579110eb..1caa761f4297 100644
|
||||
--- content/app/content_main.cc
|
||||
+++ content/app/content_main.cc
|
||||
@@ -209,15 +209,10 @@ void InitializeMojo(mojo::core::Configuration* config) {
|
||||
@@ -111,7 +111,7 @@ index e953579110eb9..1caa761f4297c 100644
|
||||
return RunContentProcess(params, runner.get());
|
||||
}
|
||||
diff --git content/app/content_main_runner_impl.cc content/app/content_main_runner_impl.cc
|
||||
index 8b557bdeb4b8f..49580985176ea 100644
|
||||
index 8b557bdeb4b8..49580985176e 100644
|
||||
--- content/app/content_main_runner_impl.cc
|
||||
+++ content/app/content_main_runner_impl.cc
|
||||
@@ -43,6 +43,7 @@
|
||||
@@ -135,7 +135,7 @@ index 8b557bdeb4b8f..49580985176ea 100644
|
||||
std::unique_ptr<ContentMainRunner> ContentMainRunner::Create() {
|
||||
return ContentMainRunnerImpl::Create();
|
||||
diff --git content/app/content_main_runner_impl.h content/app/content_main_runner_impl.h
|
||||
index 86c624e53cf99..090171f7db228 100644
|
||||
index 86c624e53cf9..090171f7db22 100644
|
||||
--- content/app/content_main_runner_impl.h
|
||||
+++ content/app/content_main_runner_impl.h
|
||||
@@ -39,7 +39,7 @@ class ContentMainDelegate;
|
||||
@@ -157,7 +157,7 @@ index 86c624e53cf99..090171f7db228 100644
|
||||
int RunBrowser(MainFunctionParams& main_function_params,
|
||||
bool start_minimal_browser);
|
||||
diff --git content/common/set_process_title.cc content/common/set_process_title.cc
|
||||
index 8b829a4887739..a69a088697287 100644
|
||||
index 8b829a488773..a69a08869728 100644
|
||||
--- content/common/set_process_title.cc
|
||||
+++ content/common/set_process_title.cc
|
||||
@@ -54,7 +54,7 @@ void SetProcessTitleFromCommandLine(const char** main_argv) {
|
||||
@@ -170,7 +170,7 @@ index 8b829a4887739..a69a088697287 100644
|
||||
if (main_argv)
|
||||
setproctitle_init(main_argv);
|
||||
diff --git content/public/app/content_main.h content/public/app/content_main.h
|
||||
index 97aac3d0c7584..fc795ae0287f9 100644
|
||||
index 97aac3d0c758..fc795ae0287f 100644
|
||||
--- content/public/app/content_main.h
|
||||
+++ content/public/app/content_main.h
|
||||
@@ -68,7 +68,16 @@ struct ContentMainParams {
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git content/public/browser/frame_service_base.h content/public/browser/frame_service_base.h
|
||||
index af3218d8f6462..da6880cc57e90 100644
|
||||
index af3218d8f646..da6880cc57e9 100644
|
||||
--- content/public/browser/frame_service_base.h
|
||||
+++ content/public/browser/frame_service_base.h
|
||||
@@ -83,6 +83,8 @@ class FrameServiceBase : public Interface, public WebContentsObserver {
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git chrome/chrome_elf/BUILD.gn chrome/chrome_elf/BUILD.gn
|
||||
index 9b08e23e921b0..49182504ae361 100644
|
||||
index 9b08e23e921b..49182504ae36 100644
|
||||
--- chrome/chrome_elf/BUILD.gn
|
||||
+++ chrome/chrome_elf/BUILD.gn
|
||||
@@ -7,6 +7,7 @@
|
||||
@@ -47,7 +47,7 @@ index 9b08e23e921b0..49182504ae361 100644
|
||||
|
||||
source_set("dll_hash") {
|
||||
diff --git chrome/chrome_elf/crash/crash_helper.cc chrome/chrome_elf/crash/crash_helper.cc
|
||||
index 886372e114899..ad3bc2242883b 100644
|
||||
index 886372e11489..ad3bc2242883 100644
|
||||
--- chrome/chrome_elf/crash/crash_helper.cc
|
||||
+++ chrome/chrome_elf/crash/crash_helper.cc
|
||||
@@ -11,12 +11,17 @@
|
||||
@@ -81,7 +81,7 @@ index 886372e114899..ad3bc2242883b 100644
|
||||
g_crash_helper_enabled = true;
|
||||
return true;
|
||||
diff --git chrome/common/crash_keys.cc chrome/common/crash_keys.cc
|
||||
index b84f727c9dc64..817df167e5a6b 100644
|
||||
index b84f727c9dc6..817df167e5a6 100644
|
||||
--- chrome/common/crash_keys.cc
|
||||
+++ chrome/common/crash_keys.cc
|
||||
@@ -4,6 +4,8 @@
|
||||
@@ -112,7 +112,7 @@ index b84f727c9dc64..817df167e5a6b 100644
|
||||
|
||||
void SetActiveExtensions(const std::set<std::string>& extensions) {
|
||||
diff --git chrome/common/crash_keys.h chrome/common/crash_keys.h
|
||||
index bcf172e645a23..f879aa745adfc 100644
|
||||
index bcf172e645a2..f879aa745adf 100644
|
||||
--- chrome/common/crash_keys.h
|
||||
+++ chrome/common/crash_keys.h
|
||||
@@ -17,6 +17,10 @@ class CommandLine;
|
||||
@@ -127,7 +127,7 @@ index bcf172e645a23..f879aa745adfc 100644
|
||||
// on the given |command_line|.
|
||||
void SetCrashKeysFromCommandLine(const base::CommandLine& command_line);
|
||||
diff --git components/crash/core/app/breakpad_linux.cc components/crash/core/app/breakpad_linux.cc
|
||||
index 00009dacdc2b0..e6454d5b1a23d 100644
|
||||
index 00009dacdc2b..e6454d5b1a23 100644
|
||||
--- components/crash/core/app/breakpad_linux.cc
|
||||
+++ components/crash/core/app/breakpad_linux.cc
|
||||
@@ -28,6 +28,7 @@
|
||||
@@ -203,7 +203,7 @@ index 00009dacdc2b0..e6454d5b1a23d 100644
|
||||
writer.Flush();
|
||||
}
|
||||
diff --git components/crash/core/app/breakpad_linux.h components/crash/core/app/breakpad_linux.h
|
||||
index 9ea80370a842c..3043f7d32f33d 100644
|
||||
index 9ea80370a842..3043f7d32f33 100644
|
||||
--- components/crash/core/app/breakpad_linux.h
|
||||
+++ components/crash/core/app/breakpad_linux.h
|
||||
@@ -20,6 +20,9 @@ extern void InitCrashReporter(const std::string& process_type);
|
||||
@@ -217,7 +217,7 @@ index 9ea80370a842c..3043f7d32f33d 100644
|
||||
extern void InitCrashKeysForTesting();
|
||||
|
||||
diff --git components/crash/core/app/crash_reporter_client.cc components/crash/core/app/crash_reporter_client.cc
|
||||
index 89b4bfccd5d32..7cb0a85470d2f 100644
|
||||
index 89b4bfccd5d3..7cb0a85470d2 100644
|
||||
--- components/crash/core/app/crash_reporter_client.cc
|
||||
+++ components/crash/core/app/crash_reporter_client.cc
|
||||
@@ -87,7 +87,7 @@ int CrashReporterClient::GetResultCodeRespawnFailed() {
|
||||
@@ -290,7 +290,7 @@ index 89b4bfccd5d32..7cb0a85470d2f 100644
|
||||
|
||||
} // namespace crash_reporter
|
||||
diff --git components/crash/core/app/crash_reporter_client.h components/crash/core/app/crash_reporter_client.h
|
||||
index 39557cce47443..236806090021a 100644
|
||||
index 39557cce4744..236806090021 100644
|
||||
--- components/crash/core/app/crash_reporter_client.h
|
||||
+++ components/crash/core/app/crash_reporter_client.h
|
||||
@@ -5,7 +5,9 @@
|
||||
@@ -357,7 +357,7 @@ index 39557cce47443..236806090021a 100644
|
||||
|
||||
} // namespace crash_reporter
|
||||
diff --git components/crash/core/app/crashpad.cc components/crash/core/app/crashpad.cc
|
||||
index 27f5504d544a3..fd901ccd5b759 100644
|
||||
index 27f5504d544a..fd901ccd5b75 100644
|
||||
--- components/crash/core/app/crashpad.cc
|
||||
+++ components/crash/core/app/crashpad.cc
|
||||
@@ -152,7 +152,8 @@ void InitializeCrashpadImpl(bool initial_client,
|
||||
@@ -371,7 +371,7 @@ index 27f5504d544a3..fd901ccd5b759 100644
|
||||
->set_system_crash_reporter_forwarding(crashpad::TriState::kDisabled);
|
||||
}
|
||||
diff --git components/crash/core/app/crashpad_mac.mm components/crash/core/app/crashpad_mac.mm
|
||||
index e3fc1fb2bcab3..56395d7100f94 100644
|
||||
index e3fc1fb2bcab..56395d7100f9 100644
|
||||
--- components/crash/core/app/crashpad_mac.mm
|
||||
+++ components/crash/core/app/crashpad_mac.mm
|
||||
@@ -16,11 +16,14 @@
|
||||
@@ -474,7 +474,7 @@ index e3fc1fb2bcab3..56395d7100f94 100644
|
||||
handler_path, database_path, metrics_path, url,
|
||||
GetProcessSimpleAnnotations(), arguments, true, false);
|
||||
diff --git components/crash/core/app/crashpad_win.cc components/crash/core/app/crashpad_win.cc
|
||||
index 686be7964d77d..6059aab2b69a7 100644
|
||||
index 686be7964d77..6059aab2b69a 100644
|
||||
--- components/crash/core/app/crashpad_win.cc
|
||||
+++ components/crash/core/app/crashpad_win.cc
|
||||
@@ -36,8 +36,8 @@ void GetPlatformCrashpadAnnotations(
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git third_party/crashpad/crashpad/client/prune_crash_reports.cc third_party/crashpad/crashpad/client/prune_crash_reports.cc
|
||||
index 492d466239d1a..a1df635870ede 100644
|
||||
index 492d466239d1..a1df635870ed 100644
|
||||
--- third_party/crashpad/crashpad/client/prune_crash_reports.cc
|
||||
+++ third_party/crashpad/crashpad/client/prune_crash_reports.cc
|
||||
@@ -73,13 +73,19 @@ size_t PruneCrashReportDatabase(CrashReportDatabase* database,
|
||||
@@ -26,7 +26,7 @@ index 492d466239d1a..a1df635870ede 100644
|
||||
|
||||
static const time_t kSecondsInDay = 60 * 60 * 24;
|
||||
diff --git third_party/crashpad/crashpad/client/prune_crash_reports.h third_party/crashpad/crashpad/client/prune_crash_reports.h
|
||||
index 07a70980f12af..ddf7f17325fed 100644
|
||||
index 07a70980f12a..ddf7f17325fe 100644
|
||||
--- third_party/crashpad/crashpad/client/prune_crash_reports.h
|
||||
+++ third_party/crashpad/crashpad/client/prune_crash_reports.h
|
||||
@@ -59,7 +59,8 @@ class PruneCondition {
|
||||
@@ -40,7 +40,7 @@ index 07a70980f12af..ddf7f17325fed 100644
|
||||
virtual ~PruneCondition() {}
|
||||
|
||||
diff --git third_party/crashpad/crashpad/client/settings.cc third_party/crashpad/crashpad/client/settings.cc
|
||||
index 3855b9b6a4b20..263f985043716 100644
|
||||
index 3855b9b6a4b2..263f98504371 100644
|
||||
--- third_party/crashpad/crashpad/client/settings.cc
|
||||
+++ third_party/crashpad/crashpad/client/settings.cc
|
||||
@@ -86,7 +86,7 @@ void ScopedLockedFileHandleTraits::Free(FileHandle handle) {
|
||||
@@ -130,7 +130,7 @@ index 3855b9b6a4b20..263f985043716 100644
|
||||
Settings::ScopedLockedFileHandle Settings::MakeScopedLockedFileHandle(
|
||||
FileHandle file,
|
||||
diff --git third_party/crashpad/crashpad/client/settings.h third_party/crashpad/crashpad/client/settings.h
|
||||
index 5761c6b965b5c..aee4e6c96033e 100644
|
||||
index 5761c6b965b5..aee4e6c96033 100644
|
||||
--- third_party/crashpad/crashpad/client/settings.h
|
||||
+++ third_party/crashpad/crashpad/client/settings.h
|
||||
@@ -115,6 +115,11 @@ class Settings {
|
||||
@@ -146,7 +146,7 @@ index 5761c6b965b5c..aee4e6c96033e 100644
|
||||
struct Data;
|
||||
|
||||
diff --git third_party/crashpad/crashpad/handler/BUILD.gn third_party/crashpad/crashpad/handler/BUILD.gn
|
||||
index a697b338e8eeb..96d4b45c5aa51 100644
|
||||
index a697b338e8ee..96d4b45c5aa5 100644
|
||||
--- third_party/crashpad/crashpad/handler/BUILD.gn
|
||||
+++ third_party/crashpad/crashpad/handler/BUILD.gn
|
||||
@@ -12,6 +12,7 @@
|
||||
@@ -184,7 +184,7 @@ index a697b338e8eeb..96d4b45c5aa51 100644
|
||||
|
||||
if (crashpad_is_win) {
|
||||
diff --git third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc
|
||||
index b7e445fd9f3ed..c5f1a3c3ceee7 100644
|
||||
index b7e445fd9f3e..c5f1a3c3ceee 100644
|
||||
--- third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc
|
||||
+++ third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc
|
||||
@@ -263,6 +263,8 @@ CrashReportUploadThread::UploadResult CrashReportUploadThread::UploadReport(
|
||||
@@ -197,7 +197,7 @@ index b7e445fd9f3ed..c5f1a3c3ceee7 100644
|
||||
|
||||
if (!reader->SeekSet(start_offset)) {
|
||||
diff --git third_party/crashpad/crashpad/handler/crash_report_upload_thread.h third_party/crashpad/crashpad/handler/crash_report_upload_thread.h
|
||||
index 2ec1147d2620d..8ff9a72e0bd79 100644
|
||||
index 2ec1147d2620..8ff9a72e0bd7 100644
|
||||
--- third_party/crashpad/crashpad/handler/crash_report_upload_thread.h
|
||||
+++ third_party/crashpad/crashpad/handler/crash_report_upload_thread.h
|
||||
@@ -15,6 +15,7 @@
|
||||
@@ -248,7 +248,7 @@ index 2ec1147d2620d..8ff9a72e0bd79 100644
|
||||
//! \brief Calls ProcessPendingReports() in response to ReportPending() having
|
||||
//! been called on any thread, as well as periodically on a timer.
|
||||
diff --git third_party/crashpad/crashpad/handler/handler_main.cc third_party/crashpad/crashpad/handler/handler_main.cc
|
||||
index 737ee4e09f676..f5a8727f7e6b1 100644
|
||||
index 737ee4e09f67..f5a8727f7e6b 100644
|
||||
--- third_party/crashpad/crashpad/handler/handler_main.cc
|
||||
+++ third_party/crashpad/crashpad/handler/handler_main.cc
|
||||
@@ -39,6 +39,7 @@
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git components/embedder_support/user_agent_utils.cc components/embedder_support/user_agent_utils.cc
|
||||
index 1f8de242c42d0..4ba07378b94a3 100644
|
||||
index 1f8de242c42d..4ba07378b94a 100644
|
||||
--- components/embedder_support/user_agent_utils.cc
|
||||
+++ components/embedder_support/user_agent_utils.cc
|
||||
@@ -8,6 +8,7 @@
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git chrome/browser/extensions/api/streams_private/streams_private_api.cc chrome/browser/extensions/api/streams_private/streams_private_api.cc
|
||||
index 5c903a13a14ed..d385c6c0c95c4 100644
|
||||
index 5c903a13a14e..c85964a7bab1 100644
|
||||
--- chrome/browser/extensions/api/streams_private/streams_private_api.cc
|
||||
+++ chrome/browser/extensions/api/streams_private/streams_private_api.cc
|
||||
@@ -6,6 +6,7 @@
|
||||
@@ -10,7 +10,18 @@ index 5c903a13a14ed..d385c6c0c95c4 100644
|
||||
#include "chrome/browser/extensions/extension_tab_util.h"
|
||||
#include "chrome/browser/prefetch/no_state_prefetch/chrome_no_state_prefetch_contents_delegate.h"
|
||||
#include "components/no_state_prefetch/browser/no_state_prefetch_contents.h"
|
||||
@@ -42,6 +43,7 @@ void StreamsPrivateAPI::SendExecuteMimeTypeHandlerEvent(
|
||||
@@ -18,6 +19,10 @@
|
||||
#include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h"
|
||||
#include "extensions/common/manifest_handlers/mime_types_handler.h"
|
||||
|
||||
+#if BUILDFLAG(ENABLE_CEF)
|
||||
+#include "cef/libcef/browser/extensions/alloy_extensions_util.h"
|
||||
+#endif
|
||||
+
|
||||
namespace extensions {
|
||||
|
||||
void StreamsPrivateAPI::SendExecuteMimeTypeHandlerEvent(
|
||||
@@ -42,6 +47,7 @@ void StreamsPrivateAPI::SendExecuteMimeTypeHandlerEvent(
|
||||
if (!web_contents)
|
||||
return;
|
||||
|
||||
@@ -18,7 +29,7 @@ index 5c903a13a14ed..d385c6c0c95c4 100644
|
||||
// If the request was for NoStatePrefetch, abort the prefetcher and do not
|
||||
// continue. This is because plugins cancel NoStatePrefetch, see
|
||||
// http://crbug.com/343590.
|
||||
@@ -52,6 +54,7 @@ void StreamsPrivateAPI::SendExecuteMimeTypeHandlerEvent(
|
||||
@@ -52,6 +58,7 @@ void StreamsPrivateAPI::SendExecuteMimeTypeHandlerEvent(
|
||||
no_state_prefetch_contents->Destroy(prerender::FINAL_STATUS_DOWNLOAD);
|
||||
return;
|
||||
}
|
||||
@@ -26,8 +37,30 @@ index 5c903a13a14ed..d385c6c0c95c4 100644
|
||||
|
||||
auto* browser_context = web_contents->GetBrowserContext();
|
||||
|
||||
@@ -78,9 +85,18 @@ void StreamsPrivateAPI::SendExecuteMimeTypeHandlerEvent(
|
||||
// forms of zooming won't work).
|
||||
// TODO(1042323): Present a coherent representation of a tab id for portal
|
||||
// contents.
|
||||
- int tab_id = web_contents->GetOuterWebContents()
|
||||
- ? SessionID::InvalidValue().id()
|
||||
- : ExtensionTabUtil::GetTabId(web_contents);
|
||||
+ int tab_id;
|
||||
+ if (web_contents->GetOuterWebContents()) {
|
||||
+ tab_id = SessionID::InvalidValue().id();
|
||||
+ } else
|
||||
+#if BUILDFLAG(ENABLE_CEF)
|
||||
+ if (cef::IsAlloyRuntimeEnabled()) {
|
||||
+ tab_id = alloy::GetTabIdForWebContents(web_contents);
|
||||
+ } else
|
||||
+#endif // BUILDFLAG(ENABLE_CEF)
|
||||
+ {
|
||||
+ tab_id = ExtensionTabUtil::GetTabId(web_contents);
|
||||
+ }
|
||||
|
||||
std::unique_ptr<StreamContainer> stream_container(
|
||||
new StreamContainer(tab_id, embedded, handler_url, extension_id,
|
||||
diff --git extensions/browser/extension_host.cc extensions/browser/extension_host.cc
|
||||
index 7e38155c3b695..78768b28d8c99 100644
|
||||
index 7e38155c3b69..78768b28d8c9 100644
|
||||
--- extensions/browser/extension_host.cc
|
||||
+++ extensions/browser/extension_host.cc
|
||||
@@ -63,11 +63,12 @@ ExtensionHost::ExtensionHost(const Extension* extension,
|
||||
@@ -92,7 +125,7 @@ index 7e38155c3b695..78768b28d8c99 100644
|
||||
ExtensionRegistry::Get(browser_context_)->RemoveObserver(this);
|
||||
|
||||
diff --git extensions/browser/extension_host.h extensions/browser/extension_host.h
|
||||
index 305726557f2ea..caa4b798a013e 100644
|
||||
index 305726557f2e..caa4b798a013 100644
|
||||
--- extensions/browser/extension_host.h
|
||||
+++ extensions/browser/extension_host.h
|
||||
@@ -53,13 +53,19 @@ class ExtensionHost : public DeferredStartRenderHost,
|
||||
@@ -127,7 +160,7 @@ index 305726557f2ea..caa4b798a013e 100644
|
||||
// A pointer to the current or speculative main frame in `host_contents_`. We
|
||||
// can't access this frame through the `host_contents_` directly as it does
|
||||
diff --git extensions/browser/extensions_browser_client.h extensions/browser/extensions_browser_client.h
|
||||
index 216e445c0488b..cd6502cc3f059 100644
|
||||
index 216e445c0488..cd6502cc3f05 100644
|
||||
--- extensions/browser/extensions_browser_client.h
|
||||
+++ extensions/browser/extensions_browser_client.h
|
||||
@@ -27,6 +27,7 @@
|
||||
@@ -162,7 +195,7 @@ index 216e445c0488b..cd6502cc3f059 100644
|
||||
// once each time the extensions system is loaded per browser_context. The
|
||||
// implementation may wish to use the BrowserContext to record the current
|
||||
diff --git extensions/browser/process_manager.cc extensions/browser/process_manager.cc
|
||||
index 0bf4809cb6f60..fccf3478b8669 100644
|
||||
index 0bf4809cb6f6..fccf3478b866 100644
|
||||
--- extensions/browser/process_manager.cc
|
||||
+++ extensions/browser/process_manager.cc
|
||||
@@ -393,9 +393,17 @@ bool ProcessManager::CreateBackgroundHost(const Extension* extension,
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git chrome/browser/font_family_cache.h chrome/browser/font_family_cache.h
|
||||
index 0e5573a7326a2..28eb26fb7af55 100644
|
||||
index 0e5573a7326a..28eb26fb7af5 100644
|
||||
--- chrome/browser/font_family_cache.h
|
||||
+++ chrome/browser/font_family_cache.h
|
||||
@@ -19,6 +19,8 @@ class Profile;
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git .gn .gn
|
||||
index a7c8ed4b4d7ed..26629eaefc234 100644
|
||||
index a7c8ed4b4d7e..26629eaefc23 100644
|
||||
--- .gn
|
||||
+++ .gn
|
||||
@@ -176,6 +176,8 @@ exec_script_whitelist =
|
||||
@@ -12,7 +12,7 @@ index a7c8ed4b4d7ed..26629eaefc234 100644
|
||||
# https://crbug.com/474506.
|
||||
"//clank/java/BUILD.gn",
|
||||
diff --git BUILD.gn BUILD.gn
|
||||
index 19aee8c70e7a6..94be39e1137fe 100644
|
||||
index 19aee8c70e7a..94be39e1137f 100644
|
||||
--- BUILD.gn
|
||||
+++ BUILD.gn
|
||||
@@ -16,6 +16,7 @@ import("//build/config/sanitizers/sanitizers.gni")
|
||||
@@ -34,7 +34,7 @@ index 19aee8c70e7a6..94be39e1137fe 100644
|
||||
deps += [
|
||||
"//ios:all",
|
||||
diff --git build/config/win/visual_studio_version.gni build/config/win/visual_studio_version.gni
|
||||
index 982fbe8d3f0d0..e757be4688f10 100644
|
||||
index 982fbe8d3f0d..e757be4688f1 100644
|
||||
--- build/config/win/visual_studio_version.gni
|
||||
+++ build/config/win/visual_studio_version.gni
|
||||
@@ -12,9 +12,8 @@ declare_args() {
|
||||
@@ -66,7 +66,7 @@ index 982fbe8d3f0d0..e757be4688f10 100644
|
||||
+ "studio path")
|
||||
}
|
||||
diff --git chrome/app/framework.order chrome/app/framework.order
|
||||
index 839144aa1e9bd..29c8ab32398a7 100644
|
||||
index 839144aa1e9b..29c8ab32398a 100644
|
||||
--- chrome/app/framework.order
|
||||
+++ chrome/app/framework.order
|
||||
@@ -28,3 +28,8 @@ _ChromeMain
|
||||
@@ -79,7 +79,7 @@ index 839144aa1e9bd..29c8ab32398a7 100644
|
||||
+_OBJC_METACLASS_$_UnderlayOpenGLHostingWindow
|
||||
+
|
||||
diff --git chrome/chrome_paks.gni chrome/chrome_paks.gni
|
||||
index 95378c12ca6d9..f8fed0d6c3418 100644
|
||||
index 95378c12ca6d..f8fed0d6c341 100644
|
||||
--- chrome/chrome_paks.gni
|
||||
+++ chrome/chrome_paks.gni
|
||||
@@ -4,6 +4,7 @@
|
||||
@@ -102,7 +102,7 @@ index 95378c12ca6d9..f8fed0d6c3418 100644
|
||||
sources += [
|
||||
"$root_gen_dir/chrome/extensions_resources.pak",
|
||||
diff --git chrome/chrome_repack_locales.gni chrome/chrome_repack_locales.gni
|
||||
index a64a23560460a..b08eee1f789a7 100644
|
||||
index a64a23560460..b08eee1f789a 100644
|
||||
--- chrome/chrome_repack_locales.gni
|
||||
+++ chrome/chrome_repack_locales.gni
|
||||
@@ -6,6 +6,7 @@ import("//build/config/chrome_build.gni")
|
||||
@@ -125,7 +125,7 @@ index a64a23560460a..b08eee1f789a7 100644
|
||||
source_patterns +=
|
||||
[ "${root_gen_dir}/extensions/strings/extensions_strings_" ]
|
||||
diff --git chrome/installer/mini_installer/BUILD.gn chrome/installer/mini_installer/BUILD.gn
|
||||
index 51fa0d7f4cf77..2ede68e9377eb 100644
|
||||
index 51fa0d7f4cf7..2ede68e9377e 100644
|
||||
--- chrome/installer/mini_installer/BUILD.gn
|
||||
+++ chrome/installer/mini_installer/BUILD.gn
|
||||
@@ -6,6 +6,7 @@ import("//build/config/compiler/compiler.gni")
|
||||
@@ -152,7 +152,7 @@ index 51fa0d7f4cf77..2ede68e9377eb 100644
|
||||
outputs = [
|
||||
# See also chrome.packed.7z conditionally added below.
|
||||
diff --git tools/grit/grit_defines.gni tools/grit/grit_defines.gni
|
||||
index 5b92d7a6cd920..ceb274146131c 100644
|
||||
index 5b92d7a6cd92..ceb274146131 100644
|
||||
--- tools/grit/grit_defines.gni
|
||||
+++ tools/grit/grit_defines.gni
|
||||
@@ -5,6 +5,7 @@
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git tools/gritsettings/resource_ids.spec tools/gritsettings/resource_ids.spec
|
||||
index b5b86bb00d59e..2cbb930d9e791 100644
|
||||
index b5b86bb00d59..2cbb930d9e79 100644
|
||||
--- tools/gritsettings/resource_ids.spec
|
||||
+++ tools/gritsettings/resource_ids.spec
|
||||
@@ -784,4 +784,13 @@
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git ui/base/ime/win/input_method_win_base.cc ui/base/ime/win/input_method_win_base.cc
|
||||
index bc80f95a6892a..43a87836ebd3e 100644
|
||||
index bc80f95a6892..43a87836ebd3 100644
|
||||
--- ui/base/ime/win/input_method_win_base.cc
|
||||
+++ ui/base/ime/win/input_method_win_base.cc
|
||||
@@ -262,8 +262,9 @@ bool InputMethodWinBase::IsWindowFocused(const TextInputClient* client) const {
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git third_party/libxml/BUILD.gn third_party/libxml/BUILD.gn
|
||||
index 8068e573cbd48..2fc10cf03bc50 100644
|
||||
index 8068e573cbd4..2fc10cf03bc5 100644
|
||||
--- third_party/libxml/BUILD.gn
|
||||
+++ third_party/libxml/BUILD.gn
|
||||
@@ -142,6 +142,7 @@ static_library("libxml") {
|
||||
|
@@ -1,8 +1,8 @@
|
||||
diff --git base/allocator/partition_allocator/partition_alloc_config.h base/allocator/partition_allocator/partition_alloc_config.h
|
||||
index c5ccd81..6d15bfd 100644
|
||||
index 254476f9eaa4..1cdddaa3b93f 100644
|
||||
--- base/allocator/partition_allocator/partition_alloc_config.h
|
||||
+++ base/allocator/partition_allocator/partition_alloc_config.h
|
||||
@@ -33,9 +33,12 @@
|
||||
@@ -36,9 +36,12 @@ static_assert(sizeof(void*) != 8, "");
|
||||
|
||||
#if defined(PA_HAS_64_BITS_POINTERS) && \
|
||||
(defined(OS_LINUX) || defined(OS_ANDROID))
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git content/browser/child_process_launcher_helper_linux.cc content/browser/child_process_launcher_helper_linux.cc
|
||||
index bbc1d4d057291..a7c7d75f61df6 100644
|
||||
index bbc1d4d05729..a7c7d75f61df 100644
|
||||
--- content/browser/child_process_launcher_helper_linux.cc
|
||||
+++ content/browser/child_process_launcher_helper_linux.cc
|
||||
@@ -162,7 +162,7 @@ void ChildProcessLauncherHelper::SetProcessPriorityOnLauncherThread(
|
||||
@@ -12,7 +12,7 @@ index bbc1d4d057291..a7c7d75f61df6 100644
|
||||
base::File file(exe_dir.Append(path),
|
||||
base::File::FLAG_OPEN | base::File::FLAG_READ);
|
||||
diff --git sandbox/linux/suid/client/setuid_sandbox_host.cc sandbox/linux/suid/client/setuid_sandbox_host.cc
|
||||
index f88c5077c6d63..8a010b882f2b7 100644
|
||||
index f88c5077c6d6..8a010b882f2b 100644
|
||||
--- sandbox/linux/suid/client/setuid_sandbox_host.cc
|
||||
+++ sandbox/linux/suid/client/setuid_sandbox_host.cc
|
||||
@@ -120,7 +120,7 @@ bool SetuidSandboxHost::IsDisabledViaEnvironment() {
|
||||
@@ -25,7 +25,7 @@ index f88c5077c6d63..8a010b882f2b7 100644
|
||||
if (base::PathExists(sandbox_candidate))
|
||||
sandbox_binary = sandbox_candidate;
|
||||
diff --git ui/gl/init/gl_initializer_linux_x11.cc ui/gl/init/gl_initializer_linux_x11.cc
|
||||
index 016046d6caa4f..116e4919cda08 100644
|
||||
index 016046d6caa4..116e4919cda0 100644
|
||||
--- ui/gl/init/gl_initializer_linux_x11.cc
|
||||
+++ ui/gl/init/gl_initializer_linux_x11.cc
|
||||
@@ -82,7 +82,7 @@ bool InitializeStaticEGLInternalFromLibrary(GLImplementation implementation) {
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git build/config/linux/atk/BUILD.gn build/config/linux/atk/BUILD.gn
|
||||
index bc8e27894732a..5d06ce988f25f 100644
|
||||
index bc8e27894732..5d06ce988f25 100644
|
||||
--- build/config/linux/atk/BUILD.gn
|
||||
+++ build/config/linux/atk/BUILD.gn
|
||||
@@ -12,7 +12,7 @@ import("//build/config/ui.gni")
|
||||
@@ -12,7 +12,7 @@ index bc8e27894732a..5d06ce988f25f 100644
|
||||
if (use_atk) {
|
||||
assert(use_glib, "use_atk=true requires that use_glib=true")
|
||||
diff --git build/config/linux/atspi2/BUILD.gn build/config/linux/atspi2/BUILD.gn
|
||||
index 988a995681361..1791ea607550e 100644
|
||||
index 988a99568136..1791ea607550 100644
|
||||
--- build/config/linux/atspi2/BUILD.gn
|
||||
+++ build/config/linux/atspi2/BUILD.gn
|
||||
@@ -6,7 +6,7 @@ import("//build/config/linux/pkg_config.gni")
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git chrome/browser/ui/page_info/chrome_page_info_client.cc chrome/browser/ui/page_info/chrome_page_info_client.cc
|
||||
index e2972da9e548d..2f356616ed97c 100644
|
||||
index e2972da9e548..2f356616ed97 100644
|
||||
--- chrome/browser/ui/page_info/chrome_page_info_client.cc
|
||||
+++ chrome/browser/ui/page_info/chrome_page_info_client.cc
|
||||
@@ -17,5 +17,9 @@ std::unique_ptr<PageInfoDelegate> ChromePageInfoClient::CreatePageInfoDelegate(
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git base/files/file_path_watcher_linux.cc base/files/file_path_watcher_linux.cc
|
||||
index 713444ccb2d3e..6759f454d1563 100644
|
||||
index 713444ccb2d3..6759f454d156 100644
|
||||
--- base/files/file_path_watcher_linux.cc
|
||||
+++ base/files/file_path_watcher_linux.cc
|
||||
@@ -5,6 +5,7 @@
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git content/browser/scheduler/responsiveness/native_event_observer_mac.mm content/browser/scheduler/responsiveness/native_event_observer_mac.mm
|
||||
index 7cb3238e97edb..ae800739b6863 100644
|
||||
index 7cb3238e97ed..ae800739b686 100644
|
||||
--- content/browser/scheduler/responsiveness/native_event_observer_mac.mm
|
||||
+++ content/browser/scheduler/responsiveness/native_event_observer_mac.mm
|
||||
@@ -12,13 +12,15 @@ namespace content {
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git content/browser/renderer_host/input/fling_scheduler_mac.mm content/browser/renderer_host/input/fling_scheduler_mac.mm
|
||||
index f10c5d161dd13..92a751dd984e5 100644
|
||||
index f10c5d161dd1..92a751dd984e 100644
|
||||
--- content/browser/renderer_host/input/fling_scheduler_mac.mm
|
||||
+++ content/browser/renderer_host/input/fling_scheduler_mac.mm
|
||||
@@ -26,6 +26,10 @@ ui::Compositor* FlingSchedulerMac::GetCompositor() {
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git ui/gl/init/gl_initializer_mac.cc ui/gl/init/gl_initializer_mac.cc
|
||||
index 98f3c5a43da3b..55bef97cfc336 100644
|
||||
index 98f3c5a43da3..55bef97cfc33 100644
|
||||
--- ui/gl/init/gl_initializer_mac.cc
|
||||
+++ ui/gl/init/gl_initializer_mac.cc
|
||||
@@ -46,11 +46,8 @@ bool InitializeOneOffForSandbox() {
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git base/message_loop/message_pump_win.cc base/message_loop/message_pump_win.cc
|
||||
index 04a5dcf91d0ca..935c22f9ee963 100644
|
||||
index 04a5dcf91d0c..935c22f9ee96 100644
|
||||
--- base/message_loop/message_pump_win.cc
|
||||
+++ base/message_loop/message_pump_win.cc
|
||||
@@ -2,6 +2,7 @@
|
||||
@@ -30,7 +30,7 @@ index 04a5dcf91d0ca..935c22f9ee963 100644
|
||||
}
|
||||
if (has_msg)
|
||||
diff --git base/task/current_thread.cc base/task/current_thread.cc
|
||||
index 9641285fde742..51cc852fcc165 100644
|
||||
index 9641285fde74..51cc852fcc16 100644
|
||||
--- base/task/current_thread.cc
|
||||
+++ base/task/current_thread.cc
|
||||
@@ -48,6 +48,8 @@ void CurrentThread::AddDestructionObserver(
|
||||
@@ -43,7 +43,7 @@ index 9641285fde742..51cc852fcc165 100644
|
||||
current_->RemoveDestructionObserver(destruction_observer);
|
||||
}
|
||||
diff --git base/task/current_thread.h base/task/current_thread.h
|
||||
index bdcd661bfa282..823a1d02ca858 100644
|
||||
index bdcd661bfa28..823a1d02ca85 100644
|
||||
--- base/task/current_thread.h
|
||||
+++ base/task/current_thread.h
|
||||
@@ -127,6 +127,12 @@ class BASE_EXPORT CurrentThread {
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git base/message_loop/message_pump_mac.mm base/message_loop/message_pump_mac.mm
|
||||
index d085795608eca..b1efb62818635 100644
|
||||
index d085795608ec..b1efb6281863 100644
|
||||
--- base/message_loop/message_pump_mac.mm
|
||||
+++ base/message_loop/message_pump_mac.mm
|
||||
@@ -682,7 +682,8 @@ void MessagePumpUIApplication::Detach() {
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git content/browser/web_contents/web_contents_view.h content/browser/web_contents/web_contents_view.h
|
||||
index cdbc0273838e5..ee2809a0bb98a 100644
|
||||
index cdbc0273838e..ee2809a0bb98 100644
|
||||
--- content/browser/web_contents/web_contents_view.h
|
||||
+++ content/browser/web_contents/web_contents_view.h
|
||||
@@ -22,7 +22,7 @@ struct DropData;
|
||||
@@ -12,7 +12,7 @@ index cdbc0273838e5..ee2809a0bb98a 100644
|
||||
virtual ~WebContentsView() {}
|
||||
|
||||
diff --git extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
|
||||
index a28112a99dfdc..bcd58be410e10 100644
|
||||
index a28112a99dfd..bcd58be410e1 100644
|
||||
--- extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
|
||||
+++ extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
|
||||
@@ -205,6 +205,8 @@ void MimeHandlerViewGuest::CreateWebContents(
|
||||
@@ -48,7 +48,7 @@ index a28112a99dfdc..bcd58be410e10 100644
|
||||
WebContents* source,
|
||||
const content::OpenURLParams& params) {
|
||||
diff --git extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
|
||||
index 7d27e12c4e9a7..fc234840104ea 100644
|
||||
index 7d27e12c4e9a..fc234840104e 100644
|
||||
--- extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
|
||||
+++ extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
|
||||
@@ -130,6 +130,7 @@ class MimeHandlerViewGuest
|
||||
@@ -68,7 +68,7 @@ index 7d27e12c4e9a7..fc234840104ea 100644
|
||||
bool is_embedder_fullscreen_ = false;
|
||||
bool plugin_can_save_ = false;
|
||||
diff --git extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest_delegate.h extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest_delegate.h
|
||||
index 98689e2614604..a1b08274f4556 100644
|
||||
index 98689e261460..a1b08274f455 100644
|
||||
--- extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest_delegate.h
|
||||
+++ extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest_delegate.h
|
||||
@@ -8,9 +8,9 @@
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git net/base/load_flags_list.h net/base/load_flags_list.h
|
||||
index 96d1a51ec1078..e8120a818b1f2 100644
|
||||
index 96d1a51ec107..e8120a818b1f 100644
|
||||
--- net/base/load_flags_list.h
|
||||
+++ net/base/load_flags_list.h
|
||||
@@ -101,3 +101,6 @@ LOAD_FLAG(RESTRICTED_PREFETCH, 1 << 15)
|
||||
@@ -10,7 +10,7 @@ index 96d1a51ec1078..e8120a818b1f2 100644
|
||||
+// This load will not send any cookies. For CEF usage.
|
||||
+LOAD_FLAG(DO_NOT_SEND_COOKIES, 1 << 17)
|
||||
diff --git net/url_request/url_request_http_job.cc net/url_request/url_request_http_job.cc
|
||||
index b2405754498bf..1619937c56eb8 100644
|
||||
index b2405754498b..1619937c56eb 100644
|
||||
--- net/url_request/url_request_http_job.cc
|
||||
+++ net/url_request/url_request_http_job.cc
|
||||
@@ -559,7 +559,8 @@ void URLRequestHttpJob::AddCookieHeaderAndStart() {
|
||||
@@ -24,7 +24,7 @@ index b2405754498bf..1619937c56eb8 100644
|
||||
request_->force_ignore_site_for_cookies();
|
||||
if (cookie_store->cookie_access_delegate() &&
|
||||
diff --git services/network/public/cpp/resource_request.cc services/network/public/cpp/resource_request.cc
|
||||
index ccb92aa863713..51986649b4174 100644
|
||||
index ccb92aa86371..51986649b417 100644
|
||||
--- services/network/public/cpp/resource_request.cc
|
||||
+++ services/network/public/cpp/resource_request.cc
|
||||
@@ -233,7 +233,8 @@ bool ResourceRequest::EqualsForTesting(const ResourceRequest& request) const {
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git content/browser/renderer_host/input/fling_scheduler.cc content/browser/renderer_host/input/fling_scheduler.cc
|
||||
index c7a4f1f0c3d00..7e6e3b4e56d42 100644
|
||||
index c7a4f1f0c3d0..7e6e3b4e56d4 100644
|
||||
--- content/browser/renderer_host/input/fling_scheduler.cc
|
||||
+++ content/browser/renderer_host/input/fling_scheduler.cc
|
||||
@@ -68,6 +68,9 @@ void FlingScheduler::ProgressFlingOnBeginFrameIfneeded(
|
||||
@@ -13,7 +13,7 @@ index c7a4f1f0c3d00..7e6e3b4e56d42 100644
|
||||
if (host_->GetView() && host_->GetView()->GetNativeView() &&
|
||||
host_->GetView()->GetNativeView()->GetHost() &&
|
||||
diff --git content/browser/renderer_host/input/fling_scheduler_base.h content/browser/renderer_host/input/fling_scheduler_base.h
|
||||
index cc4b13a7b9c67..84f3b9ed7cf49 100644
|
||||
index cc4b13a7b9c6..84f3b9ed7cf4 100644
|
||||
--- content/browser/renderer_host/input/fling_scheduler_base.h
|
||||
+++ content/browser/renderer_host/input/fling_scheduler_base.h
|
||||
@@ -7,12 +7,23 @@
|
||||
@@ -41,10 +41,10 @@ index cc4b13a7b9c67..84f3b9ed7cf49 100644
|
||||
|
||||
} // namespace content
|
||||
diff --git content/browser/renderer_host/render_widget_host_impl.cc content/browser/renderer_host/render_widget_host_impl.cc
|
||||
index b38b11e555791..5d8da2cef9b2d 100644
|
||||
index 6a784277073d..247014b1b700 100644
|
||||
--- content/browser/renderer_host/render_widget_host_impl.cc
|
||||
+++ content/browser/renderer_host/render_widget_host_impl.cc
|
||||
@@ -3037,6 +3037,11 @@ void RenderWidgetHostImpl::OnInvalidInputEventSource() {
|
||||
@@ -3043,6 +3043,11 @@ void RenderWidgetHostImpl::OnInvalidInputEventSource() {
|
||||
GetProcess(), bad_message::INPUT_ROUTER_INVALID_EVENT_SOURCE);
|
||||
}
|
||||
|
||||
@@ -57,10 +57,10 @@ index b38b11e555791..5d8da2cef9b2d 100644
|
||||
const WebInputEvent& event) {
|
||||
if ((base::FeatureList::IsEnabled(
|
||||
diff --git content/browser/renderer_host/render_widget_host_impl.h content/browser/renderer_host/render_widget_host_impl.h
|
||||
index ce8aa5ba1f4f5..460dc054a0bcf 100644
|
||||
index bc4800b72f8b..6873c0bdf387 100644
|
||||
--- content/browser/renderer_host/render_widget_host_impl.h
|
||||
+++ content/browser/renderer_host/render_widget_host_impl.h
|
||||
@@ -758,6 +758,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl
|
||||
@@ -759,6 +759,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl
|
||||
|
||||
void ProgressFlingIfNeeded(base::TimeTicks current_time);
|
||||
void StopFling();
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git chrome/browser/download/download_prefs.cc chrome/browser/download/download_prefs.cc
|
||||
index f5ce4b6b6649f..32a176a7cc8fe 100644
|
||||
index f5ce4b6b6649..32a176a7cc8f 100644
|
||||
--- chrome/browser/download/download_prefs.cc
|
||||
+++ chrome/browser/download/download_prefs.cc
|
||||
@@ -24,6 +24,7 @@
|
||||
@@ -34,7 +34,7 @@ index f5ce4b6b6649f..32a176a7cc8fe 100644
|
||||
}
|
||||
|
||||
diff --git chrome/browser/printing/print_preview_dialog_controller.cc chrome/browser/printing/print_preview_dialog_controller.cc
|
||||
index 74536431f6649..3fc69b6560298 100644
|
||||
index 74536431f664..3fc69b656029 100644
|
||||
--- chrome/browser/printing/print_preview_dialog_controller.cc
|
||||
+++ chrome/browser/printing/print_preview_dialog_controller.cc
|
||||
@@ -17,6 +17,7 @@
|
||||
@@ -58,7 +58,7 @@ index 74536431f6649..3fc69b6560298 100644
|
||||
// Add an entry to the map.
|
||||
preview_dialog_map_[preview_dialog] = initiator;
|
||||
diff --git chrome/browser/printing/print_view_manager_base.cc chrome/browser/printing/print_view_manager_base.cc
|
||||
index 376f426b7bab4..c6039e0481712 100644
|
||||
index 88043634ce5f..4f8569f8b5b6 100644
|
||||
--- chrome/browser/printing/print_view_manager_base.cc
|
||||
+++ chrome/browser/printing/print_view_manager_base.cc
|
||||
@@ -21,6 +21,7 @@
|
||||
@@ -80,7 +80,7 @@ index 376f426b7bab4..c6039e0481712 100644
|
||||
#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
|
||||
#include "chrome/browser/printing/print_error_dialog.h"
|
||||
#include "chrome/browser/printing/print_view_manager.h"
|
||||
@@ -237,8 +242,13 @@ PrintViewManager* GetPrintViewManager(int render_process_id,
|
||||
@@ -215,8 +220,13 @@ PrintViewManager* GetPrintViewManager(int render_process_id,
|
||||
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
||||
content::WebContents* web_contents =
|
||||
GetWebContentsForRenderFrame(render_process_id, render_frame_id);
|
||||
@@ -97,10 +97,10 @@ index 376f426b7bab4..c6039e0481712 100644
|
||||
|
||||
void NotifySystemDialogCancelled(int render_process_id, int routing_id) {
|
||||
diff --git chrome/browser/printing/print_view_manager_base.h chrome/browser/printing/print_view_manager_base.h
|
||||
index 62f4dc6083a13..1371b43f6208a 100644
|
||||
index afe34f47cb45..4ff3837e88da 100644
|
||||
--- chrome/browser/printing/print_view_manager_base.h
|
||||
+++ chrome/browser/printing/print_view_manager_base.h
|
||||
@@ -124,9 +124,6 @@ class PrintViewManagerBase : public content::NotificationObserver,
|
||||
@@ -126,9 +126,6 @@ class PrintViewManagerBase : public content::NotificationObserver,
|
||||
// Manages the low-level talk to the printer.
|
||||
scoped_refptr<PrintJob> print_job_;
|
||||
|
||||
@@ -111,7 +111,7 @@ index 62f4dc6083a13..1371b43f6208a 100644
|
||||
void Observe(int type,
|
||||
const content::NotificationSource& source,
|
||||
diff --git chrome/browser/resources/print_preview/ui/destination_dialog.html chrome/browser/resources/print_preview/ui/destination_dialog.html
|
||||
index 920f646f06484..76c0b5e5ee04b 100644
|
||||
index 920f646f0648..76c0b5e5ee04 100644
|
||||
--- chrome/browser/resources/print_preview/ui/destination_dialog.html
|
||||
+++ chrome/browser/resources/print_preview/ui/destination_dialog.html
|
||||
@@ -25,10 +25,7 @@
|
||||
@@ -127,7 +127,7 @@ index 920f646f06484..76c0b5e5ee04b 100644
|
||||
$i18n{cancel}
|
||||
</cr-button>
|
||||
diff --git chrome/browser/ui/webui/constrained_web_dialog_ui.cc chrome/browser/ui/webui/constrained_web_dialog_ui.cc
|
||||
index 3d415a60d4361..807ab41ee6ef1 100644
|
||||
index 3d415a60d436..807ab41ee6ef 100644
|
||||
--- chrome/browser/ui/webui/constrained_web_dialog_ui.cc
|
||||
+++ chrome/browser/ui/webui/constrained_web_dialog_ui.cc
|
||||
@@ -26,6 +26,8 @@
|
||||
@@ -151,7 +151,7 @@ index 3d415a60d4361..807ab41ee6ef1 100644
|
||||
|
||||
ConstrainedWebDialogUI::~ConstrainedWebDialogUI() {
|
||||
diff --git chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc
|
||||
index bb1a2238af55c..b825289863d57 100644
|
||||
index bb1a2238af55..b825289863d5 100644
|
||||
--- chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc
|
||||
+++ chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc
|
||||
@@ -21,6 +21,7 @@
|
||||
@@ -253,7 +253,7 @@ index bb1a2238af55c..b825289863d57 100644
|
||||
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
drive::DriveIntegrationService* drive_service =
|
||||
diff --git chrome/browser/ui/webui/print_preview/pdf_printer_handler.h chrome/browser/ui/webui/print_preview/pdf_printer_handler.h
|
||||
index 143c97225fac7..90b6e9549589e 100644
|
||||
index 143c97225fac..90b6e9549589 100644
|
||||
--- chrome/browser/ui/webui/print_preview/pdf_printer_handler.h
|
||||
+++ chrome/browser/ui/webui/print_preview/pdf_printer_handler.h
|
||||
@@ -11,6 +11,7 @@
|
||||
@@ -281,7 +281,7 @@ index 143c97225fac7..90b6e9549589e 100644
|
||||
base::FilePath GetSaveLocation() const;
|
||||
|
||||
diff --git chrome/browser/ui/webui/print_preview/print_preview_handler.cc chrome/browser/ui/webui/print_preview/print_preview_handler.cc
|
||||
index 058c76f2a3f8c..3eda3a8f46d9a 100644
|
||||
index 48cb2bf9ecef..97e02074d215 100644
|
||||
--- chrome/browser/ui/webui/print_preview/print_preview_handler.cc
|
||||
+++ chrome/browser/ui/webui/print_preview/print_preview_handler.cc
|
||||
@@ -25,6 +25,7 @@
|
||||
@@ -292,7 +292,7 @@ index 058c76f2a3f8c..3eda3a8f46d9a 100644
|
||||
#include "chrome/browser/account_manager_facade_factory.h"
|
||||
#include "chrome/browser/app_mode/app_mode_utils.h"
|
||||
#include "chrome/browser/bad_message.h"
|
||||
@@ -1107,7 +1108,7 @@ PrinterHandler* PrintPreviewHandler::GetPrinterHandler(
|
||||
@@ -1110,7 +1111,7 @@ PrinterHandler* PrintPreviewHandler::GetPrinterHandler(
|
||||
}
|
||||
return extension_printer_handler_.get();
|
||||
}
|
||||
@@ -301,7 +301,7 @@ index 058c76f2a3f8c..3eda3a8f46d9a 100644
|
||||
if (printer_type == PrinterType::kPrivet &&
|
||||
GetPrefs()->GetBoolean(prefs::kForceEnablePrivetPrinting)) {
|
||||
if (!privet_printer_handler_) {
|
||||
@@ -1116,6 +1117,9 @@ PrinterHandler* PrintPreviewHandler::GetPrinterHandler(
|
||||
@@ -1119,6 +1120,9 @@ PrinterHandler* PrintPreviewHandler::GetPrinterHandler(
|
||||
}
|
||||
return privet_printer_handler_.get();
|
||||
}
|
||||
@@ -312,7 +312,7 @@ index 058c76f2a3f8c..3eda3a8f46d9a 100644
|
||||
if (printer_type == PrinterType::kPdf) {
|
||||
if (!pdf_printer_handler_) {
|
||||
diff --git chrome/browser/ui/webui/print_preview/print_preview_ui.cc chrome/browser/ui/webui/print_preview/print_preview_ui.cc
|
||||
index f98201bb37881..7e4d2f2ee19ff 100644
|
||||
index f98201bb3788..7e4d2f2ee19f 100644
|
||||
--- chrome/browser/ui/webui/print_preview/print_preview_ui.cc
|
||||
+++ chrome/browser/ui/webui/print_preview/print_preview_ui.cc
|
||||
@@ -29,6 +29,7 @@
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git chrome/browser/printing/print_job_worker.cc chrome/browser/printing/print_job_worker.cc
|
||||
index f2ba13cb21d66..6be5e94c01298 100644
|
||||
index f2ba13cb21d6..6be5e94c0129 100644
|
||||
--- chrome/browser/printing/print_job_worker.cc
|
||||
+++ chrome/browser/printing/print_job_worker.cc
|
||||
@@ -139,6 +139,7 @@ PrintJobWorker::PrintJobWorker(int render_process_id, int render_frame_id)
|
||||
@@ -11,7 +11,7 @@ index f2ba13cb21d66..6be5e94c01298 100644
|
||||
|
||||
PrintJobWorker::~PrintJobWorker() {
|
||||
diff --git printing/printing_context.h printing/printing_context.h
|
||||
index 5c300fa414fbb..84da337deeca4 100644
|
||||
index 5c300fa414fb..84da337deeca 100644
|
||||
--- printing/printing_context.h
|
||||
+++ printing/printing_context.h
|
||||
@@ -133,6 +133,13 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git content/browser/renderer_host/render_view_host_impl.cc content/browser/renderer_host/render_view_host_impl.cc
|
||||
index 542d78525863f..52b20fa87183d 100644
|
||||
index 542d78525863..52b20fa87183 100644
|
||||
--- content/browser/renderer_host/render_view_host_impl.cc
|
||||
+++ content/browser/renderer_host/render_view_host_impl.cc
|
||||
@@ -613,6 +613,8 @@ bool RenderViewHostImpl::IsRenderViewLive() {
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git chrome/browser/renderer_preferences_util.cc chrome/browser/renderer_preferences_util.cc
|
||||
index 4c2658b79dc4e..a365b325210a8 100644
|
||||
index 4c2658b79dc4..a365b325210a 100644
|
||||
--- chrome/browser/renderer_preferences_util.cc
|
||||
+++ chrome/browser/renderer_preferences_util.cc
|
||||
@@ -42,7 +42,8 @@
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git ui/base/resource/resource_bundle.cc ui/base/resource/resource_bundle.cc
|
||||
index 65b1649050a15..a8f3df15f6602 100644
|
||||
index 65b1649050a1..a8f3df15f660 100644
|
||||
--- ui/base/resource/resource_bundle.cc
|
||||
+++ ui/base/resource/resource_bundle.cc
|
||||
@@ -841,6 +841,12 @@ ResourceBundle::ResourceBundle(Delegate* delegate)
|
||||
@@ -28,7 +28,7 @@ index 65b1649050a15..a8f3df15f6602 100644
|
||||
void ResourceBundle::InitSharedInstance(Delegate* delegate) {
|
||||
DCHECK(g_shared_instance_ == nullptr) << "ResourceBundle initialized twice";
|
||||
diff --git ui/base/resource/resource_bundle.h ui/base/resource/resource_bundle.h
|
||||
index c20987a4b16fa..dda56a25f777e 100644
|
||||
index c20987a4b16f..dda56a25f777 100644
|
||||
--- ui/base/resource/resource_bundle.h
|
||||
+++ ui/base/resource/resource_bundle.h
|
||||
@@ -191,6 +191,11 @@ class COMPONENT_EXPORT(UI_BASE) ResourceBundle {
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git build/toolchain/win/setup_toolchain.py build/toolchain/win/setup_toolchain.py
|
||||
index c1d2fa2ce0aa2..d1d215f35ac12 100644
|
||||
index c1d2fa2ce0aa..d1d215f35ac1 100644
|
||||
--- build/toolchain/win/setup_toolchain.py
|
||||
+++ build/toolchain/win/setup_toolchain.py
|
||||
@@ -154,13 +154,17 @@ def _LoadToolchainEnv(cpu, toolchain_root, sdk_dir, target_store):
|
||||
@@ -26,7 +26,7 @@ index c1d2fa2ce0aa2..d1d215f35ac12 100644
|
||||
if (cpu != 'x64'):
|
||||
# x64 is default target CPU thus any other CPU requires a target set
|
||||
diff --git build/vs_toolchain.py build/vs_toolchain.py
|
||||
index c3b1182b75b4f..04a472b149d42 100755
|
||||
index c3b1182b75b4..04a472b149d4 100755
|
||||
--- build/vs_toolchain.py
|
||||
+++ build/vs_toolchain.py
|
||||
@@ -102,9 +102,16 @@ def SetEnvironmentAndGetRuntimeDllDirs():
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git content/browser/renderer_host/render_widget_host_view_aura.cc content/browser/renderer_host/render_widget_host_view_aura.cc
|
||||
index b8ae3c5d06c09..f3a871dcc7e5d 100644
|
||||
index b8ae3c5d06c0..f3a871dcc7e5 100644
|
||||
--- content/browser/renderer_host/render_widget_host_view_aura.cc
|
||||
+++ content/browser/renderer_host/render_widget_host_view_aura.cc
|
||||
@@ -646,10 +646,12 @@ gfx::Rect RenderWidgetHostViewAura::GetViewBounds() {
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git chrome/browser/net/profile_network_context_service.cc chrome/browser/net/profile_network_context_service.cc
|
||||
index 99455d0c26355..d64e53232822a 100644
|
||||
index 99455d0c2635..d64e53232822 100644
|
||||
--- chrome/browser/net/profile_network_context_service.cc
|
||||
+++ chrome/browser/net/profile_network_context_service.cc
|
||||
@@ -21,6 +21,7 @@
|
||||
@@ -42,7 +42,7 @@ index 99455d0c26355..d64e53232822a 100644
|
||||
// change.
|
||||
network_context_params->http_server_properties_path =
|
||||
diff --git net/cookies/cookie_monster.cc net/cookies/cookie_monster.cc
|
||||
index 4183288fd5da1..2ecb3ed351bba 100644
|
||||
index 4183288fd5da..2ecb3ed351bb 100644
|
||||
--- net/cookies/cookie_monster.cc
|
||||
+++ net/cookies/cookie_monster.cc
|
||||
@@ -515,6 +515,25 @@ void CookieMonster::SetCookieableSchemes(
|
||||
@@ -72,7 +72,7 @@ index 4183288fd5da1..2ecb3ed351bba 100644
|
||||
void CookieMonster::SetPersistSessionCookies(bool persist_session_cookies) {
|
||||
DCHECK(thread_checker_.CalledOnValidThread());
|
||||
diff --git net/cookies/cookie_monster.h net/cookies/cookie_monster.h
|
||||
index ef391b3cb94f1..8962106d08688 100644
|
||||
index ef391b3cb94f..8962106d0868 100644
|
||||
--- net/cookies/cookie_monster.h
|
||||
+++ net/cookies/cookie_monster.h
|
||||
@@ -182,6 +182,8 @@ class NET_EXPORT CookieMonster : public CookieStore {
|
||||
@@ -85,7 +85,7 @@ index ef391b3cb94f1..8962106d08688 100644
|
||||
// Enables writing session cookies into the cookie database. If this this
|
||||
// method is called, it must be called before first use of the instance
|
||||
diff --git net/cookies/cookie_store.h net/cookies/cookie_store.h
|
||||
index afa99e255bdf1..5e8201696c613 100644
|
||||
index afa99e255bdf..5e8201696c61 100644
|
||||
--- net/cookies/cookie_store.h
|
||||
+++ net/cookies/cookie_store.h
|
||||
@@ -156,6 +156,11 @@ class NET_EXPORT CookieStore {
|
||||
@@ -101,7 +101,7 @@ index afa99e255bdf1..5e8201696c613 100644
|
||||
virtual void DumpMemoryStats(base::trace_event::ProcessMemoryDump* pmd,
|
||||
const std::string& parent_absolute_name) const;
|
||||
diff --git services/network/cookie_manager.cc services/network/cookie_manager.cc
|
||||
index a397306372054..8a1bacea8d70c 100644
|
||||
index a39730637205..8a1bacea8d70 100644
|
||||
--- services/network/cookie_manager.cc
|
||||
+++ services/network/cookie_manager.cc
|
||||
@@ -249,14 +249,9 @@ void CookieManager::FlushCookieStore(FlushCookieStoreCallback callback) {
|
||||
@@ -123,7 +123,7 @@ index a397306372054..8a1bacea8d70c 100644
|
||||
|
||||
void CookieManager::SetForceKeepSessionState() {
|
||||
diff --git services/network/network_context.cc services/network/network_context.cc
|
||||
index e606e81f99451..89c29adfb3a09 100644
|
||||
index e606e81f9945..89c29adfb3a0 100644
|
||||
--- services/network/network_context.cc
|
||||
+++ services/network/network_context.cc
|
||||
@@ -2003,16 +2003,27 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
|
||||
@@ -157,7 +157,7 @@ index e606e81f99451..89c29adfb3a09 100644
|
||||
trust_token_store_ = std::make_unique<PendingTrustTokenStore>();
|
||||
|
||||
diff --git services/network/public/mojom/network_context.mojom services/network/public/mojom/network_context.mojom
|
||||
index e24ec4cb3c49a..b8d3aec99d8af 100644
|
||||
index e24ec4cb3c49..b8d3aec99d8a 100644
|
||||
--- services/network/public/mojom/network_context.mojom
|
||||
+++ services/network/public/mojom/network_context.mojom
|
||||
@@ -252,6 +252,9 @@ struct NetworkContextParams {
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git content/browser/storage_partition_impl.cc content/browser/storage_partition_impl.cc
|
||||
index 4bb577abb154e..c0b5aba74ab16 100644
|
||||
index 4bb577abb154..c0b5aba74ab1 100644
|
||||
--- content/browser/storage_partition_impl.cc
|
||||
+++ content/browser/storage_partition_impl.cc
|
||||
@@ -494,10 +494,6 @@ class LoginHandlerDelegate {
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git ui/views/controls/native/native_view_host.cc ui/views/controls/native/native_view_host.cc
|
||||
index 1a85a7b4a8305..66817eaecd86b 100644
|
||||
index 1a85a7b4a830..66817eaecd86 100644
|
||||
--- ui/views/controls/native/native_view_host.cc
|
||||
+++ ui/views/controls/native/native_view_host.cc
|
||||
@@ -161,7 +161,7 @@ void NativeViewHost::OnPaint(gfx::Canvas* canvas) {
|
||||
@@ -12,7 +12,7 @@ index 1a85a7b4a8305..66817eaecd86b 100644
|
||||
|
||||
void NativeViewHost::VisibilityChanged(View* starting_from, bool is_visible) {
|
||||
diff --git ui/views/controls/native/native_view_host.h ui/views/controls/native/native_view_host.h
|
||||
index ab2371857a00a..8dccc190fa896 100644
|
||||
index ab2371857a00..8dccc190fa89 100644
|
||||
--- ui/views/controls/native/native_view_host.h
|
||||
+++ ui/views/controls/native/native_view_host.h
|
||||
@@ -95,6 +95,12 @@ class VIEWS_EXPORT NativeViewHost : public View {
|
||||
@@ -39,7 +39,7 @@ index ab2371857a00a..8dccc190fa896 100644
|
||||
};
|
||||
|
||||
diff --git ui/views/controls/webview/webview.cc ui/views/controls/webview/webview.cc
|
||||
index 75c1f03c6efff..5ed55bb974958 100644
|
||||
index 75c1f03c6eff..5ed55bb97495 100644
|
||||
--- ui/views/controls/webview/webview.cc
|
||||
+++ ui/views/controls/webview/webview.cc
|
||||
@@ -131,6 +131,10 @@ void WebView::EnableSizingFromWebContents(const gfx::Size& min_size,
|
||||
@@ -54,7 +54,7 @@ index 75c1f03c6efff..5ed55bb974958 100644
|
||||
if (crashed_overlay_view_ == crashed_overlay_view)
|
||||
return;
|
||||
diff --git ui/views/controls/webview/webview.h ui/views/controls/webview/webview.h
|
||||
index 1bb2399d0d139..5bb1fcde4e3bc 100644
|
||||
index 1bb2399d0d13..5bb1fcde4e3b 100644
|
||||
--- ui/views/controls/webview/webview.h
|
||||
+++ ui/views/controls/webview/webview.h
|
||||
@@ -78,6 +78,10 @@ class WEBVIEW_EXPORT WebView : public View,
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git content/browser/blob_storage/chrome_blob_storage_context.cc content/browser/blob_storage/chrome_blob_storage_context.cc
|
||||
index 4960b1067e1c4..2686fa5bc550b 100644
|
||||
index 4960b1067e1c..2686fa5bc550 100644
|
||||
--- content/browser/blob_storage/chrome_blob_storage_context.cc
|
||||
+++ content/browser/blob_storage/chrome_blob_storage_context.cc
|
||||
@@ -120,7 +120,8 @@ ChromeBlobStorageContext* ChromeBlobStorageContext::GetFor(
|
||||
@@ -13,7 +13,7 @@ index 4960b1067e1c4..2686fa5bc550b 100644
|
||||
{base::MayBlock(), base::TaskPriority::USER_VISIBLE,
|
||||
base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN});
|
||||
diff --git content/browser/browser_context.cc content/browser/browser_context.cc
|
||||
index a7734981fc762..7137c46a38d5c 100644
|
||||
index a7734981fc76..7137c46a38d5 100644
|
||||
--- content/browser/browser_context.cc
|
||||
+++ content/browser/browser_context.cc
|
||||
@@ -141,7 +141,7 @@ StoragePartition* BrowserContext::GetStoragePartition(
|
||||
@@ -36,7 +36,7 @@ index a7734981fc762..7137c46a38d5c 100644
|
||||
std::unique_ptr<media::VideoDecodeStatsDB> stats_db;
|
||||
if (use_in_memory_db) {
|
||||
diff --git content/public/browser/storage_partition_config.cc content/public/browser/storage_partition_config.cc
|
||||
index 0095de1d05fd1..0e651cbcbe541 100644
|
||||
index 0095de1d05fd..0e651cbcbe54 100644
|
||||
--- content/public/browser/storage_partition_config.cc
|
||||
+++ content/public/browser/storage_partition_config.cc
|
||||
@@ -7,6 +7,7 @@
|
||||
@@ -58,7 +58,7 @@ index 0095de1d05fd1..0e651cbcbe541 100644
|
||||
|
||||
// static
|
||||
diff --git storage/browser/database/database_tracker.cc storage/browser/database/database_tracker.cc
|
||||
index 2bdd932ceb3a0..5a35d16ccd5aa 100644
|
||||
index 2bdd932ceb3a..5a35d16ccd5a 100644
|
||||
--- storage/browser/database/database_tracker.cc
|
||||
+++ storage/browser/database/database_tracker.cc
|
||||
@@ -495,7 +495,7 @@ bool DatabaseTracker::LazyInit() {
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git base/trace_event/builtin_categories.h base/trace_event/builtin_categories.h
|
||||
index 563674ae96317..953c378ff7e57 100644
|
||||
index a090b51cadf8..e62f1ea2db1c 100644
|
||||
--- base/trace_event/builtin_categories.h
|
||||
+++ base/trace_event/builtin_categories.h
|
||||
@@ -61,6 +61,8 @@
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git ui/base/x/x11_os_exchange_data_provider.cc ui/base/x/x11_os_exchange_data_provider.cc
|
||||
index cbf6e7f50b83a..2786d99a8b936 100644
|
||||
index cbf6e7f50b83..2786d99a8b93 100644
|
||||
--- ui/base/x/x11_os_exchange_data_provider.cc
|
||||
+++ ui/base/x/x11_os_exchange_data_provider.cc
|
||||
@@ -122,7 +122,8 @@ void XOSExchangeDataProvider::SetURL(const GURL& url,
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git ui/base/cocoa/underlay_opengl_hosting_window.h ui/base/cocoa/underlay_opengl_hosting_window.h
|
||||
index ec1c6c972ee8d..9f73342051325 100644
|
||||
index ec1c6c972ee8..9f7334205132 100644
|
||||
--- ui/base/cocoa/underlay_opengl_hosting_window.h
|
||||
+++ ui/base/cocoa/underlay_opengl_hosting_window.h
|
||||
@@ -12,7 +12,7 @@
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git ui/base/models/menu_model.h ui/base/models/menu_model.h
|
||||
index 279be87a33e9e..f295fdac67165 100644
|
||||
index 279be87a33e9..f295fdac6716 100644
|
||||
--- ui/base/models/menu_model.h
|
||||
+++ ui/base/models/menu_model.h
|
||||
@@ -14,8 +14,11 @@
|
||||
@@ -43,7 +43,7 @@ index 279be87a33e9e..f295fdac67165 100644
|
||||
virtual void MenuWillShow() {}
|
||||
|
||||
diff --git ui/gfx/render_text.cc ui/gfx/render_text.cc
|
||||
index fbefbf0072674..159fad0893fdb 100644
|
||||
index fbefbf007267..159fad0893fd 100644
|
||||
--- ui/gfx/render_text.cc
|
||||
+++ ui/gfx/render_text.cc
|
||||
@@ -621,6 +621,14 @@ void RenderText::SetWhitespaceElision(absl::optional<bool> whitespace_elision) {
|
||||
@@ -82,7 +82,7 @@ index fbefbf0072674..159fad0893fdb 100644
|
||||
}
|
||||
|
||||
diff --git ui/gfx/render_text.h ui/gfx/render_text.h
|
||||
index 36811695d23a5..db6b5f8bb08a4 100644
|
||||
index 36811695d23a..db6b5f8bb08a 100644
|
||||
--- ui/gfx/render_text.h
|
||||
+++ ui/gfx/render_text.h
|
||||
@@ -342,6 +342,10 @@ class GFX_EXPORT RenderText {
|
||||
@@ -106,7 +106,7 @@ index 36811695d23a5..db6b5f8bb08a4 100644
|
||||
|
||||
} // namespace gfx
|
||||
diff --git ui/views/animation/ink_drop_host_view.h ui/views/animation/ink_drop_host_view.h
|
||||
index ac018b1298052..090b4949625ae 100644
|
||||
index ac018b129805..090b4949625a 100644
|
||||
--- ui/views/animation/ink_drop_host_view.h
|
||||
+++ ui/views/animation/ink_drop_host_view.h
|
||||
@@ -184,6 +184,8 @@ class VIEWS_EXPORT InkDropHost {
|
||||
@@ -119,7 +119,7 @@ index ac018b1298052..090b4949625ae 100644
|
||||
friend class test::InkDropHostTestApi;
|
||||
|
||||
diff --git ui/views/controls/button/label_button.cc ui/views/controls/button/label_button.cc
|
||||
index 86ddd3569f4eb..7a9dbe264225a 100644
|
||||
index 86ddd3569f4e..7a9dbe264225 100644
|
||||
--- ui/views/controls/button/label_button.cc
|
||||
+++ ui/views/controls/button/label_button.cc
|
||||
@@ -500,6 +500,12 @@ void LabelButton::OnThemeChanged() {
|
||||
@@ -136,7 +136,7 @@ index 86ddd3569f4eb..7a9dbe264225a 100644
|
||||
Button::StateChanged(old_state);
|
||||
ResetLabelEnabledColor();
|
||||
diff --git ui/views/controls/button/label_button.h ui/views/controls/button/label_button.h
|
||||
index a3b83cbd72090..a1ff21bc5cc20 100644
|
||||
index a3b83cbd7209..a1ff21bc5cc2 100644
|
||||
--- ui/views/controls/button/label_button.h
|
||||
+++ ui/views/controls/button/label_button.h
|
||||
@@ -133,6 +133,9 @@ class VIEWS_EXPORT LabelButton : public Button, public NativeThemeDelegate {
|
||||
@@ -150,7 +150,7 @@ index a3b83cbd72090..a1ff21bc5cc20 100644
|
||||
ImageView* image() const { return image_; }
|
||||
Label* label() const { return label_; }
|
||||
diff --git ui/views/controls/label.cc ui/views/controls/label.cc
|
||||
index 70d319e79c6f7..1cd58d7bb0b13 100644
|
||||
index 70d319e79c6f..1cd58d7bb0b1 100644
|
||||
--- ui/views/controls/label.cc
|
||||
+++ ui/views/controls/label.cc
|
||||
@@ -51,12 +51,27 @@ enum LabelPropertyKey {
|
||||
@@ -215,7 +215,7 @@ index 70d319e79c6f7..1cd58d7bb0b13 100644
|
||||
}
|
||||
|
||||
diff --git ui/views/controls/label.h ui/views/controls/label.h
|
||||
index 0e8b88dc404f0..2f50228d3b804 100644
|
||||
index 0e8b88dc404f..2f50228d3b80 100644
|
||||
--- ui/views/controls/label.h
|
||||
+++ ui/views/controls/label.h
|
||||
@@ -225,6 +225,10 @@ class VIEWS_EXPORT Label : public View,
|
||||
@@ -238,7 +238,7 @@ index 0e8b88dc404f0..2f50228d3b804 100644
|
||||
std::unique_ptr<SelectionController> selection_controller_;
|
||||
|
||||
diff --git ui/views/controls/menu/menu_controller.cc ui/views/controls/menu/menu_controller.cc
|
||||
index e9edd19929aa2..5ffcbe7374ba9 100644
|
||||
index e9edd19929aa..5ffcbe7374ba 100644
|
||||
--- ui/views/controls/menu/menu_controller.cc
|
||||
+++ ui/views/controls/menu/menu_controller.cc
|
||||
@@ -2760,8 +2760,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem(
|
||||
@@ -269,7 +269,7 @@ index e9edd19929aa2..5ffcbe7374ba9 100644
|
||||
SetSelection(item, SELECTION_UPDATE_IMMEDIATELY);
|
||||
else if (item->GetParentMenuItem()->GetParentMenuItem())
|
||||
diff --git ui/views/controls/menu/menu_delegate.h ui/views/controls/menu/menu_delegate.h
|
||||
index a280e9d74016e..59a8eda9b1d84 100644
|
||||
index a280e9d74016..59a8eda9b1d8 100644
|
||||
--- ui/views/controls/menu/menu_delegate.h
|
||||
+++ ui/views/controls/menu/menu_delegate.h
|
||||
@@ -79,6 +79,22 @@ class VIEWS_EXPORT MenuDelegate {
|
||||
@@ -308,7 +308,7 @@ index a280e9d74016e..59a8eda9b1d84 100644
|
||||
virtual int GetMaxWidthForMenu(MenuItemView* menu);
|
||||
|
||||
diff --git ui/views/controls/menu/menu_item_view.cc ui/views/controls/menu/menu_item_view.cc
|
||||
index 3232a9147d8da..b4431a6a0503e 100644
|
||||
index 3232a9147d8d..b4431a6a0503 100644
|
||||
--- ui/views/controls/menu/menu_item_view.cc
|
||||
+++ ui/views/controls/menu/menu_item_view.cc
|
||||
@@ -1071,6 +1071,15 @@ void MenuItemView::PaintBackground(gfx::Canvas* canvas,
|
||||
@@ -342,7 +342,7 @@ index 3232a9147d8da..b4431a6a0503e 100644
|
||||
GetMenuController() && GetMenuController()->use_touchable_layout()
|
||||
? style::CONTEXT_TOUCH_MENU
|
||||
diff --git ui/views/controls/menu/menu_model_adapter.cc ui/views/controls/menu/menu_model_adapter.cc
|
||||
index 6dcbba931eb9a..b5d21864b7384 100644
|
||||
index 6dcbba931eb9..b5d21864b738 100644
|
||||
--- ui/views/controls/menu/menu_model_adapter.cc
|
||||
+++ ui/views/controls/menu/menu_model_adapter.cc
|
||||
@@ -244,6 +244,77 @@ bool MenuModelAdapter::IsItemChecked(int id) const {
|
||||
@@ -424,7 +424,7 @@ index 6dcbba931eb9a..b5d21864b7384 100644
|
||||
// Look up the menu model for this menu.
|
||||
const std::map<MenuItemView*, ui::MenuModel*>::const_iterator map_iterator =
|
||||
diff --git ui/views/controls/menu/menu_model_adapter.h ui/views/controls/menu/menu_model_adapter.h
|
||||
index c7aaf7286b74d..2ba3a9c10fe03 100644
|
||||
index c7aaf7286b74..2ba3a9c10fe0 100644
|
||||
--- ui/views/controls/menu/menu_model_adapter.h
|
||||
+++ ui/views/controls/menu/menu_model_adapter.h
|
||||
@@ -84,6 +84,20 @@ class VIEWS_EXPORT MenuModelAdapter : public MenuDelegate,
|
||||
@@ -449,7 +449,7 @@ index c7aaf7286b74d..2ba3a9c10fe03 100644
|
||||
void WillHideMenu(MenuItemView* menu) override;
|
||||
void OnMenuClosed(MenuItemView* menu) override;
|
||||
diff --git ui/views/controls/menu/menu_scroll_view_container.cc ui/views/controls/menu/menu_scroll_view_container.cc
|
||||
index 8522b0b4bb779..58f44f4f766c7 100644
|
||||
index 8522b0b4bb77..58f44f4f766c 100644
|
||||
--- ui/views/controls/menu/menu_scroll_view_container.cc
|
||||
+++ ui/views/controls/menu/menu_scroll_view_container.cc
|
||||
@@ -234,6 +234,11 @@ MenuScrollViewContainer::MenuScrollViewContainer(SubmenuView* content_view)
|
||||
@@ -465,7 +465,7 @@ index 8522b0b4bb779..58f44f4f766c7 100644
|
||||
content_view_->GetMenuItem()->GetMenuController()->GetAnchorPosition());
|
||||
|
||||
diff --git ui/views/test/ui_controls_factory_desktop_aurax11.cc ui/views/test/ui_controls_factory_desktop_aurax11.cc
|
||||
index 64e09ff4359a8..714e8e9ff6610 100644
|
||||
index 64e09ff4359a..714e8e9ff661 100644
|
||||
--- ui/views/test/ui_controls_factory_desktop_aurax11.cc
|
||||
+++ ui/views/test/ui_controls_factory_desktop_aurax11.cc
|
||||
@@ -89,10 +89,6 @@ class UIControlsDesktopX11 : public UIControlsAura {
|
||||
@@ -480,7 +480,7 @@ index 64e09ff4359a8..714e8e9ff6610 100644
|
||||
x11_ui_controls_test_helper_.ButtonDownMask() == 0) {
|
||||
// Move the cursor because EnterNotify/LeaveNotify are generated with the
|
||||
diff --git ui/views/view.h ui/views/view.h
|
||||
index cd9069a34ec6a..317bca771298d 100644
|
||||
index cd9069a34ec6..317bca771298 100644
|
||||
--- ui/views/view.h
|
||||
+++ ui/views/view.h
|
||||
@@ -20,6 +20,7 @@
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git content/browser/renderer_host/render_widget_host_view_base.cc content/browser/renderer_host/render_widget_host_view_base.cc
|
||||
index ec0d6b0acbc89..13669d872d9b7 100644
|
||||
index ec0d6b0acbc8..13669d872d9b 100644
|
||||
--- content/browser/renderer_host/render_widget_host_view_base.cc
|
||||
+++ content/browser/renderer_host/render_widget_host_view_base.cc
|
||||
@@ -621,6 +621,14 @@ float RenderWidgetHostViewBase::GetDeviceScaleFactor() {
|
||||
@@ -18,7 +18,7 @@ index ec0d6b0acbc89..13669d872d9b7 100644
|
||||
if (!GetMouseWheelPhaseHandler())
|
||||
return;
|
||||
diff --git content/browser/renderer_host/render_widget_host_view_base.h content/browser/renderer_host/render_widget_host_view_base.h
|
||||
index 8cc591cfc75a0..0df0e0334c551 100644
|
||||
index 8cc591cfc75a..0df0e0334c55 100644
|
||||
--- content/browser/renderer_host/render_widget_host_view_base.h
|
||||
+++ content/browser/renderer_host/render_widget_host_view_base.h
|
||||
@@ -66,6 +66,7 @@ class CursorManager;
|
||||
@@ -63,7 +63,7 @@ index 8cc591cfc75a0..0df0e0334c551 100644
|
||||
FRIEND_TEST_ALL_PREFIXES(
|
||||
BrowserSideFlingBrowserTest,
|
||||
diff --git content/browser/renderer_host/render_widget_host_view_event_handler.cc content/browser/renderer_host/render_widget_host_view_event_handler.cc
|
||||
index f4dbe7b3e5165..07fbd12d0289e 100644
|
||||
index f4dbe7b3e516..07fbd12d0289 100644
|
||||
--- content/browser/renderer_host/render_widget_host_view_event_handler.cc
|
||||
+++ content/browser/renderer_host/render_widget_host_view_event_handler.cc
|
||||
@@ -38,6 +38,10 @@
|
||||
@@ -111,7 +111,7 @@ index f4dbe7b3e5165..07fbd12d0289e 100644
|
||||
if (host_ && set_focus_on_mouse_down_or_key_event_) {
|
||||
set_focus_on_mouse_down_or_key_event_ = false;
|
||||
diff --git content/public/browser/render_widget_host_view.h content/public/browser/render_widget_host_view.h
|
||||
index 8c85abb161f5c..831113822daac 100644
|
||||
index 8c85abb161f5..831113822daa 100644
|
||||
--- content/public/browser/render_widget_host_view.h
|
||||
+++ content/public/browser/render_widget_host_view.h
|
||||
@@ -249,6 +249,14 @@ class CONTENT_EXPORT RenderWidgetHostView {
|
||||
@@ -130,7 +130,7 @@ index 8c85abb161f5c..831113822daac 100644
|
||||
// Set the view's active state (i.e., tint state of controls).
|
||||
virtual void SetActive(bool active) = 0;
|
||||
diff --git ui/platform_window/x11/x11_window.cc ui/platform_window/x11/x11_window.cc
|
||||
index ce480a898c75f..bc9d56403036a 100644
|
||||
index ce480a898c75..bc9d56403036 100644
|
||||
--- ui/platform_window/x11/x11_window.cc
|
||||
+++ ui/platform_window/x11/x11_window.cc
|
||||
@@ -1608,7 +1608,8 @@ void X11Window::CreateXWindow(const PlatformWindowInitProperties& properties) {
|
||||
@@ -144,7 +144,7 @@ index ce480a898c75f..bc9d56403036a 100644
|
||||
req.y = bounds_in_pixels_.y();
|
||||
req.width = bounds_in_pixels_.width();
|
||||
diff --git ui/views/widget/desktop_aura/desktop_screen_win.cc ui/views/widget/desktop_aura/desktop_screen_win.cc
|
||||
index 7c352dd0d992d..cf1a0c3e6db63 100644
|
||||
index 7c352dd0d992..cf1a0c3e6db6 100644
|
||||
--- ui/views/widget/desktop_aura/desktop_screen_win.cc
|
||||
+++ ui/views/widget/desktop_aura/desktop_screen_win.cc
|
||||
@@ -20,6 +20,8 @@ DesktopScreenWin::~DesktopScreenWin() {
|
||||
@@ -157,7 +157,7 @@ index 7c352dd0d992d..cf1a0c3e6db63 100644
|
||||
return host ? host->GetAcceleratedWidget() : nullptr;
|
||||
}
|
||||
diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc
|
||||
index 7f7d82f518600..8e5386de9d9e2 100644
|
||||
index 7f7d82f51860..8e5386de9d9e 100644
|
||||
--- ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc
|
||||
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc
|
||||
@@ -215,6 +215,18 @@ Widget::MoveLoopResult DesktopWindowTreeHostLinux::RunMoveLoop(
|
||||
@@ -189,7 +189,7 @@ index 7f7d82f518600..8e5386de9d9e2 100644
|
||||
properties->x11_extension_delegate = this;
|
||||
}
|
||||
diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h
|
||||
index 49c2776892f1f..02df1b4bafe17 100644
|
||||
index 49c2776892f1..02df1b4bafe1 100644
|
||||
--- ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h
|
||||
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h
|
||||
@@ -73,6 +73,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostLinux
|
||||
@@ -221,7 +221,7 @@ index 49c2776892f1f..02df1b4bafe17 100644
|
||||
base::WeakPtrFactory<DesktopWindowTreeHostLinux> weak_factory_{this};
|
||||
|
||||
diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
|
||||
index fb8bbb639f6b6..c887f2d34b6e7 100644
|
||||
index fb8bbb639f6b..c887f2d34b6e 100644
|
||||
--- ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
|
||||
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
|
||||
@@ -144,8 +144,12 @@ void DesktopWindowTreeHostWin::Init(const Widget::InitParams& params) {
|
||||
@@ -257,7 +257,7 @@ index fb8bbb639f6b6..c887f2d34b6e7 100644
|
||||
|
||||
bool DesktopWindowTreeHostWin::HandleMouseEvent(ui::MouseEvent* event) {
|
||||
diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_win.h ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
|
||||
index 07078cbdf222e..25759541a3aaf 100644
|
||||
index 07078cbdf222..25759541a3aa 100644
|
||||
--- ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
|
||||
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
|
||||
@@ -292,6 +292,10 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin
|
||||
@@ -272,7 +272,7 @@ index 07078cbdf222e..25759541a3aaf 100644
|
||||
// a reference.
|
||||
corewm::TooltipWin* tooltip_;
|
||||
diff --git ui/views/widget/widget.cc ui/views/widget/widget.cc
|
||||
index 0dcab77ec0d47..99f08c3361837 100644
|
||||
index 0dcab77ec0d4..99f08c336183 100644
|
||||
--- ui/views/widget/widget.cc
|
||||
+++ ui/views/widget/widget.cc
|
||||
@@ -322,7 +322,8 @@ void Widget::Init(InitParams params) {
|
||||
@@ -317,7 +317,7 @@ index 0dcab77ec0d47..99f08c3361837 100644
|
||||
}
|
||||
|
||||
diff --git ui/views/widget/widget.h ui/views/widget/widget.h
|
||||
index ef3892d66fa00..7e0558362c662 100644
|
||||
index ef3892d66fa0..7e0558362c66 100644
|
||||
--- ui/views/widget/widget.h
|
||||
+++ ui/views/widget/widget.h
|
||||
@@ -326,6 +326,8 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
|
||||
@@ -330,7 +330,7 @@ index ef3892d66fa00..7e0558362c662 100644
|
||||
// the NativeWidget may specify a default size. If the parent is specified,
|
||||
// |bounds| is in the parent's coordinate system. If the parent is not
|
||||
diff --git ui/views/widget/widget_delegate.h ui/views/widget/widget_delegate.h
|
||||
index a53c810230112..a6e6f64049e5e 100644
|
||||
index a53c81023011..a6e6f64049e5 100644
|
||||
--- ui/views/widget/widget_delegate.h
|
||||
+++ ui/views/widget/widget_delegate.h
|
||||
@@ -385,6 +385,10 @@ class VIEWS_EXPORT WidgetDelegate {
|
||||
@@ -345,7 +345,7 @@ index a53c810230112..a6e6f64049e5e 100644
|
||||
bool enable_arrow_key_traversal() const {
|
||||
return params_.enable_arrow_key_traversal;
|
||||
diff --git ui/views/widget/widget_hwnd_utils.cc ui/views/widget/widget_hwnd_utils.cc
|
||||
index e07a12918596b..7c3a3dc669de6 100644
|
||||
index e07a12918596..7c3a3dc669de 100644
|
||||
--- ui/views/widget/widget_hwnd_utils.cc
|
||||
+++ ui/views/widget/widget_hwnd_utils.cc
|
||||
@@ -67,7 +67,7 @@ void CalculateWindowStylesFromInitParams(
|
||||
@@ -358,7 +358,7 @@ index e07a12918596b..7c3a3dc669de6 100644
|
||||
if (native_widget_delegate->IsDialogBox()) {
|
||||
*style |= DS_MODALFRAME;
|
||||
diff --git ui/views/win/hwnd_message_handler.cc ui/views/win/hwnd_message_handler.cc
|
||||
index aabbdffa06268..23f08aeac911a 100644
|
||||
index aabbdffa0626..23f08aeac911 100644
|
||||
--- ui/views/win/hwnd_message_handler.cc
|
||||
+++ ui/views/win/hwnd_message_handler.cc
|
||||
@@ -3123,10 +3123,13 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git components/viz/host/host_display_client.cc components/viz/host/host_display_client.cc
|
||||
index 3b00759e513dc..90fe332d59f5b 100644
|
||||
index 3b00759e513d..90fe332d59f5 100644
|
||||
--- components/viz/host/host_display_client.cc
|
||||
+++ components/viz/host/host_display_client.cc
|
||||
@@ -45,9 +45,14 @@ void HostDisplayClient::OnDisplayReceivedCALayerParams(
|
||||
@@ -29,7 +29,7 @@ index 3b00759e513dc..90fe332d59f5b 100644
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
diff --git components/viz/host/host_display_client.h components/viz/host/host_display_client.h
|
||||
index 5e260e13762f6..1ccff27f2fdbe 100644
|
||||
index 5e260e13762f..1ccff27f2fdb 100644
|
||||
--- components/viz/host/host_display_client.h
|
||||
+++ components/viz/host/host_display_client.h
|
||||
@@ -32,17 +32,17 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom::DisplayClient {
|
||||
@@ -54,7 +54,7 @@ index 5e260e13762f6..1ccff27f2fdbe 100644
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
diff --git components/viz/host/layered_window_updater_impl.cc components/viz/host/layered_window_updater_impl.cc
|
||||
index b04f654fe820f..131977a36591d 100644
|
||||
index b04f654fe820..131977a36591 100644
|
||||
--- components/viz/host/layered_window_updater_impl.cc
|
||||
+++ components/viz/host/layered_window_updater_impl.cc
|
||||
@@ -44,7 +44,7 @@ void LayeredWindowUpdaterImpl::OnAllocatedSharedMemory(
|
||||
@@ -67,7 +67,7 @@ index b04f654fe820f..131977a36591d 100644
|
||||
|
||||
if (!canvas_) {
|
||||
diff --git components/viz/host/layered_window_updater_impl.h components/viz/host/layered_window_updater_impl.h
|
||||
index 1026b739d283f..fe562ab60ce98 100644
|
||||
index 1026b739d283..fe562ab60ce9 100644
|
||||
--- components/viz/host/layered_window_updater_impl.h
|
||||
+++ components/viz/host/layered_window_updater_impl.h
|
||||
@@ -35,7 +35,7 @@ class VIZ_HOST_EXPORT LayeredWindowUpdaterImpl
|
||||
@@ -80,7 +80,7 @@ index 1026b739d283f..fe562ab60ce98 100644
|
||||
private:
|
||||
const HWND hwnd_;
|
||||
diff --git components/viz/service/BUILD.gn components/viz/service/BUILD.gn
|
||||
index 2ff8732060011..21c94aacc96ef 100644
|
||||
index 838a44f26f02..17324d5933d7 100644
|
||||
--- components/viz/service/BUILD.gn
|
||||
+++ components/viz/service/BUILD.gn
|
||||
@@ -204,6 +204,8 @@ viz_component("service") {
|
||||
@@ -93,7 +93,7 @@ index 2ff8732060011..21c94aacc96ef 100644
|
||||
|
||||
defines = [ "VIZ_SERVICE_IMPLEMENTATION" ]
|
||||
diff --git components/viz/service/display_embedder/output_surface_provider_impl.cc components/viz/service/display_embedder/output_surface_provider_impl.cc
|
||||
index bd64ee19f7169..2f5bae8a7c1b4 100644
|
||||
index bd64ee19f716..2f5bae8a7c1b 100644
|
||||
--- components/viz/service/display_embedder/output_surface_provider_impl.cc
|
||||
+++ components/viz/service/display_embedder/output_surface_provider_impl.cc
|
||||
@@ -16,6 +16,7 @@
|
||||
@@ -126,7 +126,7 @@ index bd64ee19f7169..2f5bae8a7c1b4 100644
|
||||
return CreateSoftwareOutputDeviceWin(surface_handle, &output_device_backing_,
|
||||
display_client);
|
||||
diff --git components/viz/service/display_embedder/software_output_device_win.cc components/viz/service/display_embedder/software_output_device_win.cc
|
||||
index 599b06c1765ef..e8ae98b0b1320 100644
|
||||
index 599b06c1765e..e8ae98b0b132 100644
|
||||
--- components/viz/service/display_embedder/software_output_device_win.cc
|
||||
+++ components/viz/service/display_embedder/software_output_device_win.cc
|
||||
@@ -191,8 +191,9 @@ void SoftwareOutputDeviceWinProxy::EndPaintDelegated(
|
||||
@@ -142,7 +142,7 @@ index 599b06c1765ef..e8ae98b0b1320 100644
|
||||
|
||||
TRACE_EVENT_ASYNC_BEGIN0("viz", "SoftwareOutputDeviceWinProxy::Draw", this);
|
||||
diff --git content/browser/compositor/viz_process_transport_factory.cc content/browser/compositor/viz_process_transport_factory.cc
|
||||
index 83a23404d1c02..7870327028592 100644
|
||||
index 50ff2c9facc2..c34d1f28d2e9 100644
|
||||
--- content/browser/compositor/viz_process_transport_factory.cc
|
||||
+++ content/browser/compositor/viz_process_transport_factory.cc
|
||||
@@ -395,8 +395,13 @@ void VizProcessTransportFactory::OnEstablishedGpuChannel(
|
||||
@@ -162,7 +162,7 @@ index 83a23404d1c02..7870327028592 100644
|
||||
compositor_data.display_client->GetBoundRemote(resize_task_runner_);
|
||||
|
||||
diff --git mojo/public/cpp/bindings/sync_call_restrictions.h mojo/public/cpp/bindings/sync_call_restrictions.h
|
||||
index fd962645ec69c..a29cdd8f86c04 100644
|
||||
index fd962645ec69..a29cdd8f86c0 100644
|
||||
--- mojo/public/cpp/bindings/sync_call_restrictions.h
|
||||
+++ mojo/public/cpp/bindings/sync_call_restrictions.h
|
||||
@@ -39,6 +39,7 @@ class Compositor;
|
||||
@@ -183,7 +183,7 @@ index fd962645ec69c..a29cdd8f86c04 100644
|
||||
// running in the same process, so it won't block anything.
|
||||
// TODO(159346933) Remove once the origin isolation logic is moved outside of
|
||||
diff --git services/viz/privileged/mojom/compositing/display_private.mojom services/viz/privileged/mojom/compositing/display_private.mojom
|
||||
index 409115f95787e..278354c126a0c 100644
|
||||
index 409115f95787..278354c126a0 100644
|
||||
--- services/viz/privileged/mojom/compositing/display_private.mojom
|
||||
+++ services/viz/privileged/mojom/compositing/display_private.mojom
|
||||
@@ -85,12 +85,14 @@ interface DisplayPrivate {
|
||||
@@ -203,7 +203,7 @@ index 409115f95787e..278354c126a0c 100644
|
||||
|
||||
// Notifies that a swap has occurred and provides information about the pixel
|
||||
diff --git services/viz/privileged/mojom/compositing/layered_window_updater.mojom services/viz/privileged/mojom/compositing/layered_window_updater.mojom
|
||||
index 6b7fbb6cf13dc..e2af75168cb91 100644
|
||||
index 6b7fbb6cf13d..e2af75168cb9 100644
|
||||
--- services/viz/privileged/mojom/compositing/layered_window_updater.mojom
|
||||
+++ services/viz/privileged/mojom/compositing/layered_window_updater.mojom
|
||||
@@ -26,5 +26,5 @@ interface LayeredWindowUpdater {
|
||||
@@ -214,7 +214,7 @@ index 6b7fbb6cf13dc..e2af75168cb91 100644
|
||||
+ Draw(gfx.mojom.Rect damage_rect) => ();
|
||||
};
|
||||
diff --git ui/compositor/compositor.h ui/compositor/compositor.h
|
||||
index fe4e33a62087c..503965e575df3 100644
|
||||
index fe4e33a62087..503965e575df 100644
|
||||
--- ui/compositor/compositor.h
|
||||
+++ ui/compositor/compositor.h
|
||||
@@ -28,7 +28,9 @@
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc
|
||||
index 5dc3f95a5db5d..e47d915d0712c 100644
|
||||
index 173228ed8d17..4a7a303a6b90 100644
|
||||
--- content/browser/web_contents/web_contents_impl.cc
|
||||
+++ content/browser/web_contents/web_contents_impl.cc
|
||||
@@ -2883,6 +2883,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
|
||||
@@ -39,7 +39,7 @@ index 5dc3f95a5db5d..e47d915d0712c 100644
|
||||
std::unique_ptr<WebContentsImpl> new_contents;
|
||||
if (!is_guest) {
|
||||
create_params.context = view_->GetNativeView();
|
||||
@@ -7460,6 +7476,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
|
||||
@@ -7476,6 +7492,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
|
||||
// This is an outermost WebContents.
|
||||
SetAsFocusedWebContentsIfNecessary();
|
||||
}
|
||||
@@ -50,7 +50,7 @@ index 5dc3f95a5db5d..e47d915d0712c 100644
|
||||
|
||||
void WebContentsImpl::DidCallFocus() {
|
||||
diff --git content/public/browser/web_contents.cc content/public/browser/web_contents.cc
|
||||
index f1dcf53ea481b..192f7c0ddd04f 100644
|
||||
index f1dcf53ea481..192f7c0ddd04 100644
|
||||
--- content/public/browser/web_contents.cc
|
||||
+++ content/public/browser/web_contents.cc
|
||||
@@ -29,6 +29,7 @@ WebContents::CreateParams::CreateParams(BrowserContext* context,
|
||||
@@ -62,7 +62,7 @@ index f1dcf53ea481b..192f7c0ddd04f 100644
|
||||
|
||||
WebContents::CreateParams::CreateParams(const CreateParams& other) = default;
|
||||
diff --git content/public/browser/web_contents.h content/public/browser/web_contents.h
|
||||
index 67006dfc4c4fa..125ee29267177 100644
|
||||
index 67006dfc4c4f..125ee2926717 100644
|
||||
--- content/public/browser/web_contents.h
|
||||
+++ content/public/browser/web_contents.h
|
||||
@@ -85,10 +85,12 @@ class BrowserContext;
|
||||
@@ -90,7 +90,7 @@ index 67006dfc4c4fa..125ee29267177 100644
|
||||
// the value that'll be returned by GetLastActiveTime(). If this is left
|
||||
// default initialized then the value is not passed on to the WebContents
|
||||
diff --git content/public/browser/web_contents_delegate.h content/public/browser/web_contents_delegate.h
|
||||
index b1cfa654259d4..84d678815994e 100644
|
||||
index b1cfa654259d..84d678815994 100644
|
||||
--- content/public/browser/web_contents_delegate.h
|
||||
+++ content/public/browser/web_contents_delegate.h
|
||||
@@ -59,10 +59,12 @@ class EyeDropperListener;
|
||||
@@ -122,7 +122,7 @@ index b1cfa654259d4..84d678815994e 100644
|
||||
// typically happens when popups are created.
|
||||
virtual void WebContentsCreated(WebContents* source_contents,
|
||||
diff --git content/public/browser/web_contents_observer.h content/public/browser/web_contents_observer.h
|
||||
index 6c2b6e48f769d..f6b17dbe493bf 100644
|
||||
index 6c2b6e48f769..f6b17dbe493b 100644
|
||||
--- content/public/browser/web_contents_observer.h
|
||||
+++ content/public/browser/web_contents_observer.h
|
||||
@@ -666,6 +666,10 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Listener {
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git third_party/blink/public/platform/web_url_loader.h third_party/blink/public/platform/web_url_loader.h
|
||||
index 042a383fe1771..310f25700ebfb 100644
|
||||
index 042a383fe177..310f25700ebf 100644
|
||||
--- third_party/blink/public/platform/web_url_loader.h
|
||||
+++ third_party/blink/public/platform/web_url_loader.h
|
||||
@@ -160,12 +160,14 @@ class BLINK_PLATFORM_EXPORT WebURLLoader {
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user