@@ -408,15 +408,18 @@
}
/* Style for algorithms */
- ol .algorithm ol :not (.algorithm ) {
+ ol .algorithm ol :not (.algorithm ),
+ .algorithm > ol ol :not (.algorithm ) {
border-left : 0.5em solid #DEF ;
}
/* Style for switch/case <dl>s */
- dl .switch > dd > ol .only {
+ dl .switch > dd > ol .only ,
+ dl .switch > dd > .only > ol {
margin-left : 0 ;
}
- dl .switch > dd > ol .algorithm {
+ dl .switch > dd > ol .algorithm ,
+ dl .switch > dd > .algorithm > ol {
margin-left : -2em ;
}
dl .switch {
@@ -962,10 +965,9 @@
/* ToC not indented until third level, but font style & margins show hierarchy */
.toc > li { font-weight : bold ; }
.toc > li li { font-weight : normal ; }
- .toc > li li li { font-style : italic ; }
- .toc > li li li li { font-style : normal ; }
- .toc > li li li li li { font-style : italic ;
- font-size : 85% ; }
+ .toc > li li li { font-size : 95% ; }
+ .toc > li li li li { font-size : 90% ; }
+ .toc > li li li li li { font-size : 85% ; }
.toc > li { margin : 1.5rem 0 ; }
.toc > li li { margin : 0.3rem 0 ; }
@@ -1162,72 +1164,6 @@
[data-md] > :last-child {
margin-bottom : 0 ;
}</style >
-<style >/* style-counters */
-
- body {
- counter-reset : example figure issue;
- }
- .issue {
- counter-increment : issue;
- }
- .issue :not (.no-marker )::before {
- content : " Issue " counter (issue );
- }
-
- .example {
- counter-increment : example;
- }
- .example :not (.no-marker )::before {
- content : " Example " counter (example );
- }
- .invalid.example :not (.no-marker )::before ,
- .illegal.example :not (.no-marker )::before {
- content : " Invalid Example" counter (example );
- }
-
- figure {
- counter-increment : figure;
- }
- figcaption :not (.no-marker )::before {
- content : " Figure " counter (figure );
- }</style >
-<style >/* style-dfn-panel */
-
- .dfn-panel {
- position : absolute ;
- z-index : 35 ;
- height : auto ;
- width : -webkit-fit-content;
- width : fit-content;
- max-width : 300px ;
- max-height : 500px ;
- overflow : auto ;
- padding : 0.5em 0.75em ;
- font : small Helvetica Neue, sans-serif , Droid Sans Fallback;
- background : #DDDDDD ;
- color : black ;
- border : outset 0.2em ;
- }
- .dfn-panel :not (.on ) { display : none ; }
- .dfn-panel * { margin : 0 ; padding : 0 ; text-indent : 0 ; }
- .dfn-panel > b { display : block ; }
- .dfn-panel a { color : black ; }
- .dfn-panel a :not (:hover ) { text-decoration : none !important ; border-bottom : none !important ; }
- .dfn-panel > b + b { margin-top : 0.25em ; }
- .dfn-panel ul { padding : 0 ; }
- .dfn-panel li { list-style : inside ; }
- .dfn-panel.activated {
- display : inline-block ;
- position : fixed ;
- left : .5em ;
- bottom : 2em ;
- margin : 0 auto ;
- max-width : calc(100 vw - 1.5em - .4em - .5em );
- max-height : 30 vh;
- }
-
- .dfn-paneled { cursor : pointer ; }
- </style >
<style >/* style-selflinks */
.heading , .issue , .note , .example , li , dt {
@@ -1274,6 +1210,35 @@
a .self-link ::before { content : " ¶" ; }
.heading > a .self-link ::before { content : " §" ; }
dfn > a .self-link ::before { content : " #" ; }</style >
+<style >/* style-counters */
+
+ body {
+ counter-reset : example figure issue;
+ }
+ .issue {
+ counter-increment : issue;
+ }
+ .issue :not (.no-marker )::before {
+ content : " Issue " counter (issue );
+ }
+
+ .example {
+ counter-increment : example;
+ }
+ .example :not (.no-marker )::before {
+ content : " Example " counter (example );
+ }
+ .invalid.example :not (.no-marker )::before ,
+ .illegal.example :not (.no-marker )::before {
+ content : " Invalid Example" counter (example );
+ }
+
+ figcaption {
+ counter-increment : figure;
+ }
+ figcaption :not (.no-marker )::before {
+ content : " Figure " counter (figure );
+ }</style >
<style >/* style-autolinks */
.css.css , .property.property , .descriptor.descriptor {
@@ -1336,11 +1301,106 @@
[data-link -type=biblio] {
white-space : pre ;
}</style >
+<style >/* style-dfn-panel */
+
+ .dfn-panel {
+ position : absolute ;
+ z-index : 35 ;
+ height : auto ;
+ width : -webkit-fit-content;
+ width : fit-content;
+ max-width : 300px ;
+ max-height : 500px ;
+ overflow : auto ;
+ padding : 0.5em 0.75em ;
+ font : small Helvetica Neue, sans-serif , Droid Sans Fallback;
+ background : #DDDDDD ;
+ color : black ;
+ border : outset 0.2em ;
+ }
+ .dfn-panel :not (.on ) { display : none ; }
+ .dfn-panel * { margin : 0 ; padding : 0 ; text-indent : 0 ; }
+ .dfn-panel > b { display : block ; }
+ .dfn-panel a { color : black ; }
+ .dfn-panel a :not (:hover ) { text-decoration : none !important ; border-bottom : none !important ; }
+ .dfn-panel > b + b { margin-top : 0.25em ; }
+ .dfn-panel ul { padding : 0 ; }
+ .dfn-panel li { list-style : inside ; }
+ .dfn-panel.activated {
+ display : inline-block ;
+ position : fixed ;
+ left : .5em ;
+ bottom : 2em ;
+ margin : 0 auto ;
+ max-width : calc(100 vw - 1.5em - .4em - .5em );
+ max-height : 30 vh;
+ }
+
+ .dfn-paneled { cursor : pointer ; }
+ </style >
+<style >/* style-syntax-highlighting */
+pre .idl.highlight { color : #708090 ; }
+ .highlight :not (.idl ) { background : hsl (24 , 20% , 95% ); }
+ code .highlight { padding : .1em ; border-radius : .3em ; }
+ pre .highlight , pre > code .highlight { display : block ; padding : 1em ; margin : .5em 0 ; overflow : auto ; border-radius : 0 ; }
+ .highlight .c { color : #708090 } /* Comment */
+ .highlight .k { color : #990055 } /* Keyword */
+ .highlight .l { color : #000000 } /* Literal */
+ .highlight .n { color : #0077aa } /* Name */
+ .highlight .o { color : #999999 } /* Operator */
+ .highlight .p { color : #999999 } /* Punctuation */
+ .highlight .cm { color : #708090 } /* Comment.Multiline */
+ .highlight .cp { color : #708090 } /* Comment.Preproc */
+ .highlight .c1 { color : #708090 } /* Comment.Single */
+ .highlight .cs { color : #708090 } /* Comment.Special */
+ .highlight .kc { color : #990055 } /* Keyword.Constant */
+ .highlight .kd { color : #990055 } /* Keyword.Declaration */
+ .highlight .kn { color : #990055 } /* Keyword.Namespace */
+ .highlight .kp { color : #990055 } /* Keyword.Pseudo */
+ .highlight .kr { color : #990055 } /* Keyword.Reserved */
+ .highlight .kt { color : #990055 } /* Keyword.Type */
+ .highlight .ld { color : #000000 } /* Literal.Date */
+ .highlight .m { color : #000000 } /* Literal.Number */
+ .highlight .s { color : #a67f59 } /* Literal.String */
+ .highlight .na { color : #0077aa } /* Name.Attribute */
+ .highlight .nc { color : #0077aa } /* Name.Class */
+ .highlight .no { color : #0077aa } /* Name.Constant */
+ .highlight .nd { color : #0077aa } /* Name.Decorator */
+ .highlight .ni { color : #0077aa } /* Name.Entity */
+ .highlight .ne { color : #0077aa } /* Name.Exception */
+ .highlight .nf { color : #0077aa } /* Name.Function */
+ .highlight .nl { color : #0077aa } /* Name.Label */
+ .highlight .nn { color : #0077aa } /* Name.Namespace */
+ .highlight .py { color : #0077aa } /* Name.Property */
+ .highlight .nt { color : #669900 } /* Name.Tag */
+ .highlight .nv { color : #222222 } /* Name.Variable */
+ .highlight .ow { color : #999999 } /* Operator.Word */
+ .highlight .mb { color : #000000 } /* Literal.Number.Bin */
+ .highlight .mf { color : #000000 } /* Literal.Number.Float */
+ .highlight .mh { color : #000000 } /* Literal.Number.Hex */
+ .highlight .mi { color : #000000 } /* Literal.Number.Integer */
+ .highlight .mo { color : #000000 } /* Literal.Number.Oct */
+ .highlight .sb { color : #a67f59 } /* Literal.String.Backtick */
+ .highlight .sc { color : #a67f59 } /* Literal.String.Char */
+ .highlight .sd { color : #a67f59 } /* Literal.String.Doc */
+ .highlight .s2 { color : #a67f59 } /* Literal.String.Double */
+ .highlight .se { color : #a67f59 } /* Literal.String.Escape */
+ .highlight .sh { color : #a67f59 } /* Literal.String.Heredoc */
+ .highlight .si { color : #a67f59 } /* Literal.String.Interpol */
+ .highlight .sx { color : #a67f59 } /* Literal.String.Other */
+ .highlight .sr { color : #a67f59 } /* Literal.String.Regex */
+ .highlight .s1 { color : #a67f59 } /* Literal.String.Single */
+ .highlight .ss { color : #a67f59 } /* Literal.String.Symbol */
+ .highlight .vc { color : #0077aa } /* Name.Variable.Class */
+ .highlight .vg { color : #0077aa } /* Name.Variable.Global */
+ .highlight .vi { color : #0077aa } /* Name.Variable.Instance */
+ .highlight .il { color : #000000 } /* Literal.Number.Integer.Long */
+ </style >
<body class =" h-entry" >
<div class =" head" >
<p data-fill-with =" logo" ><a class =" logo" href =" http://www.w3.org/" > <img alt =" W3C" height =" 48" src =" https://www.w3.org/StyleSheets/TR/2016/logos/W3C" width =" 72" > </a > </p >
<h1 class =" p-name no-ref" id =" title" >Subresource Integrity</h1 >
- <h2 class =" no-num no-toc no-ref heading settled" id =" subtitle" ><span class =" content" >Editor’s Draft, <time class =" dt-updated" datetime =" 2016-06-15 " >15 June 2016</time ></span ></h2 >
+ <h2 class =" no-num no-toc no-ref heading settled" id =" subtitle" ><span class =" content" >Editor’s Draft, <time class =" dt-updated" datetime =" 2016-06-21 " >21 June 2016</time ></span ></h2 >
<div data-fill-with =" spec-metadata" >
<dl >
<dt >This version:
@@ -1603,7 +1663,7 @@ <h2 class="heading settled" data-level="3" id="framework"><span class="secno">3.
resource, and transmitting that digest to a user agent so that it may be
used to verify the response.</p >
<h3 class =" heading settled" data-level =" 3.1" id =" integrity-metadata-description" ><span class =" secno" >3.1. </span ><span class =" content" >Integrity metadata</span ><a class =" self-link" href =" #integrity-metadata-description" ></a ></h3 >
- <p >To verify the integrity of a response, a user agent requires <dfn class =" dfn-paneled" data-dfn-type =" dfn" data-noexport =" " id =" integrity-metadata" >integrity
+ <p >To verify the integrity of a response, a user agent requires <dfn class =" dfn-paneled" data-dfn-type =" dfn" data-lt = " integrity metadata " data- noexport =" " id =" integrity-metadata" >integrity
metadata</dfn > as part of the <a data-link-type =" dfn" href =" https://fetch.spec.whatwg.org#concept-request" >request</a >. This metadata consists of the
following pieces of information:</p >
<ul >
@@ -1931,16 +1991,16 @@ <h3 class="heading settled" data-level="3.6" id="the-integrity-attribute"><span
as possible.</p >
<h3 class =" heading settled" data-level =" 3.7" id =" interface-extensions" ><span class =" secno" >3.7. </span ><span class =" content" >Element interface extensions</span ><a class =" self-link" href =" #interface-extensions" ></a ></h3 >
<h4 class =" heading settled" data-level =" 3.7.1" id =" HTMLLinkElement" ><span class =" secno" >3.7.1. </span ><span class =" content" >HTMLLinkElement</span ><a class =" self-link" href =" #HTMLLinkElement" ></a ></h4 >
-<pre class =" idl def" >partial interface <a class =" idl-code" data-link-type =" interface" href =" https://html.spec.whatwg.org/multipage/semantics.html#htmllinkelement" >HTMLLinkElement</a > {
- attribute DOMString <dfn class =" idl-code" data-dfn-for =" HTMLLinkElement" data-dfn-type =" attribute" data-export =" " data-type =" DOMString" id =" dom-htmllinkelement-integrity" >integrity<a class =" self-link" href =" #dom-htmllinkelement-integrity" ></a ></dfn >;
+<pre class =" idl highlight def" >< span class = " kt " > partial</ span > < span class = " kt " > interface</ span > <a class =" nv idl-code" data-link-type =" interface" href =" https://html.spec.whatwg.org/multipage/semantics.html#htmllinkelement" >HTMLLinkElement</a > {
+ < span class = " kt " > attribute</ span > < span class = " kt " > DOMString</ span > <dfn class =" nv idl-code" data-dfn-for =" HTMLLinkElement" data-dfn-type =" attribute" data-export =" " data-type =" DOMString" id =" dom-htmllinkelement-integrity" >integrity<a class =" self-link" href =" #dom-htmllinkelement-integrity" ></a ></dfn >;
};
</pre >
<h5 class =" heading settled" data-level =" 3.7.1.1" id =" HTMLLinkElement-Attributes" ><span class =" secno" >3.7.1.1. </span ><span class =" content" >Attributes</span ><a class =" self-link" href =" #HTMLLinkElement-Attributes" ></a ></h5 >
<b >integrity</b > of type <code >DOMString</code >: The value of this element’s integrity
attribute.
<h4 class =" heading settled" data-level =" 3.7.2" id =" HTMLScriptElement" ><span class =" secno" >3.7.2. </span ><span class =" content" >HTMLScriptElement</span ><a class =" self-link" href =" #HTMLScriptElement" ></a ></h4 >
-<pre class =" idl def" >partial interface <a class =" idl-code" data-link-type =" interface" href =" https://html.spec.whatwg.org/multipage/scripting.html#htmlscriptelement" >HTMLScriptElement</a > {
- attribute DOMString <dfn class =" idl-code" data-dfn-for =" HTMLScriptElement" data-dfn-type =" attribute" data-export =" " data-type =" DOMString" id =" dom-htmlscriptelement-integrity" >integrity<a class =" self-link" href =" #dom-htmlscriptelement-integrity" ></a ></dfn >;
+<pre class =" idl highlight def" >< span class = " kt " > partial</ span > < span class = " kt " > interface</ span > <a class =" nv idl-code" data-link-type =" interface" href =" https://html.spec.whatwg.org/multipage/scripting.html#htmlscriptelement" >HTMLScriptElement</a > {
+ < span class = " kt " > attribute</ span > < span class = " kt " > DOMString</ span > <dfn class =" nv idl-code" data-dfn-for =" HTMLScriptElement" data-dfn-type =" attribute" data-export =" " data-type =" DOMString" id =" dom-htmlscriptelement-integrity" >integrity<a class =" self-link" href =" #dom-htmlscriptelement-integrity" ></a ></dfn >;
};
</pre >
<h5 class =" heading settled" data-level =" 3.7.2.1" id =" HTMLScriptElement-Attributes" ><span class =" secno" >3.7.2.1. </span ><span class =" content" >Attributes</span ><a class =" self-link" href =" #HTMLScriptElement-Attributes" ></a ></h5 >
@@ -2080,8 +2140,7 @@ <h3 class="no-num no-ref heading settled" id="index-defined-here"><span class="c
<li ><a href =" #dom-htmlscriptelement-integrity" >attribute for HTMLScriptElement</a ><span >, in §3.7.2</span >
</ul >
<li ><a href =" #grammardef-integrity-metadata" >integrity-metadata</a ><span >, in §3.6</span >
- <li ><a href =" #integrity-metadata" >integrity
-metadata</a ><span >, in §3.1</span >
+ <li ><a href =" #integrity-metadata" >integrity metadata</a ><span >, in §3.1</span >
<li ><a href =" #known-tokens" >known tokens</a ><span >, in §3.3.1</span >
<li ><a href =" #grammardef-option-expression" >option-expression</a ><span >, in §3.6</span >
<li ><a href =" #origin" >origin</a ><span >, in §2</span >
@@ -2163,15 +2222,15 @@ <h3 class="no-num no-ref heading settled" id="normative"><span class="content">N
<dt id =" biblio-abnf" >[ABNF]
<dd >D. Crocker, Ed.; P. Overell. <a href =" https://tools.ietf.org/html/rfc5234" >Augmented BNF for Syntax Specifications: ABNF</a >. January 2008. Internet Standard. URL: <a href =" https://tools.ietf.org/html/rfc5234" >https://tools.ietf.org/html/rfc5234</a >
<dt id =" biblio-cors" >[CORS]
- <dd >Anne van Kesteren. <a href =" http ://www.w3.org/TR/cors/" >Cross-Origin Resource Sharing</a >. 16 January 2014. REC. URL: <a href =" http ://www.w3.org/TR/cors/" >http ://www.w3.org/TR/cors/</a >
+ <dd >Anne van Kesteren. <a href =" https ://www.w3.org/TR/cors/" >Cross-Origin Resource Sharing</a >. 16 January 2014. REC. URL: <a href =" https ://www.w3.org/TR/cors/" >https ://www.w3.org/TR/cors/</a >
<dt id =" biblio-csp1" >[CSP1]
<dd >Brandon Sterne; Adam Barth. <a href =" http://dvcs.w3.org/hg/content-security-policy/raw-file/tip/csp-1.0-specification.html" >Content Security Policy 1.0</a >. 19 February 2015. NOTE. URL: <a href =" http://dvcs.w3.org/hg/content-security-policy/raw-file/tip/csp-1.0-specification.html" >http://dvcs.w3.org/hg/content-security-policy/raw-file/tip/csp-1.0-specification.html</a >
<dt id =" biblio-fetch" >[FETCH]
<dd >Anne van Kesteren. <a href =" https://fetch.spec.whatwg.org/" >Fetch Standard</a >. Living Standard. URL: <a href =" https://fetch.spec.whatwg.org/" >https://fetch.spec.whatwg.org/</a >
<dt id =" biblio-html" >[HTML]
<dd >Ian Hickson. <a href =" https://html.spec.whatwg.org/multipage/" >HTML Standard</a >. Living Standard. URL: <a href =" https://html.spec.whatwg.org/multipage/" >https://html.spec.whatwg.org/multipage/</a >
<dt id =" biblio-html5" >[HTML5]
- <dd >Ian Hickson; et al. <a href =" http ://www.w3.org/html/wg/drafts/html/master/" >HTML5</a >. 28 October 2014. REC. URL: <a href =" http ://www.w3.org/html/wg/drafts/html/master/" >http ://www.w3.org/html/wg/drafts/html/master/</a >
+ <dd >Ian Hickson; et al. <a href =" https ://www.w3.org/html/wg/drafts/html/master/" >HTML5</a >. 28 October 2014. REC. URL: <a href =" https ://www.w3.org/html/wg/drafts/html/master/" >https ://www.w3.org/html/wg/drafts/html/master/</a >
<dt id =" biblio-mime-types" >[MIME-TYPES]
<dd >N. Freed; N. Borenstein. <a href =" https://tools.ietf.org/html/rfc2046" >Multipurpose Internet Mail Extensions (MIME) Part Two: Media Types</a >. November 1996. Draft Standard. URL: <a href =" https://tools.ietf.org/html/rfc2046" >https://tools.ietf.org/html/rfc2046</a >
<dt id =" biblio-origin" >[ORIGIN]
@@ -2203,12 +2262,12 @@ <h3 class="no-num no-ref heading settled" id="informative"><span class="content"
<dd >T. Dierks; E. Rescorla. <a href =" https://tools.ietf.org/html/rfc5246" >The Transport Layer Security (TLS) Protocol Version 1.2</a >. August 2008. Proposed Standard. URL: <a href =" https://tools.ietf.org/html/rfc5246" >https://tools.ietf.org/html/rfc5246</a >
</dl >
<h2 class =" no-num no-ref heading settled" id =" idl-index" ><span class =" content" >IDL Index</span ><a class =" self-link" href =" #idl-index" ></a ></h2 >
-<pre class =" idl def" >partial interface <a class =" idl-code" data-link-type =" interface" href =" https://html.spec.whatwg.org/multipage/semantics.html#htmllinkelement" >HTMLLinkElement</a > {
- attribute DOMString <a data-type =" DOMString" href =" #dom-htmllinkelement-integrity" >integrity</a >;
+<pre class =" idl def" >< span class = " kt " > partial</ span > < span class = " kt " > interface</ span > <a class =" nv idl-code" data-link-type =" interface" href =" https://html.spec.whatwg.org/multipage/semantics.html#htmllinkelement" >HTMLLinkElement</a > {
+ < span class = " kt " > attribute</ span > < span class = " kt " > DOMString</ span > <a class = " nv " data-type =" DOMString" href =" #dom-htmllinkelement-integrity" >integrity</a >;
};
-partial interface <a class =" idl-code" data-link-type =" interface" href =" https://html.spec.whatwg.org/multipage/scripting.html#htmlscriptelement" >HTMLScriptElement</a > {
- attribute DOMString <a data-type =" DOMString" href =" #dom-htmlscriptelement-integrity" >integrity</a >;
+< span class = " kt " > partial</ span > < span class = " kt " > interface</ span > <a class =" nv idl-code" data-link-type =" interface" href =" https://html.spec.whatwg.org/multipage/scripting.html#htmlscriptelement" >HTMLScriptElement</a > {
+ < span class = " kt " > attribute</ span > < span class = " kt " > DOMString</ span > <a class = " nv " data-type =" DOMString" href =" #dom-htmlscriptelement-integrity" >integrity</a >;
};
</pre >
0 comments on commit
42e2d03