Merge remote-tracking branch 'origin/chromium-upgrade/72'
This commit is contained in:
commit
f3e30c7ae3
178 changed files with 2102 additions and 1734 deletions
|
@ -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.
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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() ||
|
||||
|
|
|
@ -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.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue