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

Merge remote-tracking branch 'origin/chromium-upgrade/72'

Browse source
This commit is contained in:
Samuel Attard 2019-01-22 12:01:18 -08:00
commit f3e30c7ae3
No known key found for this signature in database
GPG key ID: E89DDE5742D58C4E
178 changed files with 2102 additions and 1734 deletions
Download patch file Download diff file Expand all files Collapse all files

5
atom/renderer/api/atom_api_spell_check_client.cc
View file

@ -211,10 +211,11 @@ void SpellCheckClient::SpellCheckWords(
v8::Local<v8::FunctionTemplate> templ = mate::CreateFunctionTemplate(
isolate_, base::Bind(&SpellCheckClient::OnSpellCheckDone, AsWeakPtr()));
auto context = isolate_->GetCurrentContext();
v8::Local<v8::Value> args[] = {mate::ConvertToV8(isolate_, words),
templ->GetFunction()};
templ->GetFunction(context).ToLocalChecked()};
// Call javascript with the words and the callback function
scope.spell_check_->Call(scope.provider_, 2, args);
scope.spell_check_->Call(context, scope.provider_, 2, args).ToLocalChecked();
}
// Returns whether or not the given string is a contraction.

10
atom/renderer/api/atom_api_web_frame.cc
View file

@ -222,7 +222,9 @@ int WebFrame::GetWebFrameId(v8::Local<v8::Value> content_window) {
void WebFrame::SetSpellCheckProvider(mate::Arguments* args,
const std::string& language,
v8::Local<v8::Object> provider) {
if (!provider->Has(mate::StringToV8(args->isolate(), "spellCheck"))) {
auto context = args->isolate()->GetCurrentContext();
if (!provider->Has(context, mate::StringToV8(args->isolate(), "spellCheck"))
.ToChecked()) {
args->ThrowError("\"spellCheck\" has to be defined");
return;
}
@ -282,7 +284,7 @@ void WebFrame::RegisterURLSchemeAsPrivileged(const std::string& scheme,
privileged_scheme);
}
if (corsEnabled) {
url::AddCORSEnabledScheme(scheme.c_str());
url::AddCorsEnabledScheme(scheme.c_str());
}
}
@ -541,7 +543,9 @@ void Initialize(v8::Local<v8::Object> exports,
v8::Isolate* isolate = context->GetIsolate();
mate::Dictionary dict(isolate, exports);
dict.Set("webFrame", WebFrame::Create(isolate));
dict.Set("WebFrame", WebFrame::GetConstructor(isolate)->GetFunction());
dict.Set(
"WebFrame",
WebFrame::GetConstructor(isolate)->GetFunction(context).ToLocalChecked());
}
} // namespace

1
atom/renderer/content_settings_observer.cc
View file

@ -45,7 +45,6 @@ bool ContentSettingsObserver::AllowStorage(bool local) {
}
bool ContentSettingsObserver::AllowIndexedDB(
const blink::WebString& name,
const blink::WebSecurityOrigin& security_origin) {
blink::WebFrame* frame = render_frame()->GetWebFrame();
if (frame->GetSecurityOrigin().IsUnique() ||

3
atom/renderer/content_settings_observer.h
View file

@ -22,8 +22,7 @@ class ContentSettingsObserver : public content::RenderFrameObserver,
const blink::WebString& display_name,
unsigned estimated_size) override;
bool AllowStorage(bool local) override;
bool AllowIndexedDB(const blink::WebString& name,
const blink::WebSecurityOrigin& security_origin) override;
bool AllowIndexedDB(const blink::WebSecurityOrigin& security_origin) override;
private:
// content::RenderFrameObserver implementation.