Skip to content

Commit d2d246a

Browse files
committed
[css-color-hdr] Changed "constrained-high" back to "constrained" per WG resolution, fix #11698
1 parent 5af5799 commit d2d246a

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

css-color-hdr-1/Overview.bs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ The 'dynamic-range-limit' property {#the-dynamic-range-limit-property}
379379

380380
<pre class='propdef'>
381381
Name: dynamic-range-limit
382-
Value: standard | no-limit | constrained-high | <<dynamic-range-limit-mix()>>
382+
Value: standard | no-limit | constrained | <<dynamic-range-limit-mix()>>
383383
Initial: no-limit
384384
Applies to: all elements
385385
Inherited: yes
@@ -410,7 +410,7 @@ The 'dynamic-range-limit' property {#the-dynamic-range-limit-property}
410410
HDR reference white, i.e. the CSS color ''white'';
411411
the precise level is not specified.
412412
</dd>
413-
<dt><dfn>constrained-high</dfn>
413+
<dt><dfn>constrained</dfn>
414414
<dd>
415415
The highest peak luminance
416416
that is displayed is somewhat greater than
@@ -423,7 +423,7 @@ The 'dynamic-range-limit' property {#the-dynamic-range-limit-property}
423423
<div class="example" id="ex-hdr-limit-photogrid">
424424
<pre class="lang-css">
425425
body { dynamic-range-limit: standard; }
426-
div.photogrid img { dynamic-range-limit: constrained-high }
426+
div.photogrid img { dynamic-range-limit: constrained }
427427
</pre>
428428
</div>
429429

@@ -466,22 +466,22 @@ Mixing Dynamic Range Limits: the ''dynamic-range-limit-mix()'' function {#dynami
466466
Computed Value for 'dynamic-range-limit'
467467
</h3>
468468

469-
If the specified value is ''standard'', ''constrained-high'', or ''no-limit'', then the computed value is the specified value.
469+
If the specified value is ''standard'', ''constrained'', or ''no-limit'', then the computed value is the specified value.
470470

471471
If the specified value is ''dynamic-range-limit-mix()'', then the computed value is determined by the following algorithm:
472472

473473
1. Let <var>v1</var>, ..., <var>vN</var> be the computed values for the parameters to be mixed.
474474
2. Let <var>p1</var>, ..., <var>pN</var> be the mixing percentages, normalized to sum to 100%.
475475
3. Define the contributing percentages as:
476476
* Let <var>p1_standard</var>,...,<var>pN_standard</var> be the percentages for ''standard'' in <var>v1</var>,...,<var>vN</var>
477-
* Let <var>p1_constrained_high</var>,...,<var>pN_constrained_high</var> be the percentages for ''constrained-high'' in <var>v1</var>,...,<var>vN</var>
477+
* Let <var>p1_constrained_high</var>,...,<var>pN_constrained_high</var> be the percentages for ''constrained'' in <var>v1</var>,...,<var>vN</var>
478478
* Let <var>p1_no_limit</var>,...,<var>pN_no_limit</var> be the percentages for ''no-limit'' in <var>v1</var>,...,<var>vN</var>
479479
4. Compute the weighted sums as:
480480
* <var>p_standard</var>=(<var>p1_standard</var>*<var>p1</var>+...+<var>pN_standard</var>*<var>pN</var>)/100.
481481
* <var>p_constrained_high</var>=(<var>p1_constrained_high</var>*<var>p1</var>+...+<var>pN_constrained_high</var>*<var>pN</var>)/100.
482482
* <var>p_no_limit</var>=(<var>p1_no_limit</var>*<var>p1</var>+...+<var>pN_no_limit</var>*<var>pN</var>)/100.
483-
5. If <var>p_standard</var>, <var>p_constrained_high</var>, or <var>p_no_limit</var> equals 100%, then the computed value is ''standard'', ''constrained-high'', or ''no-limit'', respectively.
484-
6. Otherwise, the computed value is ''dynamic-range-limit-mix()'', with parameters ''standard'', ''constrained-high'', and ''no-limit'', in that order, and percentages <var>p_standard</var>, <var>p_constrained_high</var>, and <var>p_no_limit</var>, omitting parameters with a percentage equal to 0%.
483+
5. If <var>p_standard</var>, <var>p_constrained_high</var>, or <var>p_no_limit</var> equals 100%, then the computed value is ''standard'', ''constrained'', or ''no-limit'', respectively.
484+
6. Otherwise, the computed value is ''dynamic-range-limit-mix()'', with parameters ''standard'', ''constrained'', and ''no-limit'', in that order, and percentages <var>p_standard</var>, <var>p_constrained_high</var>, and <var>p_no_limit</var>, omitting parameters with a percentage equal to 0%.
485485

486486
<wpt>
487487
computed.html
@@ -492,12 +492,12 @@ Mixing Dynamic Range Limits: the ''dynamic-range-limit-mix()'' function {#dynami
492492
<pre class="lang-css">
493493
dynamic-range-limit-mix(
494494
high 10%,
495-
dynamic-range-limit-mix(standard 25%, constrained-high 75%) 20%,
496-
dynamic-range-limit-mix(constrained-high 10%, no-limit 30%) 20%)
495+
dynamic-range-limit-mix(standard 25%, constrained 75%) 20%,
496+
dynamic-range-limit-mix(constrained 10%, no-limit 30%) 20%)
497497
</pre>
498498
is
499499
<pre class="lang-css">
500-
dynamic-range-limit-mix(standard 10%, constrained-high 40%, no-limit 50%)
500+
dynamic-range-limit-mix(standard 10%, constrained 40%, no-limit 50%)
501501
</pre>
502502
</div>
503503

@@ -1758,5 +1758,5 @@ to limit the maximum luminance at user option.
17581758
is suggested as suitable.</span>
17591759

17601760
The ''dynamic-range-limit'' property could also be set to
1761-
''dynamic-range-limit/standard'' or ''dynamic-range-limit/constrained-high''
1761+
''dynamic-range-limit/standard'' or ''dynamic-range-limit/constrained''
17621762
in a user stylesheet.

0 commit comments

Comments
 (0)