Bug 74368 – Implement CSS font-size property in CSSStyleApplyProperty.

• Status: RESOLVED
• Resolution: FIXED
• Component: CSS

[Luke Macpherson]

Implement CSS font-size property in CSSStyleApplyProperty.

[Luke Macpherson]

Created attachment 118902 [details]
Patch

[Andreas Kling]

Comment on attachment 118902 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=118902&action=review

> Source/WebCore/css/CSSStyleApplyProperty.cpp:603
> +        fontDescription.setKeywordSize(0);

This should be removed as it's overwritten just below.

> Source/WebCore/css/CSSStyleApplyProperty.cpp:608
> +        if (size < 0)
> +            return;

We should check this before copying the FontDescription to avoid unnecessary work.

> Source/WebCore/css/CSSStyleApplyProperty.cpp:618
> +        fontDescription.setKeywordSize(0);

This should be removed as it's overwritten just below.

> Source/WebCore/css/CSSStyleApplyProperty.cpp:623
> +        if (size < 0)
> +            return;

We should check this before copying the FontDescription to avoid unnecessary work.

> Source/WebCore/css/CSSStyleApplyProperty.cpp:680
> +            if (CSSPrimitiveValue::isUnitTypeLength(type))

if (primitiveValue->isLength())

> Source/WebCore/css/CSSStyleApplyProperty.cpp:682
> +            else if (type == CSSPrimitiveValue::CSS_PERCENTAGE)

else if (primitiveValue->isPercentage())

[Luke Macpherson]

Comment on attachment 118902 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=118902&action=review

>> Source/WebCore/css/CSSStyleApplyProperty.cpp:603
>> +        fontDescription.setKeywordSize(0);
> 
> This should be removed as it's overwritten just below.

Done.

>> Source/WebCore/css/CSSStyleApplyProperty.cpp:608
>> +            return;
> 
> We should check this before copying the FontDescription to avoid unnecessary work.

Done.

>> Source/WebCore/css/CSSStyleApplyProperty.cpp:618
>> +        fontDescription.setKeywordSize(0);
> 
> This should be removed as it's overwritten just below.

Done.

>> Source/WebCore/css/CSSStyleApplyProperty.cpp:623
>> +            return;
> 
> We should check this before copying the FontDescription to avoid unnecessary work.

fontDescription is used to calculate size in this case, so I've only moved fontDescription.setKeywordSize after this return.

>> Source/WebCore/css/CSSStyleApplyProperty.cpp:680
>> +            if (CSSPrimitiveValue::isUnitTypeLength(type))
> 
> if (primitiveValue->isLength())

Done.

>> Source/WebCore/css/CSSStyleApplyProperty.cpp:682
>> +            else if (type == CSSPrimitiveValue::CSS_PERCENTAGE)
> 
> else if (primitiveValue->isPercentage())

Done.

[Luke Macpherson]

Created attachment 119788 [details]
Patch for landing

[WebKit Review Bot]

Comment on attachment 119788 [details]
Patch for landing

Clearing flags on attachment: 119788

Committed r103208: <http://trac.webkit.org/changeset/103208>

[WebKit Review Bot]

All reviewed patches have been landed.  Closing bug.