From b2e82f1692f8ddcd5d91f815c9a1c34d1c967d0d Mon Sep 17 00:00:00 2001
From: Simon Pieters <zcorpan@gmail.com>
Date: Fri, 16 Dec 2016 08:04:22 +0100
Subject: [PATCH 1/4] Snapshot the allowpaymentrequest attribute

New allow* attributes should use the snapshot model used by <iframe sandbox>
and Feature Policy. The allowfullscreen and allowusermedia attributes are
left with their current live behavior in this change, because it is not yet
clear if it is Web-compatible to change them (see #2187).

Part of #2143.
---
 source | 40 ++++++++++++++++++++++++++++++++++------
 1 file changed, 34 insertions(+), 6 deletions(-)

diff --git a/source b/source
index f5f93fd5276..10f7c21059c 100644
--- a/source
+++ b/source
@@ -28485,7 +28485,9 @@ interface <dfn>HTMLIFrameElement</dfn> : <span>HTMLElement</span> {
   has a <span>nested browsing context</span>, the user agent must <span data-x="parse a sandboxing
   directive">parse the sandboxing directive</span> using the attribute's value as the
   <var>input</var> and the <code>iframe</code> element's <span>nested browsing context</span>'s
-  <span><code>iframe</code> sandboxing flag set</span> as the output.</p>
+  <span><code>iframe</code> sandboxing flag set</span> as the output. If the <code>iframe</code> has
+  an <code data-x="attr-iframe-allowpaymentrequest">allowpaymentrequest</code> attribute, then set
+  the <var>allowpaymentrequest flag</var>.</p>
 
   <p>When an <code>iframe</code> element's <code data-x="attr-iframe-sandbox">sandbox</code>
   attribute is removed while it has a non-null <span>nested browsing context</span>, the user agent
@@ -28615,11 +28617,37 @@ interface <dfn>HTMLIFrameElement</dfn> : <span>HTMLElement</span> {
     <li><p>If <var>document</var>'s <span data-x="concept-document-bc">browsing context</span> is a
     <span>top-level browsing context</span>, then return true.</p></li>
 
-    <li><p>If <var>document</var>'s <span data-x="concept-document-bc">browsing context</span> has a
-    <span>browsing context container</span> that is an <code>iframe</code> element with an
-    <var>allowattribute</var> attribute specified, and whose <span>node document</span> is
-    <span>allowed to use</span> the feature indicated by <var>allowattribute</var>, then return
-    true.</p></li>
+    <li>
+     <p>If <var>allowattribute</var> is <code
+     data-x="attr-iframe-allowfullscreen">allowfullscreen</code> or <code
+     data-x="attr-iframe-allowusermedia">allowusermedia</code>, then follow these substeps:</p>
+
+     <ol>
+      <li><p>If <var>document</var>'s <span data-x="concept-document-bc">browsing context</span> has
+      a <span>browsing context container</span> that is an <code>iframe</code> element with an
+      <var>allowattribute</var> attribute specified, and whose <span>node document</span> is
+      <span>allowed to use</span> the feature indicated by <var>allowattribute</var>, then return
+      true.</p></li>
+     </ol>
+
+     <p class="big-issue">This step is legacy behavior that should not be used for new features. If
+     possible this behavior will go away for the <code
+     data-x="attr-iframe-allowfullscreen">allowfullscreen</code> and <code
+     data-x="attr-iframe-allowusermedia">allowusermedia</code> attributes as well, see <a
+     href="https://github.com/whatwg/html/issues/2143#issuecomment-265514585">issue 2143</a>.</p>
+    </li>
+
+    <li>
+     <p>Otherwise, follow these substeps:</p>
+
+     <ol>
+      <li><p>If <var>document</var> has the <var><var>allowattribute</var> flag</var> set, and
+      <var>document</var>'s <span data-x="concept-document-bc">browsing context</span> has a
+      <span>browsing context container</span> that is an <code>iframe</code> element whose
+      <span>node document</span> is <span>allowed to use</span> the feature indicated by
+      <var>allowattribute</var>, then return true.</p></li>
+     </ol>
+    </li>
 
     <li><p>Return false.</p></li>
    </ol>

From edcbb1b3055ae50841cd3ba3a5917b38cbef2fec Mon Sep 17 00:00:00 2001
From: Simon Pieters <zcorpan@gmail.com>
Date: Fri, 23 Dec 2016 11:26:42 +0100
Subject: [PATCH 2/4] Actually set the flag on the document when it is created

---
 source | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/source b/source
index 10f7c21059c..fe69e811a6c 100644
--- a/source
+++ b/source
@@ -28485,9 +28485,7 @@ interface <dfn>HTMLIFrameElement</dfn> : <span>HTMLElement</span> {
   has a <span>nested browsing context</span>, the user agent must <span data-x="parse a sandboxing
   directive">parse the sandboxing directive</span> using the attribute's value as the
   <var>input</var> and the <code>iframe</code> element's <span>nested browsing context</span>'s
-  <span><code>iframe</code> sandboxing flag set</span> as the output. If the <code>iframe</code> has
-  an <code data-x="attr-iframe-allowpaymentrequest">allowpaymentrequest</code> attribute, then set
-  the <var>allowpaymentrequest flag</var>.</p>
+  <span><code>iframe</code> sandboxing flag set</span> as the output.</p>
 
   <p>When an <code>iframe</code> element's <code data-x="attr-iframe-sandbox">sandbox</code>
   attribute is removed while it has a non-null <span>nested browsing context</span>, the user agent
@@ -28651,6 +28649,16 @@ interface <dfn>HTMLIFrameElement</dfn> : <span>HTMLElement</span> {
 
     <li><p>Return false.</p></li>
    </ol>
+
+   <p>To <dfn>set the allow* flags</dfn> for a <code>Document</code> <var>document</var> means to
+   run these steps:</p>
+
+   <ol>
+    <li><p>If <var>document</var>'s <span data-x="concept-document-bc">browsing context</span> has a
+    <span>browsing context container</span> that is an <code>iframe</code> element with an <code
+    data-x="attr-iframe-allowpaymentrequest">allowpaymentrequest</code> attribute specified, then
+    set the <var>allowpaymentrequest flag</var> on <var>document</var>.</p></li>
+   </ol>
   </div>
 
   <hr> <!-- DIM ATTRIBUTES -->
@@ -76935,6 +76943,8 @@ dictionary <dfn>DragEventInit</dfn> : <span>MouseEventInit</span> {
 
    <li><p><span>Implement the sandboxing</span> for <var>document</var>.</p></li>
 
+   <li><p><span>Set the allow* flags</span> for <var>document</var>.</p></li>
+
    <li><p>Set <var>settingsObject</var>'s <span
    data-x="concept-environment-execution-ready-flag">execution ready flag</span>.</p></li>
 
@@ -82191,6 +82201,8 @@ State: &lt;OUTPUT NAME=I>1&lt;/OUTPUT> &lt;INPUT VALUE="Increment" TYPE=BUTTON O
 
      <li><p><span>Implement the sandboxing</span> for the <code>Document</code>.</p></li>
 
+     <li><p><span>Set the allow* flags</span> for the <code>Document</code>.</p></li>
+
      <li><p>Set <var>settingsObject</var>'s <span
      data-x="concept-environment-execution-ready-flag">execution ready flag</span>.</p></li>
 

From fbfc90ada0c23931c9ef1627745566aa9ba2aeec Mon Sep 17 00:00:00 2001
From: Simon Pieters <zcorpan@gmail.com>
Date: Thu, 12 Jan 2017 10:22:40 -0800
Subject: [PATCH 3/4] Move allowusermedia to the snapshot model

---
 source | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/source b/source
index fe69e811a6c..ba6db286aac 100644
--- a/source
+++ b/source
@@ -28617,8 +28617,7 @@ interface <dfn>HTMLIFrameElement</dfn> : <span>HTMLElement</span> {
 
     <li>
      <p>If <var>allowattribute</var> is <code
-     data-x="attr-iframe-allowfullscreen">allowfullscreen</code> or <code
-     data-x="attr-iframe-allowusermedia">allowusermedia</code>, then follow these substeps:</p>
+     data-x="attr-iframe-allowfullscreen">allowfullscreen</code>, then follow these substeps:</p>
 
      <ol>
       <li><p>If <var>document</var>'s <span data-x="concept-document-bc">browsing context</span> has
@@ -28655,9 +28654,16 @@ interface <dfn>HTMLIFrameElement</dfn> : <span>HTMLElement</span> {
 
    <ol>
     <li><p>If <var>document</var>'s <span data-x="concept-document-bc">browsing context</span> has a
-    <span>browsing context container</span> that is an <code>iframe</code> element with an <code
+    <span>browsing context container</span> that is an <code>iframe</code> element, let
+    <var>iframe</var> be that element. Otherwise, abort these steps.</p></li>
+
+    <li><p>If <var>iframe</var> has an <code
     data-x="attr-iframe-allowpaymentrequest">allowpaymentrequest</code> attribute specified, then
     set the <var>allowpaymentrequest flag</var> on <var>document</var>.</p></li>
+
+    <li><p>If <var>iframe</var> has an <code
+    data-x="attr-iframe-allowusermedia">allowusermedia</code> attribute specified, then set the
+    <var>allowusermedia flag</var> on <var>document</var>.</p></li>
    </ol>
   </div>
 

From c602fe7831faea8dccb4890ddfc08d0f41399d4d Mon Sep 17 00:00:00 2001
From: Anne van Kesteren <annevk@annevk.nl>
Date: Fri, 13 Jan 2017 15:39:53 +0100
Subject: [PATCH 4/4] simplify warning now allowusermedia is snapshotted

---
 source | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/source b/source
index ba6db286aac..7a4eae7d2fa 100644
--- a/source
+++ b/source
@@ -28627,10 +28627,9 @@ interface <dfn>HTMLIFrameElement</dfn> : <span>HTMLElement</span> {
       true.</p></li>
      </ol>
 
-     <p class="big-issue">This step is legacy behavior that should not be used for new features. If
-     possible this behavior will go away for the <code
-     data-x="attr-iframe-allowfullscreen">allowfullscreen</code> and <code
-     data-x="attr-iframe-allowusermedia">allowusermedia</code> attributes as well, see <a
+     <p class="big-issue">This step is legacy behavior for the <code
+     data-x="attr-iframe-allowfullscreen">allowfullscreen</code> attribute that should not be used
+     for new features. If possible this will be removed, see <a
      href="https://github.com/whatwg/html/issues/2143#issuecomment-265514585">issue 2143</a>.</p>
     </li>