| Index: third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp
|
| diff --git a/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp b/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp
|
| index 7379a49a1a7d082a1f730431b2a5679d546146c9..d7d5e161dc9c6ea4d7bc98ed2b9d165ed6e1ce0b 100644
|
| --- a/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp
|
| +++ b/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp
|
| @@ -732,10 +732,8 @@ void LocalDOMWindow::print(ScriptState* scriptState)
|
|
|
| if (document()->isSandboxed(SandboxModals)) {
|
| UseCounter::count(document(), UseCounter::DialogInSandboxedContext);
|
| - if (RuntimeEnabledFeatures::sandboxBlocksModalsEnabled()) {
|
| - frameConsole()->addMessage(ConsoleMessage::create(SecurityMessageSource, ErrorMessageLevel, "Ignored call to 'print()'. The document is sandboxed, and the 'allow-modals' keyword is not set."));
|
| - return;
|
| - }
|
| + frameConsole()->addMessage(ConsoleMessage::create(SecurityMessageSource, ErrorMessageLevel, "Ignored call to 'print()'. The document is sandboxed, and the 'allow-modals' keyword is not set."));
|
| + return;
|
| }
|
|
|
| if (scriptState && v8::MicrotasksScope::IsRunningMicrotasks(scriptState->isolate())) {
|
| @@ -767,10 +765,8 @@ void LocalDOMWindow::alert(ScriptState* scriptState, const String& message)
|
|
|
| if (document()->isSandboxed(SandboxModals)) {
|
| UseCounter::count(document(), UseCounter::DialogInSandboxedContext);
|
| - if (RuntimeEnabledFeatures::sandboxBlocksModalsEnabled()) {
|
| - frameConsole()->addMessage(ConsoleMessage::create(SecurityMessageSource, ErrorMessageLevel, "Ignored call to 'alert()'. The document is sandboxed, and the 'allow-modals' keyword is not set."));
|
| - return;
|
| - }
|
| + frameConsole()->addMessage(ConsoleMessage::create(SecurityMessageSource, ErrorMessageLevel, "Ignored call to 'alert()'. The document is sandboxed, and the 'allow-modals' keyword is not set."));
|
| + return;
|
| }
|
|
|
| if (v8::MicrotasksScope::IsRunningMicrotasks(scriptState->isolate())) {
|
| @@ -795,10 +791,8 @@ bool LocalDOMWindow::confirm(ScriptState* scriptState, const String& message)
|
|
|
| if (document()->isSandboxed(SandboxModals)) {
|
| UseCounter::count(document(), UseCounter::DialogInSandboxedContext);
|
| - if (RuntimeEnabledFeatures::sandboxBlocksModalsEnabled()) {
|
| - frameConsole()->addMessage(ConsoleMessage::create(SecurityMessageSource, ErrorMessageLevel, "Ignored call to 'confirm()'. The document is sandboxed, and the 'allow-modals' keyword is not set."));
|
| - return false;
|
| - }
|
| + frameConsole()->addMessage(ConsoleMessage::create(SecurityMessageSource, ErrorMessageLevel, "Ignored call to 'confirm()'. The document is sandboxed, and the 'allow-modals' keyword is not set."));
|
| + return false;
|
| }
|
|
|
| if (v8::MicrotasksScope::IsRunningMicrotasks(scriptState->isolate())) {
|
| @@ -823,10 +817,8 @@ String LocalDOMWindow::prompt(ScriptState* scriptState, const String& message, c
|
|
|
| if (document()->isSandboxed(SandboxModals)) {
|
| UseCounter::count(document(), UseCounter::DialogInSandboxedContext);
|
| - if (RuntimeEnabledFeatures::sandboxBlocksModalsEnabled()) {
|
| - frameConsole()->addMessage(ConsoleMessage::create(SecurityMessageSource, ErrorMessageLevel, "Ignored call to 'prompt()'. The document is sandboxed, and the 'allow-modals' keyword is not set."));
|
| - return String();
|
| - }
|
| + frameConsole()->addMessage(ConsoleMessage::create(SecurityMessageSource, ErrorMessageLevel, "Ignored call to 'prompt()'. The document is sandboxed, and the 'allow-modals' keyword is not set."));
|
| + return String();
|
| }
|
|
|
| if (v8::MicrotasksScope::IsRunningMicrotasks(scriptState->isolate())) {
|
|
|