diff options
Diffstat (limited to 'Source/WebCore/css/CSSStyleApplyProperty.cpp')
| -rw-r--r-- | Source/WebCore/css/CSSStyleApplyProperty.cpp | 252 |
1 files changed, 237 insertions, 15 deletions
diff --git a/Source/WebCore/css/CSSStyleApplyProperty.cpp b/Source/WebCore/css/CSSStyleApplyProperty.cpp index e075615..6051334 100644 --- a/Source/WebCore/css/CSSStyleApplyProperty.cpp +++ b/Source/WebCore/css/CSSStyleApplyProperty.cpp @@ -27,6 +27,9 @@ #include "CSSPrimitiveValueMappings.h" #include "CSSStyleSelector.h" +#include "CSSValueList.h" +#include "Document.h" +#include "Element.h" #include "RenderStyle.h" #include <wtf/StdLibExtras.h> #include <wtf/UnusedParam.h> @@ -35,11 +38,47 @@ using namespace std; namespace WebCore { -class ApplyPropertyNull : public ApplyPropertyBase { +class ApplyPropertyExpanding : public ApplyPropertyBase { public: - virtual void inherit(CSSStyleSelector*) const {} - virtual void initial(CSSStyleSelector*) const {} - virtual void value(CSSStyleSelector*, CSSValue*) const {} + ApplyPropertyExpanding(ApplyPropertyBase* one = 0, ApplyPropertyBase* two = 0, ApplyPropertyBase *three = 0, ApplyPropertyBase* four = 0) + { + m_propertyMap[0] = one; + m_propertyMap[1] = two; + m_propertyMap[2] = three; + m_propertyMap[3] = four; + m_propertyMap[4] = 0; // always null terminated + } + + virtual void applyInheritValue(CSSStyleSelector* selector) const + { + for (ApplyPropertyBase* const* e = m_propertyMap; *e; e++) + (*e)->applyInheritValue(selector); + } + + virtual void applyInitialValue(CSSStyleSelector* selector) const + { + for (ApplyPropertyBase* const* e = m_propertyMap; *e; e++) + (*e)->applyInitialValue(selector); + } + + virtual void applyValue(CSSStyleSelector* selector, CSSValue* value) const + { + for (ApplyPropertyBase* const* e = m_propertyMap; *e; e++) + (*e)->applyValue(selector, value); + } +private: + ApplyPropertyBase* m_propertyMap[5]; +}; + +class ApplyPropertyExpandingSuppressValue : public ApplyPropertyExpanding { +public: + ApplyPropertyExpandingSuppressValue(ApplyPropertyBase* one = 0, ApplyPropertyBase* two = 0, ApplyPropertyBase *three = 0, ApplyPropertyBase* four = 0) + : ApplyPropertyExpanding(one, two, three, four) {} + + virtual void applyValue(CSSStyleSelector*, CSSValue*) const + { + ASSERT_NOT_REACHED(); + } }; template <typename T> @@ -52,17 +91,17 @@ public: { } - virtual void inherit(CSSStyleSelector* selector) const + virtual void applyInheritValue(CSSStyleSelector* selector) const { (selector->style()->*m_setter)((selector->parentStyle()->*m_getter)()); } - virtual void initial(CSSStyleSelector* selector) const + virtual void applyInitialValue(CSSStyleSelector* selector) const { (selector->style()->*m_setter)((*m_initial)()); } - virtual void value(CSSStyleSelector* selector, CSSValue* value) const + virtual void applyValue(CSSStyleSelector* selector, CSSValue* value) const { if (value->isPrimitiveValue()) (selector->style()->*m_setter)(*(static_cast<CSSPrimitiveValue*>(value))); @@ -83,7 +122,7 @@ public: , m_setter(setter) { } - virtual void inherit(CSSStyleSelector* selector) const + virtual void applyInheritValue(CSSStyleSelector* selector) const { const Color& color = (selector->parentStyle()->*m_getter)(); if (m_defaultValue && !color.isValid()) @@ -91,12 +130,12 @@ public: else (selector->style()->*m_setter)(color); } - virtual void initial(CSSStyleSelector* selector) const + virtual void applyInitialValue(CSSStyleSelector* selector) const { Color color; (selector->style()->*m_setter)(color); } - virtual void value(CSSStyleSelector* selector, CSSValue* value) const + virtual void applyValue(CSSStyleSelector* selector, CSSValue* value) const { if (value->isPrimitiveValue()) (selector->style()->*m_setter)(selector->getColorFromPrimitiveValue(static_cast<CSSPrimitiveValue*>(value))); @@ -115,44 +154,227 @@ public: { } - virtual void initial(CSSStyleSelector* selector) const + virtual void applyInitialValue(CSSStyleSelector* selector) const { (selector->style()->*m_setter)(m_initialValue()); } - virtual void value(CSSStyleSelector* selector, CSSValue* value) const + virtual void applyValue(CSSStyleSelector* selector, CSSValue* value) const { if (!value->isPrimitiveValue()) return; if ((static_cast<CSSPrimitiveValue*>(value))->getIdent() == CSSValueCurrentcolor) - inherit(selector); + applyInheritValue(selector); else - ApplyPropertyColorBase::value(selector, value); + ApplyPropertyColorBase::applyValue(selector, value); } protected: Color (*m_initialValue)(); }; +// CSSPropertyDirection +class ApplyPropertyDirection : public ApplyPropertyDefault<TextDirection> { +public: + ApplyPropertyDirection(TextDirection (RenderStyle::*getter)() const, void (RenderStyle::*setter)(TextDirection), TextDirection (*initial)()) + : ApplyPropertyDefault<TextDirection>(getter, setter, initial) + { + } + + virtual void applyValue(CSSStyleSelector* selector, CSSValue* value) const + { + ApplyPropertyDefault<TextDirection>::applyValue(selector, value); + Element* element = selector->element(); + if (element && selector->element() == element->document()->documentElement()) + element->document()->setDirectionSetOnDocumentElement(true); + } +}; + +template <typename T> +class ApplyPropertyFillLayer : public ApplyPropertyBase { +public: + ApplyPropertyFillLayer(CSSPropertyID propertyId, EFillLayerType fillLayerType, FillLayer* (RenderStyle::*accessLayers)(), + const FillLayer* (RenderStyle::*layers)() const, bool (FillLayer::*test)() const, T (FillLayer::*get)() const, + void (FillLayer::*set)(T), void (FillLayer::*clear)(), T (*initial)(EFillLayerType), + void (CSSStyleSelector::*mapFill)(CSSPropertyID, FillLayer*, CSSValue*)) + : m_propertyId(propertyId) + , m_fillLayerType(fillLayerType) + , m_accessLayers(accessLayers) + , m_layers(layers) + , m_test(test) + , m_get(get) + , m_set(set) + , m_clear(clear) + , m_initial(initial) + , m_mapFill(mapFill) + { + } + + virtual void applyInheritValue(CSSStyleSelector* selector) const + { + FillLayer* currChild = (selector->style()->*m_accessLayers)(); + FillLayer* prevChild = 0; + const FillLayer* currParent = (selector->parentStyle()->*m_layers)(); + while (currParent && (currParent->*m_test)()) { + if (!currChild) { + /* Need to make a new layer.*/ + currChild = new FillLayer(m_fillLayerType); + prevChild->setNext(currChild); + } + (currChild->*m_set)((currParent->*m_get)()); + prevChild = currChild; + currChild = prevChild->next(); + currParent = currParent->next(); + } + + while (currChild) { + /* Reset any remaining layers to not have the property set. */ + (currChild->*m_clear)(); + currChild = currChild->next(); + } + } + + virtual void applyInitialValue(CSSStyleSelector* selector) const + { + FillLayer* currChild = (selector->style()->*m_accessLayers)(); + (currChild->*m_set)((*m_initial)(m_fillLayerType)); + for (currChild = currChild->next(); currChild; currChild = currChild->next()) + (currChild->*m_clear)(); + } + + virtual void applyValue(CSSStyleSelector* selector, CSSValue* value) const + { + FillLayer* currChild = (selector->style()->*m_accessLayers)(); + FillLayer* prevChild = 0; + if (value->isValueList()) { + /* Walk each value and put it into a layer, creating new layers as needed. */ + CSSValueList* valueList = static_cast<CSSValueList*>(value); + for (unsigned int i = 0; i < valueList->length(); i++) { + if (!currChild) { + /* Need to make a new layer to hold this value */ + currChild = new FillLayer(m_fillLayerType); + prevChild->setNext(currChild); + } + (selector->*m_mapFill)(m_propertyId, currChild, valueList->itemWithoutBoundsCheck(i)); + prevChild = currChild; + currChild = currChild->next(); + } + } else { + (selector->*m_mapFill)(m_propertyId, currChild, value); + currChild = currChild->next(); + } + while (currChild) { + /* Reset all remaining layers to not have the property set. */ + (currChild->*m_clear)(); + currChild = currChild->next(); + } + } + +protected: + CSSPropertyID m_propertyId; + EFillLayerType m_fillLayerType; + FillLayer* (RenderStyle::*m_accessLayers)(); + const FillLayer* (RenderStyle::*m_layers)() const; + bool (FillLayer::*m_test)() const; + T (FillLayer::*m_get)() const; + void (FillLayer::*m_set)(T); + void (FillLayer::*m_clear)(); + T (*m_initial)(EFillLayerType); + void (CSSStyleSelector::*m_mapFill)(CSSPropertyID, FillLayer*, CSSValue*); +}; + const CSSStyleApplyProperty& CSSStyleApplyProperty::sharedCSSStyleApplyProperty() { DEFINE_STATIC_LOCAL(CSSStyleApplyProperty, cssStyleApplyPropertyInstance, ()); return cssStyleApplyPropertyInstance; } - CSSStyleApplyProperty::CSSStyleApplyProperty() { for (int i = 0; i < numCSSProperties; ++i) m_propertyMap[i] = 0; setPropertyValue(CSSPropertyColor, new ApplyPropertyColor(&RenderStyle::color, &RenderStyle::setColor, RenderStyle::initialColor)); + setPropertyValue(CSSPropertyDirection, new ApplyPropertyDirection(&RenderStyle::direction, &RenderStyle::setDirection, RenderStyle::initialDirection)); + + setPropertyValue(CSSPropertyBackgroundAttachment, new ApplyPropertyFillLayer<EFillAttachment>(CSSPropertyBackgroundAttachment, BackgroundFillLayer, &RenderStyle::accessBackgroundLayers, &RenderStyle::backgroundLayers, + &FillLayer::isAttachmentSet, &FillLayer::attachment, &FillLayer::setAttachment, &FillLayer::clearAttachment, &FillLayer::initialFillAttachment, &CSSStyleSelector::mapFillAttachment)); + setPropertyValue(CSSPropertyBackgroundClip, new ApplyPropertyFillLayer<EFillBox>(CSSPropertyBackgroundClip, BackgroundFillLayer, &RenderStyle::accessBackgroundLayers, &RenderStyle::backgroundLayers, + &FillLayer::isClipSet, &FillLayer::clip, &FillLayer::setClip, &FillLayer::clearClip, &FillLayer::initialFillClip, &CSSStyleSelector::mapFillClip)); + setPropertyValue(CSSPropertyWebkitBackgroundClip, CSSPropertyBackgroundClip); + setPropertyValue(CSSPropertyWebkitBackgroundComposite, new ApplyPropertyFillLayer<CompositeOperator>(CSSPropertyWebkitBackgroundComposite, BackgroundFillLayer, &RenderStyle::accessBackgroundLayers, &RenderStyle::backgroundLayers, + &FillLayer::isCompositeSet, &FillLayer::composite, &FillLayer::setComposite, &FillLayer::clearComposite, &FillLayer::initialFillComposite, &CSSStyleSelector::mapFillComposite)); + + setPropertyValue(CSSPropertyBackgroundImage, new ApplyPropertyFillLayer<StyleImage*>(CSSPropertyBackgroundImage, BackgroundFillLayer, &RenderStyle::accessBackgroundLayers, &RenderStyle::backgroundLayers, + &FillLayer::isImageSet, &FillLayer::image, &FillLayer::setImage, &FillLayer::clearImage, &FillLayer::initialFillImage, &CSSStyleSelector::mapFillImage)); + + setPropertyValue(CSSPropertyBackgroundOrigin, new ApplyPropertyFillLayer<EFillBox>(CSSPropertyBackgroundOrigin, BackgroundFillLayer, &RenderStyle::accessBackgroundLayers, &RenderStyle::backgroundLayers, + &FillLayer::isOriginSet, &FillLayer::origin, &FillLayer::setOrigin, &FillLayer::clearOrigin, &FillLayer::initialFillOrigin, &CSSStyleSelector::mapFillOrigin)); + setPropertyValue(CSSPropertyWebkitBackgroundOrigin, CSSPropertyBackgroundOrigin); + + setPropertyValue(CSSPropertyBackgroundPositionX, new ApplyPropertyFillLayer<Length>(CSSPropertyBackgroundPositionX, BackgroundFillLayer, &RenderStyle::accessBackgroundLayers, &RenderStyle::backgroundLayers, + &FillLayer::isXPositionSet, &FillLayer::xPosition, &FillLayer::setXPosition, &FillLayer::clearXPosition, &FillLayer::initialFillXPosition, &CSSStyleSelector::mapFillXPosition)); + setPropertyValue(CSSPropertyBackgroundPositionY, new ApplyPropertyFillLayer<Length>(CSSPropertyBackgroundPositionY, BackgroundFillLayer, &RenderStyle::accessBackgroundLayers, &RenderStyle::backgroundLayers, + &FillLayer::isYPositionSet, &FillLayer::yPosition, &FillLayer::setYPosition, &FillLayer::clearYPosition, &FillLayer::initialFillYPosition, &CSSStyleSelector::mapFillYPosition)); + setPropertyValue(CSSPropertyBackgroundPosition, new ApplyPropertyExpandingSuppressValue(propertyValue(CSSPropertyBackgroundPositionX), propertyValue(CSSPropertyBackgroundPositionY))); + + setPropertyValue(CSSPropertyBackgroundRepeatX, new ApplyPropertyFillLayer<EFillRepeat>(CSSPropertyBackgroundRepeatX, BackgroundFillLayer, &RenderStyle::accessBackgroundLayers, &RenderStyle::backgroundLayers, + &FillLayer::isRepeatXSet, &FillLayer::repeatX, &FillLayer::setRepeatX, &FillLayer::clearRepeatX, &FillLayer::initialFillRepeatX, &CSSStyleSelector::mapFillRepeatX)); + setPropertyValue(CSSPropertyBackgroundRepeatY, new ApplyPropertyFillLayer<EFillRepeat>(CSSPropertyBackgroundRepeatY, BackgroundFillLayer, &RenderStyle::accessBackgroundLayers, &RenderStyle::backgroundLayers, + &FillLayer::isRepeatYSet, &FillLayer::repeatY, &FillLayer::setRepeatY, &FillLayer::clearRepeatY, &FillLayer::initialFillRepeatY, &CSSStyleSelector::mapFillRepeatY)); + setPropertyValue(CSSPropertyBackgroundRepeat, new ApplyPropertyExpandingSuppressValue(propertyValue(CSSPropertyBackgroundRepeatX), propertyValue(CSSPropertyBackgroundRepeatY))); + + setPropertyValue(CSSPropertyBackgroundSize, new ApplyPropertyFillLayer<FillSize>(CSSPropertyBackgroundSize, BackgroundFillLayer, &RenderStyle::accessBackgroundLayers, &RenderStyle::backgroundLayers, + &FillLayer::isSizeSet, &FillLayer::size, &FillLayer::setSize, &FillLayer::clearSize, &FillLayer::initialFillSize, &CSSStyleSelector::mapFillSize)); + setPropertyValue(CSSPropertyWebkitBackgroundSize, CSSPropertyBackgroundSize); + + setPropertyValue(CSSPropertyWebkitMaskAttachment, new ApplyPropertyFillLayer<EFillAttachment>(CSSPropertyWebkitMaskAttachment, MaskFillLayer, &RenderStyle::accessMaskLayers, &RenderStyle::maskLayers, + &FillLayer::isAttachmentSet, &FillLayer::attachment, &FillLayer::setAttachment, &FillLayer::clearAttachment, &FillLayer::initialFillAttachment, &CSSStyleSelector::mapFillAttachment)); + setPropertyValue(CSSPropertyWebkitMaskClip, new ApplyPropertyFillLayer<EFillBox>(CSSPropertyWebkitMaskClip, MaskFillLayer, &RenderStyle::accessMaskLayers, &RenderStyle::maskLayers, + &FillLayer::isClipSet, &FillLayer::clip, &FillLayer::setClip, &FillLayer::clearClip, &FillLayer::initialFillClip, &CSSStyleSelector::mapFillClip)); + setPropertyValue(CSSPropertyWebkitMaskComposite, new ApplyPropertyFillLayer<CompositeOperator>(CSSPropertyWebkitMaskComposite, MaskFillLayer, &RenderStyle::accessMaskLayers, &RenderStyle::maskLayers, + &FillLayer::isCompositeSet, &FillLayer::composite, &FillLayer::setComposite, &FillLayer::clearComposite, &FillLayer::initialFillComposite, &CSSStyleSelector::mapFillComposite)); + + setPropertyValue(CSSPropertyWebkitMaskImage, new ApplyPropertyFillLayer<StyleImage*>(CSSPropertyWebkitMaskImage, MaskFillLayer, &RenderStyle::accessMaskLayers, &RenderStyle::maskLayers, + &FillLayer::isImageSet, &FillLayer::image, &FillLayer::setImage, &FillLayer::clearImage, &FillLayer::initialFillImage, &CSSStyleSelector::mapFillImage)); + + setPropertyValue(CSSPropertyWebkitMaskOrigin, new ApplyPropertyFillLayer<EFillBox>(CSSPropertyWebkitMaskOrigin, MaskFillLayer, &RenderStyle::accessMaskLayers, &RenderStyle::maskLayers, + &FillLayer::isOriginSet, &FillLayer::origin, &FillLayer::setOrigin, &FillLayer::clearOrigin, &FillLayer::initialFillOrigin, &CSSStyleSelector::mapFillOrigin)); + setPropertyValue(CSSPropertyWebkitMaskSize, new ApplyPropertyFillLayer<FillSize>(CSSPropertyWebkitMaskSize, MaskFillLayer, &RenderStyle::accessMaskLayers, &RenderStyle::maskLayers, + &FillLayer::isSizeSet, &FillLayer::size, &FillLayer::setSize, &FillLayer::clearSize, &FillLayer::initialFillSize, &CSSStyleSelector::mapFillSize)); + + setPropertyValue(CSSPropertyWebkitMaskPositionX, new ApplyPropertyFillLayer<Length>(CSSPropertyWebkitMaskPositionX, MaskFillLayer, &RenderStyle::accessMaskLayers, &RenderStyle::maskLayers, + &FillLayer::isXPositionSet, &FillLayer::xPosition, &FillLayer::setXPosition, &FillLayer::clearXPosition, &FillLayer::initialFillXPosition, &CSSStyleSelector::mapFillXPosition)); + setPropertyValue(CSSPropertyWebkitMaskPositionY, new ApplyPropertyFillLayer<Length>(CSSPropertyWebkitMaskPositionY, MaskFillLayer, &RenderStyle::accessMaskLayers, &RenderStyle::maskLayers, + &FillLayer::isYPositionSet, &FillLayer::yPosition, &FillLayer::setYPosition, &FillLayer::clearYPosition, &FillLayer::initialFillYPosition, &CSSStyleSelector::mapFillYPosition)); + setPropertyValue(CSSPropertyWebkitMaskPosition, new ApplyPropertyExpandingSuppressValue(propertyValue(CSSPropertyWebkitMaskPositionX), propertyValue(CSSPropertyWebkitMaskPositionY))); + + setPropertyValue(CSSPropertyWebkitMaskRepeatX, new ApplyPropertyFillLayer<EFillRepeat>(CSSPropertyWebkitMaskRepeatX, MaskFillLayer, &RenderStyle::accessMaskLayers, &RenderStyle::maskLayers, + &FillLayer::isRepeatXSet, &FillLayer::repeatX, &FillLayer::setRepeatX, &FillLayer::clearRepeatX, &FillLayer::initialFillRepeatX, &CSSStyleSelector::mapFillRepeatX)); + setPropertyValue(CSSPropertyWebkitMaskRepeatY, new ApplyPropertyFillLayer<EFillRepeat>(CSSPropertyWebkitMaskRepeatY, MaskFillLayer, &RenderStyle::accessMaskLayers, &RenderStyle::maskLayers, + &FillLayer::isRepeatYSet, &FillLayer::repeatY, &FillLayer::setRepeatY, &FillLayer::clearRepeatY, &FillLayer::initialFillRepeatY, &CSSStyleSelector::mapFillRepeatY)); + setPropertyValue(CSSPropertyWebkitMaskRepeat, new ApplyPropertyExpandingSuppressValue(propertyValue(CSSPropertyBackgroundRepeatX), propertyValue(CSSPropertyBackgroundRepeatY))); + + setPropertyValue(CSSPropertyWebkitMaskSize, new ApplyPropertyFillLayer<FillSize>(CSSPropertyWebkitMaskSize, MaskFillLayer, &RenderStyle::accessMaskLayers, &RenderStyle::maskLayers, + &FillLayer::isSizeSet, &FillLayer::size, &FillLayer::setSize, &FillLayer::clearSize, &FillLayer::initialFillSize, &CSSStyleSelector::mapFillSize)); + setPropertyValue(CSSPropertyBackgroundColor, new ApplyPropertyColorBase(&RenderStyle::backgroundColor, 0, &RenderStyle::setBackgroundColor)); setPropertyValue(CSSPropertyBorderBottomColor, new ApplyPropertyColorBase(&RenderStyle::borderBottomColor, &RenderStyle::color, &RenderStyle::setBorderBottomColor)); setPropertyValue(CSSPropertyBorderLeftColor, new ApplyPropertyColorBase(&RenderStyle::borderLeftColor, &RenderStyle::color, &RenderStyle::setBorderLeftColor)); setPropertyValue(CSSPropertyBorderRightColor, new ApplyPropertyColorBase(&RenderStyle::borderRightColor, &RenderStyle::color, &RenderStyle::setBorderRightColor)); setPropertyValue(CSSPropertyBorderTopColor, new ApplyPropertyColorBase(&RenderStyle::borderTopColor, &RenderStyle::color, &RenderStyle::setBorderTopColor)); + + setPropertyValue(CSSPropertyBorderTopStyle, new ApplyPropertyDefault<EBorderStyle>(&RenderStyle::borderTopStyle, &RenderStyle::setBorderTopStyle, &RenderStyle::initialBorderStyle)); + setPropertyValue(CSSPropertyBorderRightStyle, new ApplyPropertyDefault<EBorderStyle>(&RenderStyle::borderRightStyle, &RenderStyle::setBorderRightStyle, &RenderStyle::initialBorderStyle)); + setPropertyValue(CSSPropertyBorderBottomStyle, new ApplyPropertyDefault<EBorderStyle>(&RenderStyle::borderBottomStyle, &RenderStyle::setBorderBottomStyle, &RenderStyle::initialBorderStyle)); + setPropertyValue(CSSPropertyBorderLeftStyle, new ApplyPropertyDefault<EBorderStyle>(&RenderStyle::borderLeftStyle, &RenderStyle::setBorderLeftStyle, &RenderStyle::initialBorderStyle)); + setPropertyValue(CSSPropertyOutlineColor, new ApplyPropertyColorBase(&RenderStyle::outlineColor, &RenderStyle::color, &RenderStyle::setOutlineColor)); + + setPropertyValue(CSSPropertyOverflowX, new ApplyPropertyDefault<EOverflow>(&RenderStyle::overflowX, &RenderStyle::setOverflowX, &RenderStyle::initialOverflowX)); + setPropertyValue(CSSPropertyOverflowY, new ApplyPropertyDefault<EOverflow>(&RenderStyle::overflowY, &RenderStyle::setOverflowY, &RenderStyle::initialOverflowY)); + setPropertyValue(CSSPropertyOverflow, new ApplyPropertyExpanding(propertyValue(CSSPropertyOverflowX), propertyValue(CSSPropertyOverflowY))); + setPropertyValue(CSSPropertyWebkitColumnRuleColor, new ApplyPropertyColorBase(&RenderStyle::columnRuleColor, &RenderStyle::color, &RenderStyle::setColumnRuleColor)); setPropertyValue(CSSPropertyWebkitTextEmphasisColor, new ApplyPropertyColorBase(&RenderStyle::textEmphasisColor, &RenderStyle::color, &RenderStyle::setTextEmphasisColor)); setPropertyValue(CSSPropertyWebkitTextFillColor, new ApplyPropertyColorBase(&RenderStyle::textFillColor, &RenderStyle::color, &RenderStyle::setTextFillColor)); |