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

chore: bump chromium to f755b70e34659441e72c1a928a406 (master) (#21000)

Browse source
This commit is contained in:
Electron Bot 2019-12-10 16:22:35 -08:00 • committed by Jeremy Apthorp
parent a5c9bd53e0
commit 49b47ee4ed
181 changed files with 1117 additions and 1786 deletions
Download patch file Download diff file Expand all files Collapse all files

15
shell/renderer/content_settings_observer.cc
View file

@ -21,8 +21,8 @@ ContentSettingsObserver::~ContentSettingsObserver() = default;
bool ContentSettingsObserver::AllowDatabase() {
blink::WebFrame* frame = render_frame()->GetWebFrame();
if (frame->GetSecurityOrigin().IsUnique() ||
frame->Top()->GetSecurityOrigin().IsUnique())
if (frame->GetSecurityOrigin().IsOpaque() ||
frame->Top()->GetSecurityOrigin().IsOpaque())
return false;
auto origin = blink::WebStringToGURL(frame->GetSecurityOrigin().ToString());
if (!origin.IsStandard())
@ -32,8 +32,8 @@ bool ContentSettingsObserver::AllowDatabase() {
bool ContentSettingsObserver::AllowStorage(bool local) {
blink::WebFrame* frame = render_frame()->GetWebFrame();
if (frame->GetSecurityOrigin().IsUnique() ||
frame->Top()->GetSecurityOrigin().IsUnique())
if (frame->GetSecurityOrigin().IsOpaque() ||
frame->Top()->GetSecurityOrigin().IsOpaque())
return false;
auto origin = blink::WebStringToGURL(frame->GetSecurityOrigin().ToString());
if (!origin.IsStandard())
@ -41,11 +41,10 @@ bool ContentSettingsObserver::AllowStorage(bool local) {
return true;
}
bool ContentSettingsObserver::AllowIndexedDB(
const blink::WebSecurityOrigin& security_origin) {
bool ContentSettingsObserver::AllowIndexedDB() {
blink::WebFrame* frame = render_frame()->GetWebFrame();
if (frame->GetSecurityOrigin().IsUnique() ||
frame->Top()->GetSecurityOrigin().IsUnique())
if (frame->GetSecurityOrigin().IsOpaque() ||
frame->Top()->GetSecurityOrigin().IsOpaque())
return false;
auto origin = blink::WebStringToGURL(frame->GetSecurityOrigin().ToString());
if (!origin.IsStandard())

2
shell/renderer/content_settings_observer.h
View file

@ -20,7 +20,7 @@ class ContentSettingsObserver : public content::RenderFrameObserver,
// blink::WebContentSettingsClient implementation.
bool AllowDatabase() override;
bool AllowStorage(bool local) override;
bool AllowIndexedDB(const blink::WebSecurityOrigin& security_origin) override;
bool AllowIndexedDB() override;
private:
// content::RenderFrameObserver implementation.

13
shell/renderer/renderer_client_base.cc
View file

@ -156,7 +156,7 @@ void RendererClientBase::RenderThreadStarted() {
#if BUILDFLAG(ENABLE_BUILTIN_SPELLCHECKER)
if (command_line->HasSwitch(switches::kEnableSpellcheck))
spellcheck_ = std::make_unique<SpellCheck>(&registry_, this);
spellcheck_ = std::make_unique<SpellCheck>(this);
#endif
blink::WebCustomElement::AddEmbedderCustomElementName("webview");
@ -338,12 +338,11 @@ void RendererClientBase::DidSetUserAgent(const std::string& user_agent) {
#endif
}
blink::WebPrescientNetworking* RendererClientBase::GetPrescientNetworking() {
if (!web_prescient_networking_impl_) {
web_prescient_networking_impl_ =
std::make_unique<network_hints::WebPrescientNetworkingImpl>();
}
return web_prescient_networking_impl_.get();
std::unique_ptr<blink::WebPrescientNetworking>
RendererClientBase::CreatePrescientNetworking(
content::RenderFrame* render_frame) {
return std::make_unique<network_hints::WebPrescientNetworkingImpl>(
render_frame);
}
void RendererClientBase::RunScriptsAtDocumentStart(

10
shell/renderer/renderer_client_base.h
View file

@ -26,10 +26,6 @@
class SpellCheck;
#endif
namespace network_hints {
class WebPrescientNetworkingImpl;
}
#if BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS)
namespace extensions {
class ExtensionsClient;
@ -71,7 +67,8 @@ class RendererClientBase : public content::ContentRendererClient
content::RenderFrame* render_frame,
int world_id) = 0;
blink::WebPrescientNetworking* GetPrescientNetworking() override;
std::unique_ptr<blink::WebPrescientNetworking> CreatePrescientNetworking(
content::RenderFrame* render_frame) override;
bool isolated_world() const { return isolated_world_; }
// Get the context that the Electron API is running in.
@ -113,9 +110,6 @@ class RendererClientBase : public content::ContentRendererClient
#endif
private:
std::unique_ptr<network_hints::WebPrescientNetworkingImpl>
web_prescient_networking_impl_;
#if BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS)
std::unique_ptr<extensions::ExtensionsClient> extensions_client_;
std::unique_ptr<AtomExtensionsRendererClient> extensions_renderer_client_;