Changeset 207556 in webkit

Timestamp:

Oct 19, 2016 12:19:27 PM (8 years ago)

Author:

hyatt@apple.com

Message:

[CSS Parser] Fix background-position parsing
​https://bugs.webkit.org/show_bug.cgi?id=163681

Reviewed by Dean Jackson.

The new parser has a more efficient parsed representation of background positions. When
background-position is "center" or when no length unit is specified for a dimension,
then rather than creating a pair, the new parser makes a singleton primitive value.

Patch the StyleBuilder code to handle this case, resolving center to (left,50%) or
(top,50%) as appropriate and also handling top/left without any associated length.

• css/CSSToStyleMap.cpp:

(WebCore::CSSToStyleMap::mapFillXPosition):
(WebCore::CSSToStyleMap::mapFillYPosition):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSToStyleMap.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-19  Dave Hyatt  <hyatt@apple.com>
+
+        [CSS Parser] Fix background-position parsing
+        https://bugs.webkit.org/show_bug.cgi?id=163681
+
+        Reviewed by Dean Jackson.
+
+        The new parser has a more efficient parsed representation of background positions. When
+        background-position is "center" or when no length unit is specified for a dimension,
+        then rather than creating a pair, the new parser makes a singleton primitive value.
+
+        Patch the StyleBuilder code to handle this case, resolving center to (left,50%) or
+        (top,50%) as appropriate and also handling top/left without any associated length.
+
+        * css/CSSToStyleMap.cpp:
+        (WebCore::CSSToStyleMap::mapFillXPosition):
+        (WebCore::CSSToStyleMap::mapFillYPosition):
+
 2016-10-19  Antoine Quint  <graouts@apple.com>
 

trunk/Source/WebCore/css/CSSToStyleMap.cpp

@@ -239 +239 @@
         ASSERT_UNUSED(propertyID, propertyID == CSSPropertyBackgroundPositionX || propertyID == CSSPropertyWebkitMaskPositionX);
         primitiveValue = pair->second();
+    } else if (primitiveValue->isValueID()) {
+        if (primitiveValue->valueID() == CSSValueCenter) {
+            layer.setBackgroundXOrigin(Edge::Left);
+            layer.setXPosition(Length(50, Percent));
+        } else {
+            layer.setBackgroundXOrigin(*primitiveValue);
+            layer.setXPosition(Length());
+        }
+        return;
     }
 
@@ -271 +280 @@
         ASSERT_UNUSED(propertyID, propertyID == CSSPropertyBackgroundPositionY || propertyID == CSSPropertyWebkitMaskPositionY);
         primitiveValue = pair->second();
+    } else if (primitiveValue->isValueID()) {
+        if (primitiveValue->valueID() == CSSValueCenter) {
+            layer.setBackgroundYOrigin(Edge::Top);
+            layer.setYPosition(Length(50, Percent));
+        } else {
+            layer.setBackgroundYOrigin(*primitiveValue);
+            layer.setYPosition(Length());
+        }
+        return;
     }