From 4cc014cb6bee31dcc3beccc736f48237813bc268 Mon Sep 17 00:00:00 2001 From: Andy Date: Sun, 29 Jun 2025 02:10:26 -0700 Subject: [PATCH] Unprefix -moz-read-write / -moz-read-only --- accessible/generic/HyperTextAccessible.cpp | 2 +- devtools/server/actors/inspector.js | 2 + dom/base/Element.cpp | 11 ++-- dom/base/Element.h | 2 +- dom/base/FragmentOrElement.cpp | 2 +- dom/events/EventStates.h | 5 +- dom/events/IMEStateManager.cpp | 2 +- dom/html/nsGenericHTMLElement.cpp | 6 +-- dom/html/test/test_bug1264157.html | 4 +- dom/xul/nsXULElement.cpp | 8 +-- editor/libeditor/HTMLEditor.cpp | 2 +- editor/reftests/672709-ref.html | 4 +- editor/reftests/694880-1.html | 4 +- editor/reftests/694880-2.html | 4 +- editor/reftests/694880-3.html | 4 +- editor/reftests/readonly-editable.html | 2 +- editor/reftests/readonly-non-editable.html | 2 +- editor/reftests/readwrite-editable.html | 2 +- editor/reftests/readwrite-non-editable.html | 2 +- layout/generic/crashtests/767765.html | 4 +- layout/generic/nsSelection.cpp | 2 +- .../forms/input/number/pseudo-classes.html | 8 +-- layout/style/contenteditable.css | 54 +++++++++---------- layout/style/nsCSSPseudoClassList.h | 8 +-- layout/style/res/forms.css | 4 +- 25 files changed, 75 insertions(+), 75 deletions(-) diff --git a/accessible/generic/HyperTextAccessible.cpp b/accessible/generic/HyperTextAccessible.cpp index 1edf9f75c1..72888df550 100644 --- a/accessible/generic/HyperTextAccessible.cpp +++ b/accessible/generic/HyperTextAccessible.cpp @@ -75,7 +75,7 @@ HyperTextAccessible::NativeState() { uint64_t states = AccessibleWrap::NativeState(); - if (mContent->AsElement()->State().HasState(NS_EVENT_STATE_MOZ_READWRITE)) { + if (mContent->AsElement()->State().HasState(NS_EVENT_STATE_READWRITE)) { states |= states::EDITABLE; } else if (mContent->IsHTMLElement(nsGkAtoms::article)) { diff --git a/devtools/server/actors/inspector.js b/devtools/server/actors/inspector.js index ba9393de58..3fa57ed7d9 100644 --- a/devtools/server/actors/inspector.js +++ b/devtools/server/actors/inspector.js @@ -118,6 +118,8 @@ const PSEUDO_SELECTORS = [ [":target", 0], [":enabled", 0], [":disabled", 0], + [":read-only", 1], + [":read-write", 1], [":checked", 1], ["::selection", 0] ]; diff --git a/dom/base/Element.cpp b/dom/base/Element.cpp index e9d16d9557..05d5f583ed 100644 --- a/dom/base/Element.cpp +++ b/dom/base/Element.cpp @@ -201,8 +201,7 @@ Element::QueryInterface(REFNSIID aIID, void** aInstancePtr) EventStates Element::IntrinsicState() const { - return IsEditable() ? NS_EVENT_STATE_MOZ_READWRITE : - NS_EVENT_STATE_MOZ_READONLY; + return IsEditable() ? NS_EVENT_STATE_READWRITE : NS_EVENT_STATE_READONLY; } void @@ -288,11 +287,11 @@ Element::UpdateEditableState(bool aNotify) // insertion into the document and UpdateState can be slow for // some kinds of elements even when not notifying. if (IsEditable()) { - RemoveStatesSilently(NS_EVENT_STATE_MOZ_READONLY); - AddStatesSilently(NS_EVENT_STATE_MOZ_READWRITE); + RemoveStatesSilently(NS_EVENT_STATE_READONLY); + AddStatesSilently(NS_EVENT_STATE_READWRITE); } else { - RemoveStatesSilently(NS_EVENT_STATE_MOZ_READWRITE); - AddStatesSilently(NS_EVENT_STATE_MOZ_READONLY); + RemoveStatesSilently(NS_EVENT_STATE_READWRITE); + AddStatesSilently(NS_EVENT_STATE_READONLY); } } } diff --git a/dom/base/Element.h b/dom/base/Element.h index 12aed36dd7..611fde38f5 100644 --- a/dom/base/Element.h +++ b/dom/base/Element.h @@ -158,7 +158,7 @@ public: #ifdef MOZILLA_INTERNAL_API explicit Element(already_AddRefed& aNodeInfo) : FragmentOrElement(aNodeInfo), - mState(NS_EVENT_STATE_MOZ_READONLY) + mState(NS_EVENT_STATE_READONLY) { MOZ_ASSERT(mNodeInfo->NodeType() == nsIDOMNode::ELEMENT_NODE, "Bad NodeType in aNodeInfo"); diff --git a/dom/base/FragmentOrElement.cpp b/dom/base/FragmentOrElement.cpp index c62f1a0cec..073e0bc192 100644 --- a/dom/base/FragmentOrElement.cpp +++ b/dom/base/FragmentOrElement.cpp @@ -277,7 +277,7 @@ nsIContent::GetDesiredIMEState() // Check for the special case where we're dealing with elements which don't // have the editable flag set, but are readwrite (such as text controls). if (!IsElement() || - !AsElement()->State().HasState(NS_EVENT_STATE_MOZ_READWRITE)) { + !AsElement()->State().HasState(NS_EVENT_STATE_READWRITE)) { return IMEState(IMEState::DISABLED); } } diff --git a/dom/events/EventStates.h b/dom/events/EventStates.h index eef0ca1002..291530d86b 100644 --- a/dom/events/EventStates.h +++ b/dom/events/EventStates.h @@ -205,11 +205,10 @@ private: #define NS_EVENT_STATE_INRANGE NS_DEFINE_EVENT_STATE_MACRO(15) // Content value is out-of-range. #define NS_EVENT_STATE_OUTOFRANGE NS_DEFINE_EVENT_STATE_MACRO(16) -// These two are temporary (see bug 302188) // Content is read-only. -#define NS_EVENT_STATE_MOZ_READONLY NS_DEFINE_EVENT_STATE_MACRO(17) +#define NS_EVENT_STATE_READONLY NS_DEFINE_EVENT_STATE_MACRO(17) // Content is editable. -#define NS_EVENT_STATE_MOZ_READWRITE NS_DEFINE_EVENT_STATE_MACRO(18) +#define NS_EVENT_STATE_READWRITE NS_DEFINE_EVENT_STATE_MACRO(18) // Content is the default one (meaning depends of the context). #define NS_EVENT_STATE_DEFAULT NS_DEFINE_EVENT_STATE_MACRO(19) // Content could not be rendered (image/object/etc). diff --git a/dom/events/IMEStateManager.cpp b/dom/events/IMEStateManager.cpp index f8e01b3237..3da8dc4ed9 100644 --- a/dom/events/IMEStateManager.cpp +++ b/dom/events/IMEStateManager.cpp @@ -1608,7 +1608,7 @@ IMEStateManager::IsEditable(nsINode* node) } // |node| might be readwrite (for example, a text control) if (node->IsElement() && - node->AsElement()->State().HasState(NS_EVENT_STATE_MOZ_READWRITE)) { + node->AsElement()->State().HasState(NS_EVENT_STATE_READWRITE)) { return true; } return false; diff --git a/dom/html/nsGenericHTMLElement.cpp b/dom/html/nsGenericHTMLElement.cpp index e811f6b462..997decd7a0 100644 --- a/dom/html/nsGenericHTMLElement.cpp +++ b/dom/html/nsGenericHTMLElement.cpp @@ -2198,13 +2198,13 @@ nsGenericHTMLFormElement::IntrinsicState() const } // Make the text controls read-write - if (!state.HasState(NS_EVENT_STATE_MOZ_READWRITE) && + if (!state.HasState(NS_EVENT_STATE_READWRITE) && IsTextOrNumberControl(/*aExcludePassword*/ false)) { bool roState = GetBoolAttr(nsGkAtoms::readonly); if (!roState) { - state |= NS_EVENT_STATE_MOZ_READWRITE; - state &= ~NS_EVENT_STATE_MOZ_READONLY; + state |= NS_EVENT_STATE_READWRITE; + state &= ~NS_EVENT_STATE_READONLY; } } diff --git a/dom/html/test/test_bug1264157.html b/dom/html/test/test_bug1264157.html index a087b0f41f..0f957795af 100644 --- a/dom/html/test/test_bug1264157.html +++ b/dom/html/test/test_bug1264157.html @@ -45,9 +45,9 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=535043 /** Test for Bug 1264157 **/ SimpleTest.waitForFocus(function() { // Check the initial values. - let active = [].slice.call(document.querySelectorAll("input:not(:disabled):not(:-moz-read-only)")); + let active = [].slice.call(document.querySelectorAll("input:not(:disabled):not(:read-only)")); let disabled = [].slice.call(document.querySelectorAll("input:disabled")); - let readonly = [].slice.call(document.querySelectorAll("input:-moz-read-only")); + let readonly = [].slice.call(document.querySelectorAll("input:read-only")); ok(active.length == 2, "Test is messed up: missing non-disabled/non-readonly inputs"); ok(disabled.length == 2, "Test is messed up: missing disabled inputs"); ok(readonly.length == 2, "Test is messed up: missing readonly inputs"); diff --git a/dom/xul/nsXULElement.cpp b/dom/xul/nsXULElement.cpp index e1e9bdc91c..b2f225cedf 100644 --- a/dom/xul/nsXULElement.cpp +++ b/dom/xul/nsXULElement.cpp @@ -156,8 +156,8 @@ nsXULElement::nsXULElement(already_AddRefed aNodeInfo) // We may be READWRITE by default; check. if (IsReadWriteTextElement()) { - AddStatesSilently(NS_EVENT_STATE_MOZ_READWRITE); - RemoveStatesSilently(NS_EVENT_STATE_MOZ_READONLY); + AddStatesSilently(NS_EVENT_STATE_READWRITE); + RemoveStatesSilently(NS_EVENT_STATE_READONLY); } } @@ -1855,8 +1855,8 @@ nsXULElement::IntrinsicState() const EventStates state = nsStyledElement::IntrinsicState(); if (IsReadWriteTextElement()) { - state |= NS_EVENT_STATE_MOZ_READWRITE; - state &= ~NS_EVENT_STATE_MOZ_READONLY; + state |= NS_EVENT_STATE_READWRITE; + state &= ~NS_EVENT_STATE_READONLY; } return state; diff --git a/editor/libeditor/HTMLEditor.cpp b/editor/libeditor/HTMLEditor.cpp index a69b0a340c..767856a1bc 100644 --- a/editor/libeditor/HTMLEditor.cpp +++ b/editor/libeditor/HTMLEditor.cpp @@ -406,7 +406,7 @@ HTMLEditor::FindSelectionRoot(nsINode* aNode) // If the content is in read-write state but is not editable itself, // return it as the selection root. if (content->IsElement() && - content->AsElement()->State().HasState(NS_EVENT_STATE_MOZ_READWRITE)) { + content->AsElement()->State().HasState(NS_EVENT_STATE_READWRITE)) { return content.forget(); } return nullptr; diff --git a/editor/reftests/672709-ref.html b/editor/reftests/672709-ref.html index b9fc369b09..18ce2b5d58 100644 --- a/editor/reftests/672709-ref.html +++ b/editor/reftests/672709-ref.html @@ -2,8 +2,8 @@