Skip to content

Commit 60d9862

Browse files
rbrirbri
committed
Prototype of CSSPageRule is now CSSGroupingRule
1 parent d8fd5b7 commit 60d9862

File tree

5 files changed

+15
-11
lines changed

5 files changed

+15
-11
lines changed

‎src/changes/changes.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
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>
1114
<action type="update" dev="RhinoTeam">
1215
core-js: Adjust order of evaluation of function arguments to match the spec.
1316
</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, 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,
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,
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, CanvasCaptureMediaStream.class,
618+
BiquadFilterNode.class, CSSConditionRule.class, CSSPageRule.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 CSSMediaRuleImpl rule) {
67+
protected CSSGroupingRule(final CSSStyleSheet stylesheet, final AbstractCSSRuleImpl rule) {
6868
super(stylesheet, rule);
6969
}
7070

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
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;
2425
import org.htmlunit.cssparser.dom.CSSPageRuleImpl;
2526
import org.htmlunit.javascript.configuration.JsxClass;
2627
import org.htmlunit.javascript.configuration.JsxConstructor;
@@ -37,7 +38,7 @@
3738
* @see <a href="https://developer.mozilla.org/en-US/docs/Web/API/CSSPageRule">MDN doc</a>
3839
*/
3940
@JsxClass
40-
public class CSSPageRule extends CSSRule {
41+
public class CSSPageRule extends CSSGroupingRule {
4142

4243
/**
4344
* Creates a new instance.
@@ -60,7 +61,7 @@ public void jsConstructor() {
6061
* @param stylesheet the Stylesheet of this rule.
6162
* @param rule the wrapped rule
6263
*/
63-
protected CSSPageRule(final CSSStyleSheet stylesheet, final CSSPageRuleImpl rule) {
64+
protected CSSPageRule(final CSSStyleSheet stylesheet, final AbstractCSSRuleImpl rule) {
6465
super(stylesheet, rule);
6566
}
6667

‎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, (CSSPageRuleImpl) rule);
183+
return new CSSPageRule(stylesheet, rule);
184184
}
185185
if (rule instanceof CSSUnknownRuleImpl) {
186186
final CSSUnknownRuleImpl unknownRule = (CSSUnknownRuleImpl) rule;

0 commit comments

Comments
 (0)