Changeset 291824 in webkit

Timestamp:

Mar 24, 2022 4:29:30 PM (4 months ago)

Author:

Patrick Angle

Message:

Web Inspector: Blank inspector in a page with container queries
​https://bugs.webkit.org/show_bug.cgi?id=238338

Reviewed by Devin Rousso.

Because there is no CSSOM implementation for container queries, we are unable to inspect them currently.
However, we should be resilient to the absence of that implementation and expect that not all rules have a
matching CSSOM implementation, instead of just crashing when it happens. This patch only resolves crashes as the
result of the presence of container queries, and followup work will be done to actually plumb the correct
information to Web Inspector to show these rules.

• inspector/InspectorStyleSheet.cpp:

(WebCore::InspectorStyleSheet::collectFlatRules):

• inspector/agents/InspectorCSSAgent.cpp:

(WebCore::InspectorCSSAgent::collectStyleSheets):

• style/InspectorCSSOMWrappers.cpp:

(WebCore::Style::InspectorCSSOMWrappers::collect):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorStyleSheet.cpp (modified) (1 diff)
• inspector/agents/InspectorCSSAgent.cpp (modified) (1 diff)
• style/InspectorCSSOMWrappers.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-03-24  Patrick Angle  <pangle@apple.com>
+
+        Web Inspector: Blank inspector in a page with container queries
+        https://bugs.webkit.org/show_bug.cgi?id=238338
+
+        Reviewed by Devin Rousso.
+
+        Because there is no CSSOM implementation for container queries, we are unable to inspect them currently.
+        However, we should be resilient to the absence of that implementation and expect that not all rules have a
+        matching CSSOM implementation, instead of just crashing when it happens. This patch only resolves crashes as the
+        result of the presence of container queries, and followup work will be done to actually plumb the correct
+        information to Web Inspector to show these rules.
+
+        * inspector/InspectorStyleSheet.cpp:
+        (WebCore::InspectorStyleSheet::collectFlatRules):
+        * inspector/agents/InspectorCSSAgent.cpp:
+        (WebCore::InspectorCSSAgent::collectStyleSheets):
+        * style/InspectorCSSOMWrappers.cpp:
+        (WebCore::Style::InspectorCSSOMWrappers::collect):
+
 2022-03-24  Antoine Quint  <graouts@webkit.org>
 

trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp

@@ -1527 +1527 @@
     for (unsigned i = 0, size = ruleList->length(); i < size; ++i) {
         CSSRule* rule = ruleList->item(i);
+        if (!rule)
+            continue;
+        
         CSSStyleRule* styleRule = InspectorCSSAgent::asCSSStyleRule(*rule);
         if (styleRule)

trunk/Source/WebCore/inspector/agents/InspectorCSSAgent.cpp

@@ -649 +649 @@
 
     for (unsigned i = 0, size = styleSheet->length(); i < size; ++i) {
-        CSSRule* rule = styleSheet->item(i);
-        if (is<CSSImportRule>(*rule)) {
-            if (CSSStyleSheet* importedStyleSheet = downcast<CSSImportRule>(*rule).styleSheet())
+        if (auto* rule = dynamicDowncast<CSSImportRule>(styleSheet->item(i))) {
+            if (CSSStyleSheet* importedStyleSheet = rule->styleSheet())
                 collectStyleSheets(importedStyleSheet, result);
         }

trunk/Source/WebCore/style/InspectorCSSOMWrappers.cpp

@@ -60 +60 @@
     for (unsigned i = 0; i < size; ++i) {
         CSSRule* cssRule = listType->item(i);
+        if (!cssRule)
+            continue;
+        
         switch (cssRule->styleRuleType()) {
         case StyleRuleType::Import: