[Presentation API] Move sandbox check to PresentationRequest constructor.

third_party/WebKit/Source/modules/presentation/PresentationRequest.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/presentation/PresentationRequest.h"
 
 #include "bindings/core/v8/CallbackPromiseAdapter.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
@@ skipping 33 matching lines @@
   return controller ? controller->client() : nullptr;
 }
 
 Settings* settings(ExecutionContext* executionContext) {
   DCHECK(executionContext);
 
   Document* document = toDocument(executionContext);
   return document->settings();
 }
 
-ScriptPromise rejectWithSandBoxException(ScriptState* scriptState) {
-  return ScriptPromise::rejectWithDOMException(
-      scriptState, DOMException::create(SecurityError,
-                                        "The document is sandboxed and lacks "
-                                        "the 'allow-presentation' flag."));
-}
-
 }  // anonymous namespace
 
 // static
 PresentationRequest* PresentationRequest::create(
     ExecutionContext* executionContext,
     const String& url,
     ExceptionState& exceptionState) {
   Vector<String> urls(1);
   urls[0] = url;
   return create(executionContext, urls, exceptionState);
 }
 
 PresentationRequest* PresentationRequest::create(
     ExecutionContext* executionContext,
     const Vector<String>& urls,
     ExceptionState& exceptionState) {
+  if (toDocument(executionContext)->isSandboxed(SandboxPresentation)) {
+    exceptionState.throwSecurityError(
+        "The document is sandboxed and lacks the 'allow-presentation' flag.");
+    return nullptr;
+  }
+
   if (urls.isEmpty()) {
     exceptionState.throwDOMException(NotSupportedError,
                                      "Do not support empty sequence of URLs.");
     return nullptr;
   }
 
   Vector<KURL> parsedUrls(urls.size());
   for (size_t i = 0; i < urls.size(); ++i) {
     const KURL& parsedUrl = KURL(executionContext->url(), urls[i]);
 
@@ skipping 46 matching lines @@
   bool isUserGestureRequired =
       !contextSettings || contextSettings->getPresentationRequiresUserGesture();
 
   if (isUserGestureRequired && !UserGestureIndicator::utilizeUserGesture())
     return ScriptPromise::rejectWithDOMException(
         scriptState,
         DOMException::create(
             InvalidAccessError,
             "PresentationRequest::start() requires user gesture."));
 
-  if (toDocument(getExecutionContext())->isSandboxed(SandboxPresentation))
-    return rejectWithSandBoxException(scriptState);
 
   WebPresentationClient* client = presentationClient(getExecutionContext());
   if (!client)
     return ScriptPromise::rejectWithDOMException(
         scriptState,
         DOMException::create(
             InvalidStateError,
             "The PresentationRequest is no longer associated to a frame."));
 
   ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
   client->startPresentation(
       m_urls, WTF::makeUnique<PresentationConnectionCallbacks>(resolver, this));
   return resolver->promise();
 }
 
 ScriptPromise PresentationRequest::reconnect(ScriptState* scriptState,
                                              const String& id) {
-  if (toDocument(getExecutionContext())->isSandboxed(SandboxPresentation))
-    return rejectWithSandBoxException(scriptState);
-
   WebPresentationClient* client = presentationClient(getExecutionContext());
   if (!client)
     return ScriptPromise::rejectWithDOMException(
         scriptState,
         DOMException::create(
             InvalidStateError,
             "The PresentationRequest is no longer associated to a frame."));
 
   ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
 
@@ skipping 10 matching lines @@
             resolver, existingConnection));
   } else {
     client->reconnectPresentation(
         m_urls, id,
         WTF::makeUnique<PresentationConnectionCallbacks>(resolver, this));
   }
   return resolver->promise();
 }
 
 ScriptPromise PresentationRequest::getAvailability(ScriptState* scriptState) {
-  if (toDocument(getExecutionContext())->isSandboxed(SandboxPresentation))
-    return rejectWithSandBoxException(scriptState);
-
   WebPresentationClient* client = presentationClient(getExecutionContext());
   if (!client)
     return ScriptPromise::rejectWithDOMException(
         scriptState,
         DOMException::create(
             InvalidStateError,
             "The PresentationRequest is no longer associated to a frame."));
 
   if (!m_availabilityProperty) {
     m_availabilityProperty = new PresentationAvailabilityProperty(
@@ skipping 29 matching lines @@
   if (executionContext->isSecureContext()) {
     UseCounter::count(executionContext,
                       UseCounter::PresentationRequestSecureOrigin);
   } else {
     UseCounter::count(executionContext,
                       UseCounter::PresentationRequestInsecureOrigin);
   }
 }
 
 }  // namespace blink