Changeset 260491 in webkit for trunk/Source/WebCore/css/CSSStyleDeclaration.cpp

Timestamp:

Apr 21, 2020, 8:03:43 PM (5 years ago)

Author:

cathiechen

Message:

REGRESSION (r254790): No longer get smooth scrolling on music.apple.com
​https://bugs.webkit.org/show_bug.cgi?id=210634

Reviewed by Darin Adler.

Source/WebCore:

The page uses the access of "scrollBehavior" in CSSStyleDeclaration as the support of scroll-behavior.
If supported, it will use scroll-behavior. Otherwise, it will perform a JS smooth scroll.
Currently, "scrollBehavior" is still available when CSSOMViewSmoothScrolling is off, only the value
"smooth" is invalidated.
In order to fix this, CSSStyleDeclaration will take account of CSSOMViewSmoothScrolling in Settings.
This patch also tries to provide an interface which let flags in Settings can enable/disable a property.
However, it is not complete, for there are some scenarios that Settings isn't accessible. By adding
"settings-flag" to CSSProperties.json, it would be effective to control the property access in CSSStyleDeclaration.

Tests: fast/scrolling/scroll-behavior-invalidate-if-disabled.html

fast/scrolling/scroll-behavior-validate-if-enabled.html

• css/CSSProperties.json:
• css/CSSStyleDeclaration.cpp:

(WebCore::CSSStyleDeclaration::getCSSPropertyIDFromJavaScriptPropertyName):
(WebCore::CSSStyleDeclaration::namedItem):
(WebCore::CSSStyleDeclaration::setNamedItem):
(WebCore::CSSStyleDeclaration::supportedPropertyNames const):

• css/makeprop.pl:

(addProperty):

• css/parser/CSSPropertyParser.cpp:

(WebCore::cssPropertyID):

• inspector/InspectorStyleSheet.cpp:

(WebCore::InspectorStyle::collectProperties const):

• inspector/agents/InspectorCSSAgent.cpp:

(WebCore::InspectorCSSAgent::getSupportedCSSProperties):

Tools:

Add settings-flag. Add support for CSSOMViewSmoothScrolling on Windows DumpRenderTree.

• DumpRenderTree/win/DumpRenderTree.cpp:

(enableExperimentalFeatures):
(setWebPreferencesForTestOptions):

• Scripts/webkitpy/style/checkers/jsonchecker.py:

(JSONCSSPropertiesChecker.check_codegen_properties):

LayoutTests:

"scrollBehavior" is not available in CSSStyleDeclaration if the flag is off.
It's available if the flag is on.

• fast/scrolling/scroll-behavior-invalidate-if-disabled-expected.txt: Added.
• fast/scrolling/scroll-behavior-invalidate-if-disabled.html: Added.
• fast/scrolling/scroll-behavior-validate-if-enabled-expected.txt: Added.
• fast/scrolling/scroll-behavior-validate-if-enabled.html: Added.

File:

• trunk/Source/WebCore/css/CSSStyleDeclaration.cpp (modified) (6 diffs)

trunk/Source/WebCore/css/CSSStyleDeclaration.cpp

@@ -30 +30 @@
 #include "CSSPropertyParser.h"
 #include "DeprecatedGlobalSettings.h"
+#include "Document.h"
 #include "HashTools.h"
 #include "RuntimeEnabledFeatures.h"
+#include "Settings.h"
+#include "StyledElement.h"
 #include <wtf/IsoMallocInlines.h>
 #include <wtf/Optional.h>
@@ -150 +153 @@
 };
 
-static CSSPropertyInfo parseJavaScriptCSSPropertyName(const AtomString& propertyName)
+static CSSPropertyInfo parseJavaScriptCSSPropertyName(const AtomString& propertyName, const Settings* settingsPtr)
 {
     using CSSPropertyInfoMap = HashMap<String, CSSPropertyInfo>;
@@ -248 +251 @@
     if (auto propertyID = hashTableEntry ? hashTableEntry->id : 0) {
         auto id = static_cast<CSSPropertyID>(propertyID);
-        if (isEnabledCSSProperty(id)) {
+        if (isEnabledCSSProperty(id) && isCSSPropertyEnabledBySettings(id, settingsPtr)) {
             propertyInfo.hadPixelOrPosPrefix = hadPixelOrPosPrefix;
             propertyInfo.propertyID = id;
@@ -261 +264 @@
 CSSPropertyID CSSStyleDeclaration::getCSSPropertyIDFromJavaScriptPropertyName(const AtomString& propertyName)
 {
-    return parseJavaScriptCSSPropertyName(propertyName).propertyID;
+    return parseJavaScriptCSSPropertyName(propertyName, nullptr).propertyID;
 }
 
 Optional<Variant<String, double>> CSSStyleDeclaration::namedItem(const AtomString& propertyName)
 {
-    auto propertyInfo = parseJavaScriptCSSPropertyName(propertyName);
+    auto* settingsPtr = parentElement() ? &parentElement()->document().settings() : nullptr;
+    auto propertyInfo = parseJavaScriptCSSPropertyName(propertyName, settingsPtr);
     if (!propertyInfo.propertyID)
         return WTF::nullopt;
@@ -288 +292 @@
 ExceptionOr<void> CSSStyleDeclaration::setNamedItem(const AtomString& propertyName, String value, bool& propertySupported)
 {
-    auto propertyInfo = parseJavaScriptCSSPropertyName(propertyName);
+    auto* settingsPtr = parentElement() ? &parentElement()->document().settings() : nullptr;
+    auto propertyInfo = parseJavaScriptCSSPropertyName(propertyName, settingsPtr);
     if (!propertyInfo.propertyID) {
         propertySupported = false;
@@ -322 +327 @@
         for (int i = 0; i < numCSSProperties; ++i) {
             CSSPropertyID id = static_cast<CSSPropertyID>(firstCSSProperty + i);
+            // FIXME: Should take account for flags in settings().
             if (isEnabledCSSProperty(id))
                 names[numNames++] = getJSPropertyName(id);