Skip to content

Commit 096a325

Browse files
rbrirbri
committed
Revert "Prototype of CSSPageRule is now CSSGroupingRule"
This reverts commit 60d9862.
1 parent 60d9862 commit 096a325

File tree

5 files changed

+11
-15
lines changed

5 files changed

+11
-15
lines changed

‎src/changes/changes.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88

99
<body>
1010
<release version="4.13.0" date="June xx, 2025" description="Chrome/Edge 136, Firefox 138, Bugfixes">
11-
<action type="fix" dev="rbri">
12-
Prototype of CSSPageRule is now CSSGroupingRule.
13-
</action>
1411
<action type="update" dev="RhinoTeam">
1512
core-js: Adjust order of evaluation of function arguments to match the spec.
1613
</action>

‎src/main/java/org/htmlunit/javascript/configuration/JavaScriptConfiguration.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -588,12 +588,12 @@ public final class JavaScriptConfiguration extends AbstractJavaScriptConfigurati
588588
BaseAudioContext.class, BatteryManager.class, BeforeInstallPromptEvent.class, BeforeUnloadEvent.class,
589589
BlobEvent.class, BroadcastChannel.class, CSSCounterStyleRule.class, CSSFontFaceRule.class,
590590
CSSGroupingRule.class, CSSImportRule.class, CSSKeyframeRule.class, CSSKeyframesRule.class,
591-
CSSNamespaceRule.class, CSSStyleRule.class, CSSStyleSheet.class, ClipboardEvent.class, CloseEvent.class,
592-
ComputedCSSStyleDeclaration.class, CustomEvent.class, DOMMatrix.class, DOMPoint.class, DeviceMotionEvent.class,
593-
DeviceOrientationEvent.class, ErrorEvent.class, EventSource.class, FederatedCredential.class, File.class,
594-
FileReader.class, FileSystemDirectoryEntry.class, FileSystemFileEntry.class, FontFaceSet.class,
595-
GamepadEvent.class, HTMLAllCollection.class, HTMLCollection.class, HashChangeEvent.class,
596-
IDBCursorWithValue.class, IDBDatabase.class, IDBRequest.class, IDBTransaction.class,
591+
CSSNamespaceRule.class, CSSPageRule.class, CSSStyleRule.class, CSSStyleSheet.class, ClipboardEvent.class,
592+
CloseEvent.class, ComputedCSSStyleDeclaration.class, CustomEvent.class, DOMMatrix.class, DOMPoint.class,
593+
DeviceMotionEvent.class, DeviceOrientationEvent.class, ErrorEvent.class, EventSource.class,
594+
FederatedCredential.class, File.class, FileReader.class, FileSystemDirectoryEntry.class,
595+
FileSystemFileEntry.class, FontFaceSet.class, GamepadEvent.class, HTMLAllCollection.class, HTMLCollection.class,
596+
HashChangeEvent.class, IDBCursorWithValue.class, IDBDatabase.class, IDBRequest.class, IDBTransaction.class,
597597
IDBVersionChangeEvent.class, MIDIAccess.class, MIDIConnectionEvent.class, MIDIMessageEvent.class,
598598
MIDIPort.class, MediaDevices.class, MediaEncryptedEvent.class, MediaKeyError.class, MediaKeyMessageEvent.class,
599599
MediaKeySession.class, MediaQueryList.class, MediaQueryListEvent.class, MediaRecorder.class, MediaSource.class,
@@ -615,7 +615,7 @@ public final class JavaScriptConfiguration extends AbstractJavaScriptConfigurati
615615
XMLHttpRequestEventTarget.class,
616616
// level 3
617617
AnalyserNode.class, Attr.class, AudioContext.class, AudioDestinationNode.class, AudioScheduledSourceNode.class,
618-
BiquadFilterNode.class, CSSConditionRule.class, CSSPageRule.class, CanvasCaptureMediaStream.class,
618+
BiquadFilterNode.class, CSSConditionRule.class, CanvasCaptureMediaStream.class,
619619
CanvasCaptureMediaStreamTrack.class, ChannelMergerNode.class, ChannelSplitterNode.class, CharacterData.class,
620620
CompositionEvent.class, ConvolverNode.class, DelayNode.class, Document.class, DocumentFragment.class,
621621
DocumentType.class, DynamicsCompressorNode.class, Element.class, FocusEvent.class, GainNode.class,

‎src/main/java/org/htmlunit/javascript/host/css/CSSGroupingRule.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public void jsConstructor() {
6464
* @param stylesheet the Stylesheet of this rule.
6565
* @param rule the wrapped rule
6666
*/
67-
protected CSSGroupingRule(final CSSStyleSheet stylesheet, final AbstractCSSRuleImpl rule) {
67+
protected CSSGroupingRule(final CSSStyleSheet stylesheet, final CSSMediaRuleImpl rule) {
6868
super(stylesheet, rule);
6969
}
7070

‎src/main/java/org/htmlunit/javascript/host/css/CSSPageRule.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import org.apache.commons.lang3.StringUtils;
2222
import org.htmlunit.BrowserVersion;
2323
import org.htmlunit.css.WrappedCssStyleDeclaration;
24-
import org.htmlunit.cssparser.dom.AbstractCSSRuleImpl;
2524
import org.htmlunit.cssparser.dom.CSSPageRuleImpl;
2625
import org.htmlunit.javascript.configuration.JsxClass;
2726
import org.htmlunit.javascript.configuration.JsxConstructor;
@@ -38,7 +37,7 @@
3837
* @see <a href="https://developer.mozilla.org/en-US/docs/Web/API/CSSPageRule">MDN doc</a>
3938
*/
4039
@JsxClass
41-
public class CSSPageRule extends CSSGroupingRule {
40+
public class CSSPageRule extends CSSRule {
4241

4342
/**
4443
* Creates a new instance.
@@ -61,7 +60,7 @@ public void jsConstructor() {
6160
* @param stylesheet the Stylesheet of this rule.
6261
* @param rule the wrapped rule
6362
*/
64-
protected CSSPageRule(final CSSStyleSheet stylesheet, final AbstractCSSRuleImpl rule) {
63+
protected CSSPageRule(final CSSStyleSheet stylesheet, final CSSPageRuleImpl rule) {
6564
super(stylesheet, rule);
6665
}
6766

‎src/main/java/org/htmlunit/javascript/host/css/CSSRule.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ public static CSSRule create(final CSSStyleSheet stylesheet, final AbstractCSSRu
180180
return new CSSFontFaceRule(stylesheet, (CSSFontFaceRuleImpl) rule);
181181
}
182182
if (rule instanceof CSSPageRuleImpl) {
183-
return new CSSPageRule(stylesheet, rule);
183+
return new CSSPageRule(stylesheet, (CSSPageRuleImpl) rule);
184184
}
185185
if (rule instanceof CSSUnknownRuleImpl) {
186186
final CSSUnknownRuleImpl unknownRule = (CSSUnknownRuleImpl) rule;

0 commit comments

Comments
 (0)