--- a/encrypted-media/encrypted-media.html Thu Dec 12 15:43:51 2013 -0800
+++ b/encrypted-media/encrypted-media.html Tue Dec 17 14:26:34 2013 -0800
@@ -56,7 +56,7 @@
<div class="head">
<p><a href="http://www.w3.org/"><img src="https://www.w3.org/Icons/w3c_home" alt="W3C" width="72" height="48"></a></p>
<h1>Encrypted Media Extensions</h1>
- <h2 id="draft-date">W3C Editor's Draft 12 December 2013</h2>
+ <h2 id="draft-date">W3C Editor's Draft 17 December 2013</h2>
<dl>
<dt>This Version:</dt>
<dd><a href="http://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypted-media.html">http://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypted-media.html</a></dd>
@@ -712,8 +712,7 @@
<h4 id="session-state-transitions">2.3.2 MediaKeySession State Transitions</h4>
<p>The following diagram shows the possible state transitions and the events fired when changing state:</p>
- <p><img src="session_state.svg" width="528" height="408" alt="State transition diagram"></p>
- <p class="issue">TODO: Need to update the state diagram with CLOSED state.</p>
+ <p><img src="session_state.svg" width="631" height="408" alt="State transition diagram"></p>
<h3 id="media-element-restictions">2.3 Media Element Restrictions</h3>
<p><i>This section is non-normative.</i></p>
--- a/encrypted-media/encrypted-media.xml Thu Dec 12 15:43:51 2013 -0800
+++ b/encrypted-media/encrypted-media.xml Tue Dec 17 14:26:34 2013 -0800
@@ -55,7 +55,7 @@
<div class="head">
<p><a href="http://www.w3.org/"><img src="https://www.w3.org/Icons/w3c_home" alt="W3C" width="72" height="48" /></a></p>
<h1>Encrypted Media Extensions</h1>
- <h2 id="draft-date">W3C Editor's Draft 12 December 2013</h2>
+ <h2 id="draft-date">W3C Editor's Draft 17 December 2013</h2>
<dl>
<dt>This Version:</dt>
<dd><a href="http://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypted-media.html">http://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypted-media.html</a></dd>
@@ -676,8 +676,7 @@
<h4 id="session-state-transitions">2.3.2 MediaKeySession State Transitions</h4>
<p>The following diagram shows the possible state transitions and the events fired when changing state:</p>
- <p><img src="session_state.svg" width="528" height="408" alt="State transition diagram"/></p>
- <p class="issue">TODO: Need to update the state diagram with CLOSED state.</p>
+ <p><img src="session_state.svg" width="631" height="408" alt="State transition diagram"/></p>
<h3 id="media-element-restictions">2.3 Media Element Restrictions</h3>
<non-normative-section/>
--- a/encrypted-media/session_state.svg Thu Dec 12 15:43:51 2013 -0800
+++ b/encrypted-media/session_state.svg Tue Dec 17 14:26:34 2013 -0800
@@ -2,7 +2,8 @@
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<!-- Generated by Microsoft Visio, SVG Export SessionState.svg Page-1 -->
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events"
- width="11in" height="8.5in" viewBox="0 0 792 612" xml:space="preserve" color-interpolation-filters="sRGB" class="st11">
+ width="12.0421in" height="7.78125in" viewBox="0 0 867.029 560.25" xml:space="preserve" color-interpolation-filters="sRGB"
+ class="st14">
<style type="text/css">
<![CDATA[
.st1 {visibility:visible}
@@ -13,9 +14,12 @@
.st6 {fill:#5b9bd5;fill-opacity:1;stroke:#5b9bd5;stroke-opacity:1;stroke-width:0.64102564102564}
.st7 {fill:#ffffff;stroke:none;stroke-linecap:butt;stroke-width:7.2}
.st8 {fill:#4f87bb;font-family:Calibri;font-size:1.5em}
- .st9 {marker-start:url(#mrkr4-66);stroke:#5b9bd5;stroke-linecap:round;stroke-linejoin:round;stroke-width:4.5}
- .st10 {fill:#4f88bb;font-family:Calibri;font-size:1.5em}
- .st11 {fill:none;fill-rule:evenodd;font-size:12px;overflow:visible;stroke-linecap:square;stroke-miterlimit:3}
+ .st9 {fill:#ffffff;stroke:none;stroke-linecap:butt}
+ .st10 {marker-start:url(#mrkr4-66);stroke:#5b9bd5;stroke-linecap:round;stroke-linejoin:round;stroke-width:4.5}
+ .st11 {fill:#4f88bb;font-family:Calibri;font-size:1.5em}
+ .st12 {marker-end:url(#mrkr4-101);stroke:#5b9bd5;stroke-linecap:round;stroke-linejoin:round;stroke-width:1}
+ .st13 {fill:#5b9bd5;fill-opacity:1;stroke:#5b9bd5;stroke-opacity:1;stroke-width:0.28409090909091}
+ .st14 {fill:none;fill-rule:evenodd;font-size:12px;overflow:visible;stroke-linecap:square;stroke-miterlimit:3}
]]>
</style>
@@ -29,6 +33,9 @@
<marker id="mrkr4-66" class="st6" refX="3.04" orient="auto" markerUnits="strokeWidth" overflow="visible">
<use xlink:href="#lend4" transform="scale(1.56) "/>
</marker>
+ <marker id="mrkr4-101" class="st13" refX="-7.04" orient="auto" markerUnits="strokeWidth" overflow="visible">
+ <use xlink:href="#lend4" transform="scale(-3.52,-3.52) "/>
+ </marker>
</defs>
<defs id="Filters">
<filter id="filter_2">
@@ -37,79 +44,109 @@
</defs>
<g>
<title>Page-1</title>
- <g id="shape21-1" transform="translate(324,-463.5)">
+ <g id="shape21-1" transform="translate(273.029,-432.848)">
<title>Square</title>
<desc>CREATED</desc>
<g id="shadow21-2" transform="matrix(1,0,0,1,0.345598,1.97279)" class="st1">
- <rect x="0" y="504" width="108" height="108" class="st2"/>
+ <rect x="0" y="452.25" width="108" height="108" class="st2"/>
</g>
- <rect x="0" y="504" width="108" height="108" class="st3"/>
- <text x="20.4" y="563.4" class="st4">CREATED</text> </g>
- <g id="shape22-7" transform="translate(324,-261)">
+ <rect x="0" y="452.25" width="108" height="108" class="st3"/>
+ <text x="20.4" y="511.65" class="st4">CREATED</text> </g>
+ <g id="shape22-7" transform="translate(273.029,-230.348)">
<title>Square.22</title>
<desc>PENDING</desc>
<g id="shadow22-8" transform="matrix(1,0,0,1,0.345598,1.97279)" class="st1">
- <rect x="0" y="504" width="108" height="108" class="st2"/>
+ <rect x="0" y="452.25" width="108" height="108" class="st2"/>
</g>
- <rect x="0" y="504" width="108" height="108" class="st3"/>
- <text x="19.85" y="563.4" class="st4">PENDING</text> </g>
- <g id="shape24-13" transform="translate(324,-54)">
+ <rect x="0" y="452.25" width="108" height="108" class="st3"/>
+ <text x="19.85" y="511.65" class="st4">PENDING</text> </g>
+ <g id="shape24-13" transform="translate(273.029,-23.3478)">
<title>Square.24</title>
<desc>READY</desc>
<g id="shadow24-14" transform="matrix(1,0,0,1,0.345598,1.97279)" class="st1">
- <rect x="0" y="504" width="108" height="108" class="st2"/>
+ <rect x="0" y="452.25" width="108" height="108" class="st2"/>
</g>
- <rect x="0" y="504" width="108" height="108" class="st3"/>
- <text x="29.59" y="563.4" class="st4">READY</text> </g>
- <g id="shape8-19" transform="translate(423,-517.5)">
+ <rect x="0" y="452.25" width="108" height="108" class="st3"/>
+ <text x="29.59" y="511.65" class="st4">READY</text> </g>
+ <g id="shape8-19" transform="translate(372.029,-512.471)">
<title>Dynamic connector</title>
<desc>READY</desc>
- <path d="M9 612 L180 612 L180 1021.5 L23.04 1021.5" class="st5"/>
- <rect x="142.132" y="805.95" width="75.7354" height="21.5999" class="st7"/>
- <text x="142.13" y="822.15" class="st8">READY</text> </g>
- <g id="shape10-27" transform="translate(369,-463.5)">
+ <path d="M9 560.25 L433.59 560.25 L433.59 1024.62 L23.04 1024.62" class="st5"/>
+ <rect x="406.809" y="780.671" width="48.8232" height="21.5999" class="st7"/>
+ <text x="406.81" y="796.87" class="st8">READY</text> </g>
+ <g id="shape10-27" transform="translate(318.029,-432.848)">
<title>Dynamic connector.10</title>
<desc>MESSAGE</desc>
- <path d="M9 612 L9 692.46" class="st5"/>
- <rect x="-40.0957" y="648.45" width="98.1914" height="21.5999" class="st7"/>
- <text x="-40.1" y="664.65" class="st8">MESSAGE</text> </g>
- <g id="shape23-34" transform="translate(72,-261)">
+ <path d="M9 560.25 L9 640.71" class="st5"/>
+ <rect x="-26.6396" y="596.7" width="71.2793" height="21.5999" class="st9"/>
+ <text x="-26.64" y="612.9" class="st8">MESSAGE</text> </g>
+ <g id="shape23-34" transform="translate(21.0294,-230.348)">
<title>Square.23</title>
<desc>ERROR</desc>
<g id="shadow23-35" transform="matrix(1,0,0,1,0.345598,1.97279)" class="st1">
- <rect x="0" y="504" width="108" height="108" class="st2"/>
+ <rect x="0" y="452.25" width="108" height="108" class="st2"/>
</g>
- <rect x="0" y="504" width="108" height="108" class="st3"/>
- <text x="28.99" y="563.4" class="st4">ERROR</text> </g>
- <g id="shape13-40" transform="translate(324,-517.5)">
+ <rect x="0" y="452.25" width="108" height="108" class="st3"/>
+ <text x="28.99" y="511.65" class="st4">ERROR</text> </g>
+ <g id="shape13-40" transform="translate(273.029,-486.848)">
<title>Dynamic connector.13</title>
<desc>ERROR</desc>
- <path d="M0 612 L-198 612 L-198 746.46" class="st5"/>
- <rect x="-211.72" y="601.2" width="76.9395" height="21.5999" class="st7"/>
- <text x="-211.72" y="617.4" class="st8">ERROR</text> </g>
- <g id="shape14-47" transform="translate(324,-306)">
+ <path d="M0 560.25 L-198 560.25 L-198 694.71" class="st5"/>
+ <rect x="-122.889" y="548.325" width="50.0273" height="21.5999" class="st7"/>
+ <text x="-122.89" y="564.53" class="st8">ERROR</text> </g>
+ <g id="shape14-47" transform="translate(273.029,-275.348)">
<title>Dynamic connector.14</title>
<desc>ERROR</desc>
- <path d="M0 603 L-129.96 603" class="st5"/>
- <rect x="-110.47" y="592.2" width="76.9395" height="21.5999" class="st7"/>
- <text x="-110.47" y="608.4" class="st8">ERROR</text> </g>
- <g id="shape28-54" transform="translate(1017,351) rotate(90)">
+ <path d="M0 551.25 L-129.96 551.25" class="st5"/>
+ <rect x="-97.0137" y="540.45" width="50.0273" height="21.5999" class="st7"/>
+ <text x="-97.01" y="556.65" class="st8">ERROR</text> </g>
+ <g id="shape28-54" transform="translate(914.279,329.902) rotate(90)">
<title>Sheet.28</title>
<desc>READY</desc>
- <path d="M0 612 L84.96 612" class="st5"/>
- <rect x="-636.368" y="47.7002" width="75.7354" height="21.5999" transform="rotate(-90)" class="st7"/>
- <text x="-636.37" y="63.9" transform="rotate(-90)" class="st8">READY</text> </g>
- <g id="shape29-61" transform="translate(963,351) rotate(90)">
+ <path d="M0 560.25 L84.96 560.25" class="st5"/>
+ <rect x="-571.162" y="47.7002" width="48.8232" height="21.5999" transform="rotate(-90)" class="st7"/>
+ <text x="-571.16" y="63.9" transform="rotate(-90)" class="st8">READY</text> </g>
+ <g id="shape29-61" transform="translate(860.279,329.902) rotate(90)">
<title>Sheet.29</title>
<desc>MESSAGE</desc>
- <path d="M13.68 612 L14.04 612 L99 612" class="st9"/>
- <rect x="-676.846" y="25.2002" width="98.1914" height="21.5999" transform="rotate(-90)" class="st7"/>
- <text x="-676.85" y="41.4" transform="rotate(-90)" class="st8">MESSAGE</text> </g>
- <g id="shape30-69" transform="translate(423,-351)">
+ <path d="M13.68 560.25 L14.04 560.25 L99 560.25" class="st10"/>
+ <rect x="-611.64" y="25.2002" width="71.2793" height="21.5999" transform="rotate(-90)" class="st7"/>
+ <text x="-611.64" y="41.4" transform="rotate(-90)" class="st8">MESSAGE</text> </g>
+ <g id="shape30-69" transform="translate(372.029,-298.642)">
<title>Dynamic connector.30</title>
<desc>MESSAGE</desc>
- <path d="M9 612 L69.48 612 L69.48 684 L23.04 684" class="st5"/>
- <rect x="20.3843" y="637.2" width="98.1914" height="21.5999" class="st7"/>
- <text x="20.38" y="653.4" class="st10">MESSAGE</text> </g>
+ <path d="M9 560.25 L69.48 560.25 L69.48 610.54 L23.04 610.54" class="st5"/>
+ <rect x="33.8404" y="574.597" width="71.2793" height="21.5999" class="st7"/>
+ <text x="33.84" y="590.8" class="st11">MESSAGE</text> </g>
+ <g id="shape31-76" transform="translate(624.029,-230.348)">
+ <title>Square.31</title>
+ <desc>CLOSED</desc>
+ <g id="shadow31-77" transform="matrix(1,0,0,1,0.345598,1.97279)" class="st1">
+ <rect x="0" y="452.25" width="108" height="108" class="st2"/>
+ </g>
+ <rect x="0" y="452.25" width="108" height="108" class="st3"/>
+ <text x="25.39" y="511.65" class="st4">CLOSED</text> </g>
+ <g id="shape32-82" transform="translate(381.029,-462.76)">
+ <title>Dynamic connector.32</title>
+ <desc>CLOSED</desc>
+ <path d="M0 560.25 L297 560.25 L297 670.62" class="st5"/>
+ <rect x="268.392" y="605.755" width="57.2168" height="21.5999" class="st7"/>
+ <text x="268.39" y="621.95" class="st11">CLOSED</text> </g>
+ <g id="shape33-89" transform="translate(381.029,-311.877)">
+ <title>Dynamic connector.33</title>
+ <desc>CLOSED</desc>
+ <path d="M0 551.25 L231.61 551.25" class="st5"/>
+ <rect x="97.3916" y="540.45" width="57.2168" height="21.5999" class="st7"/>
+ <text x="97.39" y="556.65" class="st11">CLOSED</text> </g>
+ <g id="shape34-96" transform="translate(318.029,-329.348)">
+ <title>Dynamic connector.34</title>
+ <path d="M9 551.25 L9 542.25 L9 544.21" class="st12"/>
+ </g>
+ <g id="shape35-102" transform="translate(381.029,-95.3478)">
+ <title>Dynamic connector.35</title>
+ <desc>CLOSED</desc>
+ <path d="M0 560.25 L296.1 560.25 L296.1 439.29" class="st5"/>
+ <rect x="267.492" y="484.123" width="57.2168" height="21.5999" class="st7"/>
+ <text x="267.49" y="500.32" class="st11">CLOSED</text> </g>
</g>
</svg>