diff options
| author | Steve Block <steveblock@google.com> | 2012-04-12 18:27:03 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2012-04-12 18:44:17 +0100 |
| commit | e2b458f91171bbf19531e243652a88cfa8539658 (patch) | |
| tree | a52f936e578d585dadb965f2a5da642013a49d6c /Source | |
| parent | b52229f8ad5e8b3632305005e437104c11eba942 (diff) | |
| download | external_webkit-e2b458f91171bbf19531e243652a88cfa8539658.zip external_webkit-e2b458f91171bbf19531e243652a88cfa8539658.tar.gz external_webkit-e2b458f91171bbf19531e243652a88cfa8539658.tar.bz2 | |
Cherry-pick WebKit change r106251 to fix a LayoutTest crash
fast/css/fontsize-unit-rems-crash.html
See http://trac.webkit.org/changeset/106251
Bug: 6329315
Change-Id: I2d4208a280f71dcd2d69f5d34fae9604680abb58
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/WebCore/css/CSSPrimitiveValue.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/WebCore/css/CSSPrimitiveValue.cpp b/Source/WebCore/css/CSSPrimitiveValue.cpp index 04f1089..237844e 100644 --- a/Source/WebCore/css/CSSPrimitiveValue.cpp +++ b/Source/WebCore/css/CSSPrimitiveValue.cpp @@ -316,7 +316,8 @@ double CSSPrimitiveValue::computeLengthDouble(RenderStyle* style, RenderStyle* r break; case CSS_REMS: applyZoomMultiplier = false; - factor = computingFontSize ? rootStyle->fontDescription().specifiedSize() : rootStyle->fontDescription().computedSize(); + if (rootStyle) + factor = computingFontSize ? rootStyle->fontDescription().specifiedSize() : rootStyle->fontDescription().computedSize(); break; case CSS_PX: break; |