From 08a3c187153f3cbf9aedbabe40df94b6b632d8c1 Mon Sep 17 00:00:00 2001
From: Mike West <mkwst@google.com>
Date: Sat, 16 Jul 2016 07:55:16 +0200
Subject: [PATCH] SharedWorker is upstreamed.

Closes https://github.com/w3c/webappsec-secure-contexts/issues/31.
---
 index.src.html | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/index.src.html b/index.src.html
index 612ac75..e5ee580 100644
--- a/index.src.html
+++ b/index.src.html
@@ -618,13 +618,18 @@ <h3 id="integration-idl">Intergration with WebIDL</h3>
 
   <h3 id="monkey-patching-html">Modifications to HTML</h3>
 
-  <h4 id="monkey-patching-shared-workers">Shared Workers</h4>
+  <h4 id="monkey-patching-shared-workers" class="non-normative">Shared Workers</h4>
+
+  <em>This section is non-normative</em>.
 
   The {{SharedWorker()}} constructor will throw a `SecurityError` exception if
   a <a>secure context</a> attempts to attach to an Worker which is not a
   <a>secure context</a>, and if a non-secure context attempts to attach to a
-  Worker which is a <a>secure context</a>. The constructor is modified as
-  follows:
+  Worker which is a <a>secure context</a>. 
+  
+  
+  The constructor is modified as follows (though the SharedWorker specification
+  remains the normative reference):
 
   1.  As the first substep of the {{SharedWorker()}} constructor's current step
       6.7 ("If <var>worker global scope</var> is not `null`, then run these
@@ -636,8 +641,9 @@ <h4 id="monkey-patching-shared-workers">Shared Workers</h4>
           object</a>, then throw a `SecurityError` exception, and abort
           these steps.
 
-  ISSUE(whatwg/html#1560): Upstreaming to WHATWG is underway.
-
+  Note: This change landed in WHATWG's HTML in
+  <a href="https://github.com/whatwg/html/pull/1560">whatwg/html#1560</a>.
+  
   ISSUE: It's not clear to me how the W3C's [[WEBWORKERS]] document is updated.
   It looks like it's pulling content from the WHATWG upstream, which means
   that the PR linked above should flow into it? But that document hasn't been