| Index: Source/core/editing/EditingStyle.cpp
|
| diff --git a/Source/core/editing/EditingStyle.cpp b/Source/core/editing/EditingStyle.cpp
|
| index 1de7a9bf626f45f8d74ca99db166007cac217e3d..dc47c936f69a2a885a871ccb1bb60cf0beb7a82b 100644
|
| --- a/Source/core/editing/EditingStyle.cpp
|
| +++ b/Source/core/editing/EditingStyle.cpp
|
| @@ -160,9 +160,9 @@ static int legacyFontSizeFromCSSValue(Document*, CSSPrimitiveValue*, bool, Legac
|
| static bool isTransparentColorValue(CSSValue*);
|
| static bool hasTransparentBackgroundColor(CSSStyleDeclaration*);
|
| static bool hasTransparentBackgroundColor(StylePropertySet*);
|
| -static PassRefPtrWillBeRawPtr<CSSValue> backgroundColorInEffect(Node*);
|
| +static PassRefPtr<CSSValue> backgroundColorInEffect(Node*);
|
|
|
| -class HTMLElementEquivalent : public NoBaseWillBeGarbageCollected<HTMLElementEquivalent> {
|
| +class HTMLElementEquivalent : public NoBaseWillBeGarbageCollectedFinalized<HTMLElementEquivalent> {
|
| WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(HTMLElementEquivalent);
|
| DECLARE_EMPTY_VIRTUAL_DESTRUCTOR_WILL_BE_REMOVED(HTMLElementEquivalent);
|
| public:
|
| @@ -177,14 +177,14 @@ public:
|
| virtual bool valueIsPresentInStyle(HTMLElement*, StylePropertySet*) const;
|
| virtual void addToStyle(Element*, EditingStyle*) const;
|
|
|
| - DEFINE_INLINE_VIRTUAL_TRACE() { visitor->trace(m_primitiveValue); }
|
| + DEFINE_INLINE_VIRTUAL_TRACE() { }
|
|
|
| protected:
|
| HTMLElementEquivalent(CSSPropertyID);
|
| HTMLElementEquivalent(CSSPropertyID, const HTMLQualifiedName& tagName);
|
| HTMLElementEquivalent(CSSPropertyID, CSSValueID primitiveValue, const HTMLQualifiedName& tagName);
|
| const CSSPropertyID m_propertyID;
|
| - const RefPtrWillBeMember<CSSPrimitiveValue> m_primitiveValue;
|
| + const RefPtr<CSSPrimitiveValue> m_primitiveValue;
|
| const HTMLQualifiedName* m_tagName; // We can store a pointer because HTML tag names are const global.
|
| };
|
|
|
| @@ -212,7 +212,7 @@ HTMLElementEquivalent::HTMLElementEquivalent(CSSPropertyID id, CSSValueID primit
|
|
|
| bool HTMLElementEquivalent::valueIsPresentInStyle(HTMLElement* element, StylePropertySet* style) const
|
| {
|
| - RefPtrWillBeRawPtr<CSSValue> value = style->getPropertyCSSValue(m_propertyID);
|
| + RefPtr<CSSValue> value = style->getPropertyCSSValue(m_propertyID);
|
| return matches(element) && value && value->isPrimitiveValue() && toCSSPrimitiveValue(value.get())->getValueID() == m_primitiveValue->getValueID();
|
| }
|
|
|
| @@ -250,7 +250,7 @@ bool HTMLTextDecorationEquivalent::propertyExistsInStyle(const StylePropertySet*
|
|
|
| bool HTMLTextDecorationEquivalent::valueIsPresentInStyle(HTMLElement* element, StylePropertySet* style) const
|
| {
|
| - RefPtrWillBeRawPtr<CSSValue> styleValue = style->getPropertyCSSValue(CSSPropertyWebkitTextDecorationsInEffect);
|
| + RefPtr<CSSValue> styleValue = style->getPropertyCSSValue(CSSPropertyWebkitTextDecorationsInEffect);
|
| if (!styleValue)
|
| styleValue = style->getPropertyCSSValue(textDecorationPropertyForEditing());
|
| return matches(element) && styleValue && styleValue->isValueList() && toCSSValueList(styleValue.get())->hasValue(m_primitiveValue.get());
|
| @@ -271,7 +271,7 @@ public:
|
| bool hasAttribute() const override { return true; }
|
| bool valueIsPresentInStyle(HTMLElement*, StylePropertySet*) const override;
|
| void addToStyle(Element*, EditingStyle*) const override;
|
| - virtual PassRefPtrWillBeRawPtr<CSSValue> attributeValueAsCSSValue(Element*) const;
|
| + virtual PassRefPtr<CSSValue> attributeValueAsCSSValue(Element*) const;
|
| inline const QualifiedName& attributeName() const { return m_attrName; }
|
|
|
| DEFINE_INLINE_VIRTUAL_TRACE() { HTMLElementEquivalent::trace(visitor); }
|
| @@ -296,19 +296,19 @@ HTMLAttributeEquivalent::HTMLAttributeEquivalent(CSSPropertyID id, const Qualifi
|
|
|
| bool HTMLAttributeEquivalent::valueIsPresentInStyle(HTMLElement* element, StylePropertySet* style) const
|
| {
|
| - RefPtrWillBeRawPtr<CSSValue> value = attributeValueAsCSSValue(element);
|
| - RefPtrWillBeRawPtr<CSSValue> styleValue = style->getPropertyCSSValue(m_propertyID);
|
| + RefPtr<CSSValue> value = attributeValueAsCSSValue(element);
|
| + RefPtr<CSSValue> styleValue = style->getPropertyCSSValue(m_propertyID);
|
|
|
| return compareCSSValuePtr(value, styleValue);
|
| }
|
|
|
| void HTMLAttributeEquivalent::addToStyle(Element* element, EditingStyle* style) const
|
| {
|
| - if (RefPtrWillBeRawPtr<CSSValue> value = attributeValueAsCSSValue(element))
|
| + if (RefPtr<CSSValue> value = attributeValueAsCSSValue(element))
|
| style->setProperty(m_propertyID, value->cssText());
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<CSSValue> HTMLAttributeEquivalent::attributeValueAsCSSValue(Element* element) const
|
| +PassRefPtr<CSSValue> HTMLAttributeEquivalent::attributeValueAsCSSValue(Element* element) const
|
| {
|
| ASSERT(element);
|
| const AtomicString& value = element->getAttribute(m_attrName);
|
| @@ -327,7 +327,7 @@ public:
|
| {
|
| return adoptPtrWillBeNoop(new HTMLFontSizeEquivalent());
|
| }
|
| - PassRefPtrWillBeRawPtr<CSSValue> attributeValueAsCSSValue(Element*) const override;
|
| + PassRefPtr<CSSValue> attributeValueAsCSSValue(Element*) const override;
|
|
|
| DEFINE_INLINE_VIRTUAL_TRACE() { HTMLAttributeEquivalent::trace(visitor); }
|
|
|
| @@ -340,7 +340,7 @@ HTMLFontSizeEquivalent::HTMLFontSizeEquivalent()
|
| {
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<CSSValue> HTMLFontSizeEquivalent::attributeValueAsCSSValue(Element* element) const
|
| +PassRefPtr<CSSValue> HTMLFontSizeEquivalent::attributeValueAsCSSValue(Element* element) const
|
| {
|
| ASSERT(element);
|
| const AtomicString& value = element->getAttribute(m_attrName);
|
| @@ -473,9 +473,9 @@ void EditingStyle::init(Node* node, PropertiesToInclude propertiesToInclude)
|
| m_mutableStyle = propertiesToInclude == AllProperties && computedStyleAtPosition ? computedStyleAtPosition->copyProperties() : editingStyleFromComputedStyle(computedStyleAtPosition);
|
|
|
| if (propertiesToInclude == EditingPropertiesInEffect) {
|
| - if (RefPtrWillBeRawPtr<CSSValue> value = backgroundColorInEffect(node))
|
| + if (RefPtr<CSSValue> value = backgroundColorInEffect(node))
|
| m_mutableStyle->setProperty(CSSPropertyBackgroundColor, value->cssText());
|
| - if (RefPtrWillBeRawPtr<CSSValue> value = computedStyleAtPosition->getPropertyCSSValue(CSSPropertyWebkitTextDecorationsInEffect))
|
| + if (RefPtr<CSSValue> value = computedStyleAtPosition->getPropertyCSSValue(CSSPropertyWebkitTextDecorationsInEffect))
|
| m_mutableStyle->setProperty(CSSPropertyTextDecoration, value->cssText());
|
| }
|
|
|
| @@ -527,7 +527,7 @@ void EditingStyle::extractFontSizeDelta()
|
| }
|
|
|
| // Get the adjustment amount out of the style.
|
| - RefPtrWillBeRawPtr<CSSValue> value = m_mutableStyle->getPropertyCSSValue(CSSPropertyWebkitFontSizeDelta);
|
| + RefPtr<CSSValue> value = m_mutableStyle->getPropertyCSSValue(CSSPropertyWebkitFontSizeDelta);
|
| if (!value || !value->isPrimitiveValue())
|
| return;
|
|
|
| @@ -552,13 +552,13 @@ bool EditingStyle::textDirection(WritingDirection& writingDirection) const
|
| if (!m_mutableStyle)
|
| return false;
|
|
|
| - RefPtrWillBeRawPtr<CSSValue> unicodeBidi = m_mutableStyle->getPropertyCSSValue(CSSPropertyUnicodeBidi);
|
| + RefPtr<CSSValue> unicodeBidi = m_mutableStyle->getPropertyCSSValue(CSSPropertyUnicodeBidi);
|
| if (!unicodeBidi || !unicodeBidi->isPrimitiveValue())
|
| return false;
|
|
|
| CSSValueID unicodeBidiValue = toCSSPrimitiveValue(unicodeBidi.get())->getValueID();
|
| if (unicodeBidiValue == CSSValueEmbed) {
|
| - RefPtrWillBeRawPtr<CSSValue> direction = m_mutableStyle->getPropertyCSSValue(CSSPropertyDirection);
|
| + RefPtr<CSSValue> direction = m_mutableStyle->getPropertyCSSValue(CSSPropertyDirection);
|
| if (!direction || !direction->isPrimitiveValue())
|
| return false;
|
|
|
| @@ -696,7 +696,7 @@ void EditingStyle::collapseTextDecorationProperties()
|
| if (!m_mutableStyle)
|
| return;
|
|
|
| - RefPtrWillBeRawPtr<CSSValue> textDecorationsInEffect = m_mutableStyle->getPropertyCSSValue(CSSPropertyWebkitTextDecorationsInEffect);
|
| + RefPtr<CSSValue> textDecorationsInEffect = m_mutableStyle->getPropertyCSSValue(CSSPropertyWebkitTextDecorationsInEffect);
|
| if (!textDecorationsInEffect)
|
| return;
|
|
|
| @@ -993,8 +993,8 @@ void EditingStyle::prepareToApplyAt(const Position& position, ShouldPreserveWrit
|
| RefPtrWillBeRawPtr<EditingStyle> editingStyleAtPosition = EditingStyle::create(position, EditingPropertiesInEffect);
|
| StylePropertySet* styleAtPosition = editingStyleAtPosition->m_mutableStyle.get();
|
|
|
| - RefPtrWillBeRawPtr<CSSValue> unicodeBidi = nullptr;
|
| - RefPtrWillBeRawPtr<CSSValue> direction = nullptr;
|
| + RefPtr<CSSValue> unicodeBidi = nullptr;
|
| + RefPtr<CSSValue> direction = nullptr;
|
| if (shouldPreserveWritingDirection == PreserveWritingDirection) {
|
| unicodeBidi = m_mutableStyle->getPropertyCSSValue(CSSPropertyUnicodeBidi);
|
| direction = m_mutableStyle->getPropertyCSSValue(CSSPropertyDirection);
|
| @@ -1132,8 +1132,8 @@ PassRefPtrWillBeRawPtr<EditingStyle> EditingStyle::wrappingStyleForSerialization
|
|
|
| static void mergeTextDecorationValues(CSSValueList* mergedValue, const CSSValueList* valueToMerge)
|
| {
|
| - DEFINE_STATIC_REF_WILL_BE_PERSISTENT(CSSPrimitiveValue, underline, (CSSPrimitiveValue::createIdentifier(CSSValueUnderline)));
|
| - DEFINE_STATIC_REF_WILL_BE_PERSISTENT(CSSPrimitiveValue, lineThrough, (CSSPrimitiveValue::createIdentifier(CSSValueLineThrough)));
|
| + DEFINE_STATIC_REF(CSSPrimitiveValue, underline, (CSSPrimitiveValue::createIdentifier(CSSValueUnderline)));
|
| + DEFINE_STATIC_REF(CSSPrimitiveValue, lineThrough, (CSSPrimitiveValue::createIdentifier(CSSValueLineThrough)));
|
| if (valueToMerge->hasValue(underline) && !mergedValue->hasValue(underline))
|
| mergedValue->append(underline);
|
|
|
| @@ -1154,7 +1154,7 @@ void EditingStyle::mergeStyle(const StylePropertySet* style, CSSPropertyOverride
|
| unsigned propertyCount = style->propertyCount();
|
| for (unsigned i = 0; i < propertyCount; ++i) {
|
| StylePropertySet::PropertyReference property = style->propertyAt(i);
|
| - RefPtrWillBeRawPtr<CSSValue> value = m_mutableStyle->getPropertyCSSValue(property.id());
|
| + RefPtr<CSSValue> value = m_mutableStyle->getPropertyCSSValue(property.id());
|
|
|
| // text decorations never override values
|
| if ((property.id() == textDecorationPropertyForEditing() || property.id() == CSSPropertyWebkitTextDecorationsInEffect) && property.value()->isValueList() && value) {
|
| @@ -1211,7 +1211,7 @@ void EditingStyle::mergeStyleFromRulesForSerialization(Element* element)
|
| if (!value->isPrimitiveValue())
|
| continue;
|
| if (toCSSPrimitiveValue(value)->isPercentage()) {
|
| - if (RefPtrWillBeRawPtr<CSSValue> computedPropertyValue = computedStyleForElement->getPropertyCSSValue(property.id()))
|
| + if (RefPtr<CSSValue> computedPropertyValue = computedStyleForElement->getPropertyCSSValue(property.id()))
|
| fromComputedStyle->addRespectingCascade(CSSProperty(property.id(), computedPropertyValue));
|
| }
|
| }
|
| @@ -1305,7 +1305,7 @@ void EditingStyle::forceInline()
|
|
|
| int EditingStyle::legacyFontSize(Document* document) const
|
| {
|
| - RefPtrWillBeRawPtr<CSSValue> cssValue = m_mutableStyle->getPropertyCSSValue(CSSPropertyFontSize);
|
| + RefPtr<CSSValue> cssValue = m_mutableStyle->getPropertyCSSValue(CSSPropertyFontSize);
|
| if (!cssValue || !cssValue->isPrimitiveValue())
|
| return 0;
|
| return legacyFontSizeFromCSSValue(document, toCSSPrimitiveValue(cssValue.get()),
|
| @@ -1339,7 +1339,7 @@ PassRefPtrWillBeRawPtr<EditingStyle> EditingStyle::styleAtSelectionStart(const V
|
| // and find the background color of the common ancestor.
|
| if (shouldUseBackgroundColorInEffect && (selection.isRange() || hasTransparentBackgroundColor(style->m_mutableStyle.get()))) {
|
| const EphemeralRange range(selection.toNormalizedEphemeralRange());
|
| - if (PassRefPtrWillBeRawPtr<CSSValue> value = backgroundColorInEffect(Range::commonAncestorContainer(range.startPosition().computeContainerNode(), range.endPosition().computeContainerNode())))
|
| + if (PassRefPtr<CSSValue> value = backgroundColorInEffect(Range::commonAncestorContainer(range.startPosition().computeContainerNode(), range.endPosition().computeContainerNode())))
|
| style->setProperty(CSSPropertyBackgroundColor, value->cssText());
|
| }
|
|
|
| @@ -1370,7 +1370,7 @@ WritingDirection EditingStyle::textDirectionForSelection(const VisibleSelection&
|
| continue;
|
|
|
| RefPtrWillBeRawPtr<CSSComputedStyleDeclaration> style = CSSComputedStyleDeclaration::create(n);
|
| - RefPtrWillBeRawPtr<CSSValue> unicodeBidi = style->getPropertyCSSValue(CSSPropertyUnicodeBidi);
|
| + RefPtr<CSSValue> unicodeBidi = style->getPropertyCSSValue(CSSPropertyUnicodeBidi);
|
| if (!unicodeBidi || !unicodeBidi->isPrimitiveValue())
|
| continue;
|
|
|
| @@ -1400,7 +1400,7 @@ WritingDirection EditingStyle::textDirectionForSelection(const VisibleSelection&
|
|
|
| Element* element = toElement(node);
|
| RefPtrWillBeRawPtr<CSSComputedStyleDeclaration> style = CSSComputedStyleDeclaration::create(element);
|
| - RefPtrWillBeRawPtr<CSSValue> unicodeBidi = style->getPropertyCSSValue(CSSPropertyUnicodeBidi);
|
| + RefPtr<CSSValue> unicodeBidi = style->getPropertyCSSValue(CSSPropertyUnicodeBidi);
|
| if (!unicodeBidi || !unicodeBidi->isPrimitiveValue())
|
| continue;
|
|
|
| @@ -1412,7 +1412,7 @@ WritingDirection EditingStyle::textDirectionForSelection(const VisibleSelection&
|
| return NaturalWritingDirection;
|
|
|
| ASSERT(unicodeBidiValue == CSSValueEmbed);
|
| - RefPtrWillBeRawPtr<CSSValue> direction = style->getPropertyCSSValue(CSSPropertyDirection);
|
| + RefPtr<CSSValue> direction = style->getPropertyCSSValue(CSSPropertyDirection);
|
| if (!direction || !direction->isPrimitiveValue())
|
| continue;
|
|
|
| @@ -1440,8 +1440,8 @@ DEFINE_TRACE(EditingStyle)
|
|
|
| static void reconcileTextDecorationProperties(MutableStylePropertySet* style)
|
| {
|
| - RefPtrWillBeRawPtr<CSSValue> textDecorationsInEffect = style->getPropertyCSSValue(CSSPropertyWebkitTextDecorationsInEffect);
|
| - RefPtrWillBeRawPtr<CSSValue> textDecoration = style->getPropertyCSSValue(textDecorationPropertyForEditing());
|
| + RefPtr<CSSValue> textDecorationsInEffect = style->getPropertyCSSValue(CSSPropertyWebkitTextDecorationsInEffect);
|
| + RefPtr<CSSValue> textDecoration = style->getPropertyCSSValue(textDecorationPropertyForEditing());
|
| // We shouldn't have both text-decoration and -webkit-text-decorations-in-effect because that wouldn't make sense.
|
| ASSERT(!textDecorationsInEffect || !textDecoration);
|
| if (textDecorationsInEffect) {
|
| @@ -1517,11 +1517,11 @@ void StyleChange::extractTextStyles(Document* document, MutableStylePropertySet*
|
|
|
| // Assuming reconcileTextDecorationProperties has been called, there should not be -webkit-text-decorations-in-effect
|
| // Furthermore, text-decoration: none has been trimmed so that text-decoration property is always a CSSValueList.
|
| - RefPtrWillBeRawPtr<CSSValue> textDecoration = style->getPropertyCSSValue(textDecorationPropertyForEditing());
|
| + RefPtr<CSSValue> textDecoration = style->getPropertyCSSValue(textDecorationPropertyForEditing());
|
| if (textDecoration && textDecoration->isValueList()) {
|
| - DEFINE_STATIC_REF_WILL_BE_PERSISTENT(CSSPrimitiveValue, underline, (CSSPrimitiveValue::createIdentifier(CSSValueUnderline)));
|
| - DEFINE_STATIC_REF_WILL_BE_PERSISTENT(CSSPrimitiveValue, lineThrough, (CSSPrimitiveValue::createIdentifier(CSSValueLineThrough)));
|
| - RefPtrWillBeRawPtr<CSSValueList> newTextDecoration = toCSSValueList(textDecoration.get())->copy();
|
| + DEFINE_STATIC_REF(CSSPrimitiveValue, underline, (CSSPrimitiveValue::createIdentifier(CSSValueUnderline)));
|
| + DEFINE_STATIC_REF(CSSPrimitiveValue, lineThrough, (CSSPrimitiveValue::createIdentifier(CSSValueLineThrough)));
|
| + RefPtr<CSSValueList> newTextDecoration = toCSSValueList(textDecoration.get())->copy();
|
| if (newTextDecoration->removeAll(underline))
|
| m_applyUnderline = true;
|
| if (newTextDecoration->removeAll(lineThrough))
|
| @@ -1553,7 +1553,7 @@ void StyleChange::extractTextStyles(Document* document, MutableStylePropertySet*
|
| m_applyFontFace.replaceWithLiteral('\'', "");
|
| style->removeProperty(CSSPropertyFontFamily);
|
|
|
| - if (RefPtrWillBeRawPtr<CSSValue> fontSize = style->getPropertyCSSValue(CSSPropertyFontSize)) {
|
| + if (RefPtr<CSSValue> fontSize = style->getPropertyCSSValue(CSSPropertyFontSize)) {
|
| if (!fontSize->isPrimitiveValue()) {
|
| style->removeProperty(CSSPropertyFontSize); // Can't make sense of the number. Put no font size.
|
| } else if (int legacyFontSize = legacyFontSizeFromCSSValue(document, toCSSPrimitiveValue(fontSize.get()), isMonospaceFont, UseLegacyFontSizeOnlyIfPixelValuesMatch)) {
|
| @@ -1565,11 +1565,11 @@ void StyleChange::extractTextStyles(Document* document, MutableStylePropertySet*
|
|
|
| static void diffTextDecorations(MutableStylePropertySet* style, CSSPropertyID propertID, CSSValue* refTextDecoration)
|
| {
|
| - RefPtrWillBeRawPtr<CSSValue> textDecoration = style->getPropertyCSSValue(propertID);
|
| + RefPtr<CSSValue> textDecoration = style->getPropertyCSSValue(propertID);
|
| if (!textDecoration || !textDecoration->isValueList() || !refTextDecoration || !refTextDecoration->isValueList())
|
| return;
|
|
|
| - RefPtrWillBeRawPtr<CSSValueList> newTextDecoration = toCSSValueList(textDecoration.get())->copy();
|
| + RefPtr<CSSValueList> newTextDecoration = toCSSValueList(textDecoration.get())->copy();
|
| CSSValueList* valuesInRefTextDecoration = toCSSValueList(refTextDecoration);
|
|
|
| for (size_t i = 0; i < valuesInRefTextDecoration->length(); i++)
|
| @@ -1624,12 +1624,12 @@ PassRefPtrWillBeRawPtr<MutableStylePropertySet> getPropertiesNotIn(StyleProperty
|
|
|
| result->removeEquivalentProperties(baseStyle);
|
|
|
| - RefPtrWillBeRawPtr<CSSValue> baseTextDecorationsInEffect = baseStyle->getPropertyCSSValueInternal(CSSPropertyWebkitTextDecorationsInEffect);
|
| + RefPtr<CSSValue> baseTextDecorationsInEffect = baseStyle->getPropertyCSSValueInternal(CSSPropertyWebkitTextDecorationsInEffect);
|
| diffTextDecorations(result.get(), textDecorationPropertyForEditing(), baseTextDecorationsInEffect.get());
|
| diffTextDecorations(result.get(), CSSPropertyWebkitTextDecorationsInEffect, baseTextDecorationsInEffect.get());
|
|
|
| - if (RefPtrWillBeRawPtr<CSSValue> baseFontWeight = baseStyle->getPropertyCSSValueInternal(CSSPropertyFontWeight)) {
|
| - if (RefPtrWillBeRawPtr<CSSValue> fontWeight = result->getPropertyCSSValue(CSSPropertyFontWeight)) {
|
| + if (RefPtr<CSSValue> baseFontWeight = baseStyle->getPropertyCSSValueInternal(CSSPropertyFontWeight)) {
|
| + if (RefPtr<CSSValue> fontWeight = result->getPropertyCSSValue(CSSPropertyFontWeight)) {
|
| if (!fontWeightNeedsResolving(fontWeight.get()) && !fontWeightNeedsResolving(baseFontWeight.get())
|
| && (fontWeightIsBold(fontWeight.get()) == fontWeightIsBold(baseFontWeight.get())))
|
| result->removeProperty(CSSPropertyFontWeight);
|
| @@ -1653,7 +1653,7 @@ CSSValueID getIdentifierValue(StylePropertySet* style, CSSPropertyID propertyID)
|
| {
|
| if (!style)
|
| return CSSValueInvalid;
|
| - RefPtrWillBeRawPtr<CSSValue> value = style->getPropertyCSSValue(propertyID);
|
| + RefPtr<CSSValue> value = style->getPropertyCSSValue(propertyID);
|
| if (!value || !value->isPrimitiveValue())
|
| return CSSValueInvalid;
|
| return toCSSPrimitiveValue(value.get())->getValueID();
|
| @@ -1663,7 +1663,7 @@ CSSValueID getIdentifierValue(CSSStyleDeclaration* style, CSSPropertyID property
|
| {
|
| if (!style)
|
| return CSSValueInvalid;
|
| - RefPtrWillBeRawPtr<CSSValue> value = style->getPropertyCSSValueInternal(propertyID);
|
| + RefPtr<CSSValue> value = style->getPropertyCSSValueInternal(propertyID);
|
| if (!value || !value->isPrimitiveValue())
|
| return CSSValueInvalid;
|
| return toCSSPrimitiveValue(value.get())->getValueID();
|
| @@ -1704,17 +1704,17 @@ bool isTransparentColorValue(CSSValue* cssValue)
|
|
|
| bool hasTransparentBackgroundColor(CSSStyleDeclaration* style)
|
| {
|
| - RefPtrWillBeRawPtr<CSSValue> cssValue = style->getPropertyCSSValueInternal(CSSPropertyBackgroundColor);
|
| + RefPtr<CSSValue> cssValue = style->getPropertyCSSValueInternal(CSSPropertyBackgroundColor);
|
| return isTransparentColorValue(cssValue.get());
|
| }
|
|
|
| bool hasTransparentBackgroundColor(StylePropertySet* style)
|
| {
|
| - RefPtrWillBeRawPtr<CSSValue> cssValue = style->getPropertyCSSValue(CSSPropertyBackgroundColor);
|
| + RefPtr<CSSValue> cssValue = style->getPropertyCSSValue(CSSPropertyBackgroundColor);
|
| return isTransparentColorValue(cssValue.get());
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<CSSValue> backgroundColorInEffect(Node* node)
|
| +PassRefPtr<CSSValue> backgroundColorInEffect(Node* node)
|
| {
|
| for (Node* ancestor = node; ancestor; ancestor = ancestor->parentNode()) {
|
| RefPtrWillBeRawPtr<CSSComputedStyleDeclaration> ancestorStyle = CSSComputedStyleDeclaration::create(ancestor);
|
|
|