Skip to content

Commit cf30ea4

Browse files
annevkannevk
committed
clean up terminology and references to other specs
1 parent 1a59bf7 commit cf30ea4

2 files changed

Lines changed: 57 additions & 68 deletions

File tree

‎cssom-view/Overview.html‎

Lines changed: 36 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,7 @@ <h2 class="no-num no-toc" id=toc>Table of Contents</h2>
104104
<li><a href="#conformance"><span class=secno>2 </span>Conformance
105105
Criteria</a>
106106
<ul class=toc>
107-
<li><a href="#dependencies"><span class=secno>2.1
108-
</span>Dependencies</a>
107+
<li><a href="#webidl"><span class=secno>2.1 </span>Web IDL</a>
109108

110109
<li><a href="#terminology"><span class=secno>2.2 </span>Terminology</a>
111110

@@ -211,25 +210,28 @@ <h2 id=conformance><span class=secno>2 </span>Conformance Criteria</h2>
211210
<p>A conforming user agent implements all the requirements made by this
212211
specification.
213212

214-
<h3 id=dependencies><span class=secno>2.1 </span>Dependencies</h3>
213+
<h3 id=webidl><span class=secno>2.1 </span>Web IDL</h3>
215214

216-
<p>This specification depends on several definitions and features defined
217-
in the HTML&nbsp;5 specification. [<cite><a
218-
href="#ref-html5">HTML5</a></cite>]
215+
<p>The IDL fragments in this specification <em class=ct>must</em> be
216+
interpreted as required for conforming IDL fragments, as described in the
217+
Web IDL specification. [<cite><a href="#ref-webidl">WebIDL</a></cite>]
219218

220-
<p>This specification also depends on several features defined in the DOM
221-
Level 2 Events and DOM Level 3 Core specifications. [<cite><a
222-
href="#ref-dom2events">DOM2Events</a></cite>] [<cite><a
223-
href="#ref-dom3core">DOM3Core</a></cite>]
219+
<h3 id=terminology><span class=secno>2.2 </span>Terminology</h3>
224220

225-
<p>This specification depends on IDL fragments as defined in the Web IDL
226-
specification. [<cite><a href="#ref-webidl">WebIDL</a></cite>]
221+
<p><dfn id=document><code>Document</code></dfn> and <dfn
222+
id=element><code>Element</code></dfn> are defined by DOM Level 3 Core.
223+
[<cite><a href="#ref-dom3core">DOM3Core</a></cite>]
227224

228-
<h3 id=terminology><span class=secno>2.2 </span>Terminology</h3>
225+
<p><dfn id=range><code>Range</code></dfn> is defined in DOM Level 2
226+
Traversal and Range. [<cite><a href="#ref-dom2tr">DOM2TR</a></cite>]
229227

230-
<p>The terms <dfn id=html-element>HTML element</dfn>, <dfn
231-
id=view>view</dfn> and <dfn id=default-view>default view</dfn> are defined
232-
by HTML&nbsp;5. [<cite><a href="#ref-html5">HTML5</a></cite>]
228+
<p><dfn id=mouseevent><code>MouseEvent</code></dfn> is defined in DOM Level
229+
2 Events. [<cite><a href="#ref-dom2events">DOM2Events</a></cite>]
230+
231+
<p><dfn id=html-element>HTML element</dfn>, <dfn
232+
id=htmlelement><code>HTMLElement</code></dfn>, <dfn id=view>view</dfn> and
233+
<dfn id=default-view>default view</dfn> are defined by HTML&nbsp;5.
234+
[<cite><a href="#ref-html5">HTML5</a></cite>]
233235

234236
<p><dfn id=the-html-body-element>The HTML <code>body</code> element</dfn>
235237
is the first <code>body</code> <a href="#html-element">HTML element</a>
@@ -290,8 +292,8 @@ <h2 id=the-abstractview-interface><span class=secno>4 </span>The <code
290292
base interface that all <a href="#view" title=view>views</a> <em
291293
class=ct>must</em> derive from.
292294

293-
<pre class=idl>[NoInterfaceObject]
294-
interface <dfn id=abstractview>AbstractView</dfn> {
295+
<pre
296+
class=idl>[NoInterfaceObject] interface <dfn id=abstractview>AbstractView</dfn> {
295297
readonly attribute <a href="#documentview">DocumentView</a> <a href="#dom-abstractview-document" title=dom-abstractview-document>document</a>;
296298
readonly attribute <a href="#media">Media</a> <a href="#dom-abstractview-media" title=dom-abstractview-media>media</a>;
297299
};</pre>
@@ -319,9 +321,9 @@ <h3 id=the-media-interface><span class=secno>4.1 </span>The <code
319321
<p>The <dfn id=dom-media-type><code>type</code></dfn> attribute, on
320322
getting, <em class=ct>must</em> return the string that represents the
321323
media type of the current <a href="#view">view</a> used for rendering the
322-
<code>Document</code>. The media types are defined by CSS 2.1 (<code
323-
title="">screen</code>, <code>print</code>, et cetera). [<cite><a
324-
href="#ref-css21">CSS21</a></cite>]
324+
<code><a href="#document">Document</a></code>. The media types are defined
325+
by CSS 2.1 (<code title="">screen</code>, <code>print</code>, et cetera).
326+
[<cite><a href="#ref-css21">CSS21</a></cite>]
325327

326328
<div class=example>
327329
<p>The following snippet determines whether the page is rendered using the
@@ -360,11 +362,11 @@ <h2 id=the-screenview-interface><span class=secno>5 </span>The <code
360362
href="#view">view</a> for visual media. If the <a
361363
href="#default-view">default view</a> is visual the <span
362364
title=dom-documentview-defaultview>defaultView</span> attribute on the
363-
<code>Document</code> object <em class=ct>must</em> return an object
364-
implementing this interface.
365+
<code><a href="#document">Document</a></code> object <em
366+
class=ct>must</em> return an object implementing this interface.
365367

366-
<pre class=idl>[NoInterfaceObject]
367-
interface <dfn id=screenview>ScreenView</dfn> : <a href="#abstractview">AbstractView</a> {
368+
<pre
369+
class=idl>[NoInterfaceObject] interface <dfn id=screenview>ScreenView</dfn> : <a href="#abstractview">AbstractView</a> {
368370
// viewport
369371
readonly attribute long <a href="#dom-screenview-innerwidth">innerWidth</a>;
370372
readonly attribute long <a href="#dom-screenview-innerheight">innerHeight</a>;
@@ -554,14 +556,14 @@ <h3 id=the-screen-interface><span class=secno>5.1 </span>The <code
554556
<h2 id=the-documentview-interface><span class=secno>6 </span>The <code
555557
title="">DocumentView</code> Interface</h2>
556558

557-
<pre class=idl>[NoInterfaceObject]
558-
interface <dfn id=documentview>DocumentView</dfn> {
559+
<pre
560+
class=idl>[NoInterfaceObject] interface <dfn id=documentview>DocumentView</dfn> {
559561
readonly attribute <a href="#abstractview">AbstractView</a> <a href="#dom-documentview-defaultview">defaultView</a>;
560562
Element <a href="#dom-documentview-elementfrompoint">elementFromPoint</a>(float <var title="">x</var>, float <var title="">y</var>);
561563
Range <a href="#dom-documentview-caretrangefrompoint">caretRangeFromPoint</a>(float <var title="">x</var>, float <var title="">y</var>);
562564
};
563565

564-
Document implements <a href="#documentview">DocumentView</a>;</pre>
566+
<a href="#document">Document</a> implements <a href="#documentview">DocumentView</a>;</pre>
565567

566568
<p>The <dfn id=dom-documentview-defaultview><code>defaultView</code></dfn>
567569
attribute, on getting, <em class=ct>must</em> return an object
@@ -612,7 +614,7 @@ <h2 id=the-documentview-interface><span class=secno>6 </span>The <code
612614
<h2 id=extensions-to-the-element-interface><span class=secno>7
613615
</span>Extensions to the <code title="">Element</code> Interface</h2>
614616

615-
<pre class=idl>[Supplemental] interface <span>Element</span> {
617+
<pre class=idl>[Supplemental] interface <a href="#element">Element</a> {
616618
<a href="#clientrectlist">ClientRectList</a> <a href="#dom-element-getclientrects">getClientRects</a>();
617619
<a href="#clientrect">ClientRect</a> <a href="#dom-element-getboundingclientrect">getBoundingClientRect</a>();
618620

@@ -916,7 +918,8 @@ <h3 id=client-attributes><span class=secno>7.3 </span>The <code
916918
<h2 id=extensions-to-the-htmlelement-interface><span class=secno>8
917919
</span>Extensions to the <code title="">HTMLElement</code> Interface</h2>
918920

919-
<pre class=idl>[Supplemental] interface <span>HTMLElement</span> {
921+
<pre
922+
class=idl>[Supplemental] interface <a href="#htmlelement">HTMLElement</a> {
920923
readonly attribute Element <a href="#dom-htmlelement-offsetparent">offsetParent</a>;
921924
readonly attribute long <a href="#dom-htmlelement-offsettop">offsetTop</a>;
922925
readonly attribute long <a href="#dom-htmlelement-offsetleft">offsetLeft</a>;
@@ -1083,15 +1086,11 @@ <h3 id=offset-attributes><span class=secno>8.1 </span>The <code
10831086
<h2 id=extensions-to-the-range-interface><span class=secno>9
10841087
</span>Extensions to the <code title="">Range</code> Interface</h2>
10851088

1086-
<pre class=idl>[Supplemental] interface <span>Range</span> {
1089+
<pre class=idl>[Supplemental] interface <a href="#range">Range</a> {
10871090
<a href="#clientrectlist">ClientRectList</a> <a href="#dom-range-getclientrects" title=dom-range-getclientrects>getClientRects</a>();
10881091
<a href="#clientrect">ClientRect</a> <a href="#dom-range-getboundingclientrect" title=dom-range-getboundingclientrect>getBoundingClientRect</a>();
10891092
};</pre>
10901093

1091-
<p>The <code>Range</code> interface is defined in DOM Level 2 Traversal and
1092-
Range. [<cite><a href="#ref-dom2tr">DOM2TR</a></cite>]</p>
1093-
<!-- XXX move this to dependencies? -->
1094-
10951094
<p>The objects the methods described below return <em class=ct>must</em> be
10961095
static.
10971096

@@ -1153,7 +1152,8 @@ <h2 id=extensions-to-the-range-interface><span class=secno>9
11531152
<h2 id=extensions-to-the-mouseevent-interface><span class=secno>10
11541153
</span>Extensions to the <code title="">MouseEvent</code> Interface</h2>
11551154

1156-
<pre class=idl>[Supplemental] interface <span>MouseEvent</span> {
1155+
<pre
1156+
class=idl>[Supplemental] interface <a href="#mouseevent">MouseEvent</a> {
11571157
readonly attribute long <a href="#dom-mouseevent-screenx" title=dom-mouseevent-screenx>screenX</a>;
11581158
readonly attribute long <a href="#dom-mouseevent-screeny" title=dom-mouseevent-screeny>screenY</a>;
11591159

@@ -1169,9 +1169,6 @@ <h2 id=extensions-to-the-mouseevent-interface><span class=secno>10
11691169
readonly attribute long <a href="#dom-mouseevent-offsety">offsetY</a>;
11701170
};</pre>
11711171

1172-
<p>The <code>MouseEvent</code> interface is defined in DOM Level 2 Events.
1173-
[<cite><a href="#ref-dom2events">DOM2Events</a></cite>]
1174-
11751172
<p class=XXX>The object IDL fragment redefines some members. Can we resolve
11761173
this somehow?
11771174

‎cssom-view/Overview.src.html‎

Lines changed: 21 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -110,24 +110,26 @@ <h2 id="conformance">Conformance Criteria</h2>
110110
specification.</p>
111111

112112

113-
<h3 id="dependencies">Dependencies</h3>
113+
<h3 id="webidl">Web IDL</h3>
114114

115-
<p>This specification depends on several definitions and features defined
116-
in the HTML&nbsp;5 specification. [<cite><span>HTML5</span></cite>]</p>
117-
118-
<p>This specification also depends on several features defined in the
119-
DOM Level 2 Events and DOM Level 3 Core specifications.
120-
[<cite><span>DOM2Events</span></cite>]
121-
[<cite><span>DOM3Core</span></cite>]</p>
122-
123-
<p>This specification depends on IDL fragments as defined in the Web IDL
124-
specification. [<cite><span>WebIDL</span></cite>]
115+
<p>The IDL fragments in this specification <em class="ct">must</em> be
116+
interpreted as required for conforming IDL fragments, as described in the
117+
Web IDL specification. [<cite><span>WebIDL</span></cite>]</p>
125118

126119

127120
<h3 id="terminology">Terminology</h3>
121+
122+
<p><dfn><code>Document</code></dfn> and <dfn><code>Element</code></dfn>
123+
are defined by DOM Level 3 Core. [<cite><span>DOM3Core</span></cite>]</p>
124+
125+
<p><dfn><code>Range</code></dfn> is defined in
126+
DOM Level 2 Traversal and Range. [<cite><span>DOM2TR</span></cite>]</p>
127+
128+
<p><dfn><code>MouseEvent</code></dfn> is defined in DOM Level 2 Events.
129+
[<cite><span>DOM2Events</span></cite>]</p>
128130

129-
<p>The terms <dfn>HTML element</dfn>, <dfn>view</dfn> and
130-
<dfn>default view</dfn> are defined by HTML&nbsp;5.
131+
<p><dfn>HTML element</dfn>, <dfn><code>HTMLElement</code></dfn>,
132+
<dfn>view</dfn> and <dfn>default view</dfn> are defined by HTML&nbsp;5.
131133
[<cite><span>HTML5</span></cite>]</p>
132134

133135
<p><dfn>The HTML <code>body</code> element</dfn> is the first
@@ -157,6 +159,7 @@ <h3 id="terminology">Terminology</h3>
157159
<span>canvas</span> that is rendered upon, excluding content on negative
158160
axis.</p>
159161

162+
160163
<h3>CSS pixels</h3>
161164

162165
<p>All coordinates and dimensions for the APIs defined in this
@@ -188,9 +191,8 @@ <h2 id="the-abstractview-interface">The <code title="">AbstractView</code> Inter
188191

189192
<p>The <code>AbstractView</code> interface is a base interface that all
190193
<span title="view">views</span> <em class="ct">must</em> derive from.</p>
191-
192-
<pre class="idl">[NoInterfaceObject]
193-
interface <dfn id="abstractview">AbstractView</dfn> {
194+
195+
<pre class="idl">[NoInterfaceObject] interface <dfn id="abstractview">AbstractView</dfn> {
194196
readonly attribute <span>DocumentView</span> <span title="dom-abstractview-document">document</span>;
195197
readonly attribute <span>Media</span> <span title="dom-abstractview-media">media</span>;
196198
};</pre>
@@ -258,8 +260,7 @@ <h2 id="the-screenview-interface">The <code title="">ScreenView</code> Interface
258260
attribute on the <code>Document</code> object <em class="ct">must</em>
259261
return an object implementing this interface.</p>
260262

261-
<pre class="idl">[NoInterfaceObject]
262-
interface <dfn id="screenview">ScreenView</dfn> : <span>AbstractView</span> {
263+
<pre class="idl">[NoInterfaceObject] interface <dfn id="screenview">ScreenView</dfn> : <span>AbstractView</span> {
263264
// viewport
264265
readonly attribute long <span>innerWidth</span>;
265266
readonly attribute long <span>innerHeight</span>;
@@ -440,14 +441,13 @@ <h3 id="the-screen-interface">The <code title="">Screen</code> Interface</h3>
440441

441442
<h2 id="the-documentview-interface">The <code title="">DocumentView</code> Interface</h2>
442443

443-
<pre class="idl">[NoInterfaceObject]
444-
interface <dfn id="documentview">DocumentView</dfn> {
444+
<pre class="idl">[NoInterfaceObject] interface <dfn id="documentview">DocumentView</dfn> {
445445
readonly attribute <span>AbstractView</span> <span>defaultView</span>;
446446
Element <span>elementFromPoint</span>(float <var title="">x</var>, float <var title="">y</var>);
447447
Range <span>caretRangeFromPoint</span>(float <var title="">x</var>, float <var title="">y</var>);
448448
};
449449

450-
Document implements <span>DocumentView</span>;</pre>
450+
<span>Document</span> implements <span>DocumentView</span>;</pre>
451451

452452
<p>The <dfn id="dom-documentview-defaultview"><code>defaultView</code></dfn>
453453
attribute, on getting, <em class="ct">must</em> return an object
@@ -929,11 +929,6 @@ <h2 id="extensions-to-the-range-interface">Extensions to the <code title="">Rang
929929
<span>ClientRect</span> <span title="dom-range-getboundingclientrect">getBoundingClientRect</span>();
930930
};</pre>
931931

932-
<p>The <code>Range</code> interface is defined in
933-
DOM Level 2 Traversal and Range. [<cite><span>DOM2TR</span></cite>]</p>
934-
935-
<!-- XXX move this to dependencies? -->
936-
937932
<p>The objects the methods described below return <em class="ct">must</em>
938933
be static.</p>
939934

@@ -1003,9 +998,6 @@ <h2 id="extensions-to-the-mouseevent-interface">Extensions to the <code title=""
1003998
readonly attribute long <span>offsetY</span>;
1004999
};</pre>
10051000

1006-
<p>The <code>MouseEvent</code> interface is defined in DOM Level 2 Events.
1007-
[<cite><span>DOM2Events</span></cite>]</p>
1008-
10091001
<p class="XXX">The object IDL fragment redefines some members. Can we
10101002
resolve this somehow?</p>
10111003

0 commit comments

Comments
 (0)