diff options
| author | Steve Block <steveblock@google.com> | 2012-04-27 17:24:33 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2012-04-27 17:36:24 +0100 |
| commit | 3818681c85a025afd8aa203937b66d7c01ac1a8b (patch) | |
| tree | edf1be45d394929e637b36a9355dc93e7a83abe7 /Source/WebCore/css | |
| parent | 0cc9bd18cde7294402b1803ceb92f92fa5f8fc0b (diff) | |
| download | external_webkit-3818681c85a025afd8aa203937b66d7c01ac1a8b.zip external_webkit-3818681c85a025afd8aa203937b66d7c01ac1a8b.tar.gz external_webkit-3818681c85a025afd8aa203937b66d7c01ac1a8b.tar.bz2 | |
Cherry-pick WebKit change r88472 to fix a rendering crash
See http://trac.webkit.org/changeset/88472
Bug: 6293530
Change-Id: I10bf2dfc6354d4e074a131e937aad04e0e6ca353
Diffstat (limited to 'Source/WebCore/css')
| -rw-r--r-- | Source/WebCore/css/CSSStyleSelector.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/WebCore/css/CSSStyleSelector.cpp b/Source/WebCore/css/CSSStyleSelector.cpp index 2424349..d81cc9d 100644 --- a/Source/WebCore/css/CSSStyleSelector.cpp +++ b/Source/WebCore/css/CSSStyleSelector.cpp @@ -1285,8 +1285,11 @@ PassRefPtr<RenderStyle> CSSStyleSelector::styleForElement(Element* e, RenderStyl if (m_parentStyle) m_style->inheritFrom(m_parentStyle); - else + else { m_parentStyle = style(); + // Make sure our fonts are initialized if we don't inherit them from our parent style. + m_style->font().update(0); + } if (e->isLink()) { m_style->setIsLink(true); |