W3C home > Mailing lists > Public > public-html-commits@w3.org > September 2012

html5/spec acknowledgements.html,1.1275,1.1276 browsers.html,1.1258,1.1259 dnd.html,1.259,1.260 history.html,1.1263,1.1264 rendering.html,1.237,1.238 single-page.html,1.97,1.98 spec.html,1.1968,1.1969 the-iframe-element.html,1.315,1.316 the-meta-element.html,1.172,1.173

From: Sam Ruby via cvs-syncmail <cvsmail@w3.org>
Date: Fri, 07 Sep 2012 19:14:39 +0000
To: public-html-commits@w3.org
Message-Id: <E1TA40l-0006zx-FX@lionel-hutz.w3.org>
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv26856

Modified Files:
	acknowledgements.html browsers.html dnd.html history.html 
	rendering.html single-page.html spec.html 
	the-iframe-element.html the-meta-element.html 
Log Message:
commit 09d95c9884c0be21e5ebe41105e993c745bc43a9
Author: Silvia Pfeiffer <silviapfeiffer1@gmail.com>
Date:   Fri Sep 7 20:43:06 2012 +1000

    Merge error fix.


Index: browsers.html
===================================================================
RCS file: /sources/public/html5/spec/browsers.html,v
retrieving revision 1.1258
retrieving revision 1.1259
diff -u -d -r1.1258 -r1.1259
--- browsers.html	7 Sep 2012 11:14:05 -0000	1.1258
+++ browsers.html	7 Sep 2012 19:14:35 -0000	1.1259
@@ -971,8 +971,8 @@
     <p>If the given browsing context name is the empty string or <code title="">_self</code>, then the chosen browsing context must be
     the current one.</p>
 
-    <p>If the given browsing context name is <code title="">_self</code>, then this is an <dfn id="explicit-self-navigation-override">explicit
-    self-navigation override</dfn>, which overrides the behavior of
+    <p>If the given browsing context name is <code title="">_self</code>, then this is an <a href="history.html#explicit-self-navigation-override">explicit
+    self-navigation override</a>, which overrides the behavior of
     the <a href="the-iframe-element.html#seamless-browsing-context-flag">seamless browsing context flag</a> set by the <code title="attr-iframe-seamless"><a href="the-iframe-element.html#attr-iframe-seamless">seamless</a></code> attribute on
     <code><a href="the-iframe-element.html#the-iframe-element">iframe</a></code> elements.</p>
 
@@ -1001,7 +1001,7 @@
     most recently focused, or more closely related.</p>
 
     <p>If the browsing context is chosen by this step to be the
-    current browsing context, then this is also an <a href="#explicit-self-navigation-override">explicit
+    current browsing context, then this is also an <a href="history.html#explicit-self-navigation-override">explicit
     self-navigation override</a>.</p>
 
    </li>
@@ -1937,11 +1937,29 @@
 
    <dd>
 
-    <p>The <a href="#origin-0">origin</a> and <a href="#effective-script-origin">effective script
-    origin</a> of the <a href="urls.html#url">URL</a> are the origin defined in
-    <cite>The Web Origin Concept</cite>. <a href="references.html#refsORIGIN">[ORIGIN]</a></p>
+    <dl class="switch"><dt>If the URL is a <a href="infrastructure.html#data-protocol" title="data protocol"><code title="">data:</code> URL</a> used in a <code title="dom-Worker">Worker()</code> or <code title="dom-SharedWorker">SharedWorker()</code> constructor</dt>
 
-   </dd>
+     <dd>
+
+      <p>The <a href="#origin-0">origin</a> and <a href="#effective-script-origin">effective script
+      origin</a> of the <a href="urls.html#url">URL</a> are the
+      <a href="#origin-0">origin</a> and <a href="#effective-script-origin">effective script origin</a> of
+      the <a href="#entry-script">entry script</a> at the time that the constructor
+      is invoked. (They are not <a href="#concept-origin-alias" title="concept-origin-alias">aliases</a>.)</p>
+
+     </dd>
+
+     <dt>Otherwise</dt>
+
+     <dd>
+
+      <p>The <a href="#origin-0">origin</a> and <a href="#effective-script-origin">effective script
+      origin</a> of the <a href="urls.html#url">URL</a> are the origin defined in
+      <cite>The Web Origin Concept</cite>. <a href="references.html#refsORIGIN">[ORIGIN]</a></p>
+
+     </dd>
+
+    </dl></dd>
 
 
    <dt>For <code><a href="dom.html#document">Document</a></code> objects</dt>

Index: dnd.html
===================================================================
RCS file: /sources/public/html5/spec/dnd.html,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -d -r1.259 -r1.260
--- dnd.html	7 Sep 2012 11:43:44 -0000	1.259
+++ dnd.html	7 Sep 2012 19:14:35 -0000	1.260
@@ -2789,12 +2789,13 @@
 
   <p>User agents should filter potentially active (scripted) content
   (e.g. HTML) when it is dragged and when it is dropped, using a
-  whitelist of known-safe features. This specification does not
-  specify how this is performed.</p>
+  whitelist of known-safe features. Similarly, relative URLs should be
+  turned into absolute URLs to avoid references changing in unexpected
+  ways. This specification does not specify how this is performed.</p>
 
   <div class="example">
 
-   <p>Consider a hostile page providing some content and gettuing the
+   <p>Consider a hostile page providing some content and getting the
    user to select and drag and drop (or indeed, copy and paste) that
    content to a victim page's <code title="attr-contenteditable"><a href="editing.html#attr-contenteditable">contenteditable</a></code> region. If the
    browser does not ensure that only safe content is dragged,

Index: history.html
===================================================================
RCS file: /sources/public/html5/spec/history.html,v
retrieving revision 1.1263
retrieving revision 1.1264
diff -u -d -r1.1263 -r1.1264
--- history.html	7 Sep 2012 11:14:05 -0000	1.1263
+++ history.html	7 Sep 2012 19:14:35 -0000	1.1264
@@ -1261,7 +1261,7 @@
    being navigated, and this browsing context has its <a href="the-iframe-element.html#seamless-browsing-context-flag">seamless
    browsing context flag</a> set, and the <a href="browsers.html#browsing-context">browsing
    context</a> being navigated was not chosen using an
-   <a href="browsers.html#explicit-self-navigation-override">explicit self-navigation override</a>, then find the
+   <dfn id="explicit-self-navigation-override">explicit self-navigation override</dfn>, then find the
    nearest <a href="browsers.html#ancestor-browsing-context">ancestor browsing context</a> that does not have
    its <a href="the-iframe-element.html#seamless-browsing-context-flag">seamless browsing context flag</a> set, and continue
    these steps as if <em>that</em> <a href="browsers.html#browsing-context">browsing context</a> was

Index: rendering.html
===================================================================
RCS file: /sources/public/html5/spec/rendering.html,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -d -r1.237 -r1.238
--- rendering.html	7 Sep 2012 00:13:59 -0000	1.237
+++ rendering.html	7 Sep 2012 19:14:36 -0000	1.238
@@ -470,13 +470,18 @@
 
 html, body { display: block; }</pre>
 
+
+  <!-- body { margin: 8px; } -->
+
   <p>For each property in the table below, given a <code><a href="the-body-element.html#the-body-element">body</a></code>
   element, the first attribute that exists <a href="#maps-to-the-pixel-length-property">maps to the pixel
   length property</a> on the <code><a href="the-body-element.html#the-body-element">body</a></code> element. If none of
   the attributes for a property are found, or if the value of the
-  attribute that was found cannot be parsed successfully, then a
-  default value of 8px is expected to be used for that property
-  instead.</p>
+  attribute that was found cannot be parsed successfully, then, if the
+  <code><a href="the-body-element.html#the-body-element">body</a></code> element's <code><a href="dom.html#document">Document</a></code>'s <a href="browsers.html#browsing-context">browsing
+  context</a> does not have its <a href="the-iframe-element.html#seamless-browsing-context-flag">seamless browsing context
+  flag</a> set, a default value of 8px is expected to be used for
+  that property instead.</p>
 
   <table><thead><tr><th>Property
      </th><th>Source
@@ -1581,6 +1586,7 @@
   <pre class="css">@namespace url(http://www.w3.org/1999/xhtml);
 
 iframe:not([seamless]) { border: 2px inset; }
+iframe[seamless] { display: block; }
 <span id="video-object-fit">video { object-fit: contain; }</span></pre>
 
   </div>

Index: the-iframe-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-iframe-element.html,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -d -r1.315 -r1.316
--- the-iframe-element.html	7 Sep 2012 00:14:04 -0000	1.315
+++ the-iframe-element.html	7 Sep 2012 19:14:36 -0000	1.316
@@ -509,7 +509,8 @@
 
   </dl><p>Any <a href="history.html#navigate" title="navigate">navigation</a> required of the user
   agent in the <a href="#process-the-iframe-attributes">process the <code>iframe</code> attributes</a>
-  algorithm must be completed with the <code><a href="#the-iframe-element">iframe</a></code> element's
+  algorithm must be completed as an <a href="history.html#explicit-self-navigation-override">explicit self-navigation
+  override</a> and with the <code><a href="#the-iframe-element">iframe</a></code> element's
   document's <a href="browsers.html#browsing-context">browsing context</a> as the <a href="history.html#source-browsing-context">source
   browsing context</a>.</p>
 
@@ -816,7 +817,7 @@
   <ul><li><p>The user agent must set the <dfn id="seamless-browsing-context-flag">seamless browsing context
    flag</dfn> to true for that <a href="browsers.html#browsing-context">browsing context</a>. This
    will <a href="history.html#seamlessLinks">cause links to open in the parent
-   browsing context</a> unless an <a href="browsers.html#explicit-self-navigation-override">explicit self-navigation
+   browsing context</a> unless an <a href="history.html#explicit-self-navigation-override">explicit self-navigation
    override</a> is used (<code title="">target="_self"</code>).</p></li>
 
    <li><p>In a CSS-supporting user agent: the user agent must add all
@@ -836,10 +837,15 @@
    <code><a href="#the-iframe-element">iframe</a></code> element instead of taking their initial
    values.)</p></li>
 
-   <li><p>In visual media, in a CSS-supporting user agent: the user agent
-   should set the intrinsic width of the <code><a href="#the-iframe-element">iframe</a></code> to the
-   width that the element would have if it was a non-replaced
-   block-level element with 'width: auto'.</p></li>
+   <li><p>In visual media, in a CSS-supporting user agent: the user
+   agent should set the intrinsic width of the <code><a href="#the-iframe-element">iframe</a></code> to
+   the width that the element would have if it was a non-replaced
+   block-level element with 'width: auto', unless that width would be
+   zero (e.g. if the element is floating or absolutely positioned), in
+   which case the user agent should set the intrinsic width of the
+   <code><a href="#the-iframe-element">iframe</a></code> to the shrink-to-fit width of the root element
+   (if any) of the content rendered in the
+   <code><a href="#the-iframe-element">iframe</a></code>.</p></li>
 
    <li><p>In visual media, in a CSS-supporting user agent: the user
    agent should set the intrinsic height of the <code><a href="#the-iframe-element">iframe</a></code> to


Index: the-meta-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-meta-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-meta-element.html	7 Sep 2012 11:14:07 -0000	1.172
+++ the-meta-element.html	7 Sep 2012 19:14:37 -0000	1.173
@@ -480,6 +480,14 @@
 
     </div>
 
+    <p class="note">This metadata name causes conformance checkers to
+    <a href="the-img-element.html#guidance-for-conformance-checkers">silently ignore</a>
+    certain conformance errors that are inevitable when using
+    state-of-the-art editing software, to discourage such editors from
+    replacing those errors with even more incorrect markup that
+    state-of-the-art automated conformance checkers cannot distinguish
+    from valid markup.</p>
+
    </dd>
 
    <dt><dfn id="meta-keywords" title="meta-keywords"><code>keywords</code></dfn></dt>

Index: single-page.html
===================================================================
RCS file: /sources/public/html5/spec/single-page.html,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- single-page.html	7 Sep 2012 13:14:37 -0000	1.97
+++ single-page.html	7 Sep 2012 19:14:36 -0000	1.98
@@ -14445,6 +14445,14 @@
 
     </div>
 
+    <p class=note>This metadata name causes conformance checkers to
+    <a href=#guidance-for-conformance-checkers>silently ignore</a>
+    certain conformance errors that are inevitable when using
+    state-of-the-art editing software, to discourage such editors from
+    replacing those errors with even more incorrect markup that
+    state-of-the-art automated conformance checkers cannot distinguish
+    from valid markup.</p>
+
    </dd>
 
    <dt><dfn id=meta-keywords title=meta-keywords><code>keywords</code></dfn></dt>
@@ -24543,7 +24551,8 @@
 
   </dl><p>Any <a href=#navigate title=navigate>navigation</a> required of the user
   agent in the <a href=#process-the-iframe-attributes>process the <code>iframe</code> attributes</a>
-  algorithm must be completed with the <code><a href=#the-iframe-element>iframe</a></code> element's
+  algorithm must be completed as an <a href=#explicit-self-navigation-override>explicit self-navigation
+  override</a> and with the <code><a href=#the-iframe-element>iframe</a></code> element's
   document's <a href=#browsing-context>browsing context</a> as the <a href=#source-browsing-context>source
   browsing context</a>.</p>
 
@@ -24870,10 +24879,15 @@
    <code><a href=#the-iframe-element>iframe</a></code> element instead of taking their initial
    values.)</p></li>
 
-   <li><p>In visual media, in a CSS-supporting user agent: the user agent
-   should set the intrinsic width of the <code><a href=#the-iframe-element>iframe</a></code> to the
-   width that the element would have if it was a non-replaced
-   block-level element with 'width: auto'.</p></li>
+   <li><p>In visual media, in a CSS-supporting user agent: the user
+   agent should set the intrinsic width of the <code><a href=#the-iframe-element>iframe</a></code> to
+   the width that the element would have if it was a non-replaced
+   block-level element with 'width: auto', unless that width would be
+   zero (e.g. if the element is floating or absolutely positioned), in
+   which case the user agent should set the intrinsic width of the
+   <code><a href=#the-iframe-element>iframe</a></code> to the shrink-to-fit width of the root element
+   (if any) of the content rendered in the
+   <code><a href=#the-iframe-element>iframe</a></code>.</p></li>
 
    <li><p>In visual media, in a CSS-supporting user agent: the user
    agent should set the intrinsic height of the <code><a href=#the-iframe-element>iframe</a></code> to
@@ -54191,8 +54205,8 @@
     <p>If the given browsing context name is the empty string or <code title="">_self</code>, then the chosen browsing context must be
     the current one.</p>
 
-    <p>If the given browsing context name is <code title="">_self</code>, then this is an <dfn id=explicit-self-navigation-override>explicit
-    self-navigation override</dfn>, which overrides the behavior of
+    <p>If the given browsing context name is <code title="">_self</code>, then this is an <a href=#explicit-self-navigation-override>explicit
+    self-navigation override</a>, which overrides the behavior of
     the <a href=#seamless-browsing-context-flag>seamless browsing context flag</a> set by the <code title=attr-iframe-seamless><a href=#attr-iframe-seamless>seamless</a></code> attribute on
     <code><a href=#the-iframe-element>iframe</a></code> elements.</p>
 
@@ -55157,11 +55171,29 @@
 
    <dd>
 
-    <p>The <a href=#origin-0>origin</a> and <a href=#effective-script-origin>effective script
-    origin</a> of the <a href=#url>URL</a> are the origin defined in
-    <cite>The Web Origin Concept</cite>. <a href=#refsORIGIN>[ORIGIN]</a></p>
+    <dl class=switch><dt>If the URL is a <a href=#data-protocol title="data protocol"><code title="">data:</code> URL</a> used in a <code title=dom-Worker>Worker()</code> or <code title=dom-SharedWorker>SharedWorker()</code> constructor</dt>
 
-   </dd>
+     <dd>
+
+      <p>The <a href=#origin-0>origin</a> and <a href=#effective-script-origin>effective script
+      origin</a> of the <a href=#url>URL</a> are the
+      <a href=#origin-0>origin</a> and <a href=#effective-script-origin>effective script origin</a> of
+      the <a href=#entry-script>entry script</a> at the time that the constructor
+      is invoked. (They are not <a href=#concept-origin-alias title=concept-origin-alias>aliases</a>.)</p>
+
+     </dd>
+
+     <dt>Otherwise</dt>
+
+     <dd>
+
+      <p>The <a href=#origin-0>origin</a> and <a href=#effective-script-origin>effective script
+      origin</a> of the <a href=#url>URL</a> are the origin defined in
+      <cite>The Web Origin Concept</cite>. <a href=#refsORIGIN>[ORIGIN]</a></p>
+
+     </dd>
+
+    </dl></dd>
 
 
    <dt>For <code><a href=#document>Document</a></code> objects</dt>
@@ -56884,7 +56916,7 @@
    being navigated, and this browsing context has its <a href=#seamless-browsing-context-flag>seamless
    browsing context flag</a> set, and the <a href=#browsing-context>browsing
    context</a> being navigated was not chosen using an
-   <a href=#explicit-self-navigation-override>explicit self-navigation override</a>, then find the
+   <dfn id=explicit-self-navigation-override>explicit self-navigation override</dfn>, then find the
    nearest <a href=#ancestor-browsing-context>ancestor browsing context</a> that does not have
    its <a href=#seamless-browsing-context-flag>seamless browsing context flag</a> set, and continue
    these steps as if <em>that</em> <a href=#browsing-context>browsing context</a> was
@@ -67677,12 +67709,13 @@
 
   <p>User agents should filter potentially active (scripted) content
   (e.g. HTML) when it is dragged and when it is dropped, using a
-  whitelist of known-safe features. This specification does not
-  specify how this is performed.</p>
+  whitelist of known-safe features. Similarly, relative URLs should be
+  turned into absolute URLs to avoid references changing in unexpected
+  ways. This specification does not specify how this is performed.</p>
 
   <div class=example>
 
-   <p>Consider a hostile page providing some content and gettuing the
+   <p>Consider a hostile page providing some content and getting the
    user to select and drag and drop (or indeed, copy and paste) that
    content to a victim page's <code title=attr-contenteditable><a href=#attr-contenteditable>contenteditable</a></code> region. If the
    browser does not ensure that only safe content is dragged,
@@ -77293,13 +77326,18 @@
 
 html, body { display: block; }</pre>
 
+
+  <!-- body { margin: 8px; } -->
+
   <p>For each property in the table below, given a <code><a href=#the-body-element>body</a></code>
   element, the first attribute that exists <a href=#maps-to-the-pixel-length-property>maps to the pixel
   length property</a> on the <code><a href=#the-body-element>body</a></code> element. If none of
   the attributes for a property are found, or if the value of the
-  attribute that was found cannot be parsed successfully, then a
-  default value of 8px is expected to be used for that property
-  instead.</p>
+  attribute that was found cannot be parsed successfully, then, if the
+  <code><a href=#the-body-element>body</a></code> element's <code><a href=#document>Document</a></code>'s <a href=#browsing-context>browsing
+  context</a> does not have its <a href=#seamless-browsing-context-flag>seamless browsing context
+  flag</a> set, a default value of 8px is expected to be used for
+  that property instead.</p>
 
   <table><thead><tr><th>Property
      </th><th>Source
@@ -78404,6 +78442,7 @@
   <pre class=css>@namespace url(http://www.w3.org/1999/xhtml);
 
 iframe:not([seamless]) { border: 2px inset; }
+iframe[seamless] { display: block; }
 <span id=video-object-fit>video { object-fit: contain; }</span></pre>
 
   </div>
@@ -85957,6 +85996,7 @@
   James Robinson,
   Jamie Lokier,
   Jan-Klaas Kollhof,
+  Jason Duell,
   Jason Kersey,
   Jason Lustig,
   Jason White,

Index: acknowledgements.html
===================================================================
RCS file: /sources/public/html5/spec/acknowledgements.html,v
retrieving revision 1.1275
retrieving revision 1.1276
diff -u -d -r1.1275 -r1.1276
--- acknowledgements.html	7 Sep 2012 11:14:05 -0000	1.1275
+++ acknowledgements.html	7 Sep 2012 19:14:35 -0000	1.1276
@@ -602,6 +602,7 @@
   James Robinson,
   Jamie Lokier,
   Jan-Klaas Kollhof,
+  Jason Duell,
   Jason Kersey,
   Jason Lustig,
   Jason White,
Received on Friday, 7 September 2012 19:14:41 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Friday, 7 September 2012 19:14:41 GMT