Closed Bug 1732065 Opened 3 years ago Closed 3 years ago

[wpt-sync] Sync PR 30906 - Revert "[@layer] Fix cascade ordering of inline style and layered style"

Categories

(Testing :: web-platform-tests, task, P4)

Product:
Testing
Component:
web-platform-tests
Type:
task

Tracking

(firefox95 fixed)

Status:
RESOLVED FIXED
Milestone:
95 Branch
Tracking Flags:
Tracking Status
firefox95 --- fixed

People

(Reporter: mozilla.org, Unassigned)

References

(
URL
)

Details

(Whiteboard: [wptsync downstream])

Sync web-platform-tests PR 30906 into mozilla-central (this bug is closed when the sync is complete).

PR: https://github.com/web-platform-tests/wpt/pull/30906
Details from upstream follow.

Xiaocheng Hu <xiaochengh@chromium.org> wrote:

Revert "[@layer] Fix cascade ordering of inline style and layered style"

This reverts commit 65f6b482860b4dda8933a19f1f4b4115c3812b41.

Reason for revert: Caused b/200698937

Original change's description:

[@layer] Fix cascade ordering of inline style and layered style

This patch adds a new flag to MatchResult and CascadePriority to
indicate if a declaration is from inline style or other style sheets, so
that we can compare inline style and other layered style correctly.

Without this flag, currently we are treating inline style as regular
declarations in the implicit outer layer, and therefore mistakenly
override it with layered style rules in other style sheets.

Bug: 1095765
Change-Id: I10dbafcf9721fc5b8a5b11edeaeab48c82df86d4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3167095
Commit-Queue: Xiaocheng Hu \<xiaochengh@chromium.org>
Reviewed-by: Rune Lillesveen \<futhark@chromium.org>
Reviewed-by: Anders Hartvoll Ruud \<andruud@chromium.org>
Cr-Commit-Position: refs/heads/main@{#923216}

Bug: 1095765
Change-Id: I93b6caffbaa777338f1b05769f85ae2becbdabab
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3174089
Auto-Submit: Xiaocheng Hu \<xiaochengh@chromium.org>
Commit-Queue: Rubber Stamper \<rubber-stamper@appspot.gserviceaccount.com>
Bot-Commit: Rubber Stamper \<rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/heads/main@{#923601}

PR 30906 applied with additional changes from upstream: 28803505594d03810cf97cd39be18d3dad2982ad
Pushed by wptsync@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/566c6d18c0dc
[wpt PR 30906] - Revert "[@layer] Fix cascade ordering of inline style and layered style", a=testonly
Test result changes from PR not available.
Pushed by wptsync@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/7d8673214f31
[wpt PR 30906] - Revert "[@layer] Fix cascade ordering of inline style and layered style", a=testonly
Test result changes from PR not available.

https://hg.mozilla.org/mozilla-central/rev/7d8673214f31

Status: NEW → RESOLVED
Closed: 3 years ago
status-firefox95: --- → fixed
Resolution: --- → FIXED
Target Milestone: --- → 95 Branch
You need to log in before you can comment on or make changes to this bug.