Changeset 136378 in webkit for trunk/Source/WebCore/css/CSSToStyleMap.cpp

Timestamp:

Dec 3, 2012, 3:55:28 AM (13 years ago)

Author:

[email protected]

Message:

[CSS3 Backgrounds and Borders] Implement CSS3 background-position offsets rendering.
​https://bugs.webkit.org/show_bug.cgi?id=103440

Reviewed by Julien Chaffraix.

Source/WebCore:

Add the rendering bits of the new background-position offsets. It adds
new bits in FillLayer to store the edges used to position the
background. The old x and y members are used the same way as before, to
store the value of the offset.

Test: fast/backgrounds/background-position-rendering.html

• css/CSSComputedStyleDeclaration.cpp:

(WebCore::createPositionListForLayer): Refactor into a function the
code duplicated in getPropertyCSSValue to avoid more code
duplication.
(WebCore):
(WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):

• css/CSSPrimitiveValueMappings.h:

(WebCore):
(WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
Add implicit conversion from the enums used in the rendering code to
CSS values.
(WebCore::CSSPrimitiveValue::operator BackgroundEdgeOrigin):

• css/CSSToStyleMap.cpp:

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

• rendering/RenderBoxModelObject.cpp:

(WebCore::RenderBoxModelObject::calculateBackgroundImageGeometry): Add
support for the new positioning and refactor a little naming of the
variables for better readability.

• rendering/style/FillLayer.cpp:

(SameSizeAsFillLayer):
(WebCore::FillLayer::FillLayer):
(WebCore::FillLayer::operator=):
(WebCore::FillLayer::operator==):
(WebCore::FillLayer::fillUnsetProperties):
(WebCore::FillLayer::fillUnsetProperties): When filling the layer with
unset properties make sure we also set the x and y origins of the
background in case they were set.

• rendering/style/FillLayer.h:

(WebCore::FillLayer::backgroundXOrigin):
(WebCore::FillLayer::backgroundYOrigin):
(WebCore::FillLayer::isBackgroundOriginSet):
(FillLayer):
(WebCore::FillLayer::setBackgroundXOrigin):
(WebCore::FillLayer::setBackgroundYOrigin):
(WebCore::FillLayer::clearPositionX):
(WebCore::FillLayer::clearPositionY):

• rendering/style/RenderStyleConstants.h:

LayoutTests:

Uncomment the computed style tests from background-position-parsing-2
and add the expected output. Add a new
background-position-rendering test to verify that the background has a
correct position with the new <position> value. I also covered some old
CSS 2.1 values for verification.

• fast/backgrounds/background-position-parsing-2-expected.txt:
• fast/backgrounds/background-position-parsing-2.html:
• fast/backgrounds/background-position-rendering-expected.html: Added.
• fast/backgrounds/background-position-rendering.html: Added.
• platform/chromium/TestExpectations:
• platform/efl/TestExpectations:
• platform/gtk/TestExpectations:
• platform/mac/TestExpectations:
• platform/qt/TestExpectations:
• platform/win/TestExpectations:
• platform/wincairo/TestExpectations:

File:

• trunk/Source/WebCore/css/CSSToStyleMap.cpp (modified) (5 diffs)

trunk/Source/WebCore/css/CSSToStyleMap.cpp

@@ -214 +214 @@
 }
 
-void CSSToStyleMap::mapFillXPosition(CSSPropertyID, FillLayer* layer, CSSValue* value)
+void CSSToStyleMap::mapFillXPosition(CSSPropertyID propertyID, FillLayer* layer, CSSValue* value)
 {
     if (value->isInitialValue()) {
@@ -227 +227 @@
 
     CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(value);
+#if ENABLE(CSS3_BACKGROUND)
+    Pair* pair = primitiveValue->getPairValue();
+    if (pair) {
+        ASSERT(propertyID == CSSPropertyBackgroundPositionX);
+        primitiveValue = pair->second();
+    }
+#else
+    UNUSED_PARAM(propertyID);
+#endif
     Length length;
     if (primitiveValue->isLength())
@@ -239 +248 @@
         return;
     layer->setXPosition(length);
-}
-
-void CSSToStyleMap::mapFillYPosition(CSSPropertyID, FillLayer* layer, CSSValue* value)
+#if ENABLE(CSS3_BACKGROUND)
+    if (pair)
+        layer->setBackgroundXOrigin(*(pair->first()));
+#endif
+}
+
+void CSSToStyleMap::mapFillYPosition(CSSPropertyID propertyID, FillLayer* layer, CSSValue* value)
 {
     if (value->isInitialValue()) {
@@ -254 +267 @@
 
     CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(value);
+#if ENABLE(CSS3_BACKGROUND)
+    Pair* pair = primitiveValue->getPairValue();
+    if (pair) {
+        ASSERT(propertyID == CSSPropertyBackgroundPositionY);
+        primitiveValue = pair->second();
+    }
+#else
+    UNUSED_PARAM(propertyID);
+#endif
     Length length;
     if (primitiveValue->isLength())
@@ -266 +288 @@
         return;
     layer->setYPosition(length);
+#if ENABLE(CSS3_BACKGROUND)
+    if (pair)
+        layer->setBackgroundYOrigin(*(pair->first()));
+#endif
 }