Block modal dialogs inside sandboxes.

Source/core/frame/LocalDOMWindow.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 19 matching lines @@
 #include "bindings/core/v8/ScriptController.h"
 #include "core/css/CSSComputedStyleDeclaration.h"
 #include "core/css/CSSRuleList.h"
 #include "core/css/DOMWindowCSS.h"
 #include "core/css/MediaQueryList.h"
 #include "core/css/MediaQueryMatcher.h"
 #include "core/css/StyleMedia.h"
 #include "core/css/resolver/StyleResolver.h"
 #include "core/dom/DOMImplementation.h"
 #include "core/dom/FrameRequestCallback.h"
+#include "core/dom/SandboxFlags.h"
 #include "core/editing/Editor.h"
 #include "core/events/DOMWindowEventQueue.h"
 #include "core/events/HashChangeEvent.h"
 #include "core/events/MessageEvent.h"
 #include "core/events/PageTransitionEvent.h"
 #include "core/events/PopStateEvent.h"
 #include "core/frame/BarProp.h"
 #include "core/frame/Console.h"
 #include "core/frame/EventHandlerRegistry.h"
 #include "core/frame/FrameConsole.h"
@@ skipping 731 matching lines @@
 
 void LocalDOMWindow::print()
 {
     if (!frame())
         return;
 
     FrameHost* host = frame()->host();
     if (!host)
         return;
 
+    if (frame()->document()->isSandboxed(SandboxModals)) {
+        UseCounter::count(frame()->document(), UseCounter::DialogInSandboxedContext);
+        if (RuntimeEnabledFeatures::sandboxBlocksModalsEnabled())
+            return;
+    }
+

[Yoav Weiss, 2015/05/22 14:32:24]

Might be a good idea to count the "sandboxed but allowing modals" crowd as well.
Could be in a separate though.

     if (frame()->isLoading()) {
         m_shouldPrintWhenFinishedLoading = true;
         return;
     }
     m_shouldPrintWhenFinishedLoading = false;
     host->chrome().print(frame());
-
-    if (frame()->document()->sandboxFlags())
-        UseCounter::count(frame()->document(), UseCounter::DialogInSandboxedContext);
 }
 
 void LocalDOMWindow::stop()
 {
     if (!frame())
         return;
     frame()->loader().stopAllLoaders();
 }
 
 void LocalDOMWindow::alert(const String& message)
 {
     if (!frame())
         return;
 
+    if (frame()->document()->isSandboxed(SandboxModals)) {
+        UseCounter::count(frame()->document(), UseCounter::DialogInSandboxedContext);
+        if (RuntimeEnabledFeatures::sandboxBlocksModalsEnabled())
+            return;
+    }
+
     frame()->document()->updateLayoutTreeIfNeeded();
 
     FrameHost* host = frame()->host();
     if (!host)
         return;
 
-    if (frame()->document()->sandboxFlags())
-        UseCounter::count(frame()->document(), UseCounter::DialogInSandboxedContext);
-
     host->chrome().runJavaScriptAlert(frame(), message);
 }
 
 bool LocalDOMWindow::confirm(const String& message)
 {
     if (!frame())
         return false;
 
+    if (frame()->document()->isSandboxed(SandboxModals)) {
+        UseCounter::count(frame()->document(), UseCounter::DialogInSandboxedContext);
+        if (RuntimeEnabledFeatures::sandboxBlocksModalsEnabled())
+            return false;
+    }
+
     frame()->document()->updateLayoutTreeIfNeeded();
 
     FrameHost* host = frame()->host();
     if (!host)
         return false;
 
-    if (frame()->document()->sandboxFlags())
+    if (frame()->document()->isSandboxed(SandboxModals)) {
         UseCounter::count(frame()->document(), UseCounter::DialogInSandboxedContext);
+        if (RuntimeEnabledFeatures::sandboxBlocksModalsEnabled())
+            return false;
+    }
 
     return host->chrome().runJavaScriptConfirm(frame(), message);
 }
 
 String LocalDOMWindow::prompt(const String& message, const String& defaultValue)
 {
     if (!frame())
         return String();
 
+    if (frame()->document()->isSandboxed(SandboxModals)) {
+        UseCounter::count(frame()->document(), UseCounter::DialogInSandboxedContext);
+        if (RuntimeEnabledFeatures::sandboxBlocksModalsEnabled())
+            return String();
+    }
+
     frame()->document()->updateLayoutTreeIfNeeded();
 
     FrameHost* host = frame()->host();
     if (!host)
         return String();
 
-    if (frame()->document()->sandboxFlags())
-        UseCounter::count(frame()->document(), UseCounter::DialogInSandboxedContext);
-
     String returnValue;
     if (host->chrome().runJavaScriptPrompt(frame(), message, defaultValue, returnValue))
         return returnValue;
 
     return String();
 }
 
 bool LocalDOMWindow::find(const String& string, bool caseSensitive, bool backwards, bool wrap, bool wholeWord, bool /*searchInFrames*/, bool /*showDialog*/) const
 {
     if (!isCurrentlyDisplayedInFrame())
@@ skipping 641 matching lines @@
     DOMWindow::trace(visitor);
     DOMWindowLifecycleNotifier::trace(visitor);
 }
 
 LocalFrame* LocalDOMWindow::frame() const
 {
     return m_frameObserver->frame();
 }
 
 } // namespace blink