diff options
| author | Steve Block <steveblock@google.com> | 2012-04-13 07:51:17 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-13 07:51:17 -0700 |
| commit | 6db940d5b0fdc1d28edd7851ed30885e5f7d0dc8 (patch) | |
| tree | f1eaeb3debe91de907f80e3864b2f49d65f73f17 /Source/WebCore/css/CSSPrimitiveValue.cpp | |
| parent | 3dad91f1d1975439d8c7972f0269dba2d236284c (diff) | |
| parent | 5eb142cf16d1349544dc19cfb780917d36fbf3b6 (diff) | |
| download | external_webkit-6db940d5b0fdc1d28edd7851ed30885e5f7d0dc8.zip external_webkit-6db940d5b0fdc1d28edd7851ed30885e5f7d0dc8.tar.gz external_webkit-6db940d5b0fdc1d28edd7851ed30885e5f7d0dc8.tar.bz2 | |
Merge changes Icc964ad0,Ib21562da,I87cfd2aa,I2d4208a2
* changes:
Cherry-pick WebKit change r107627 to fix a LayoutTest crash
Cherry-pick WebKit change r94541 as a prerequisite for r107627
Cherry-pick WebKit change r88854 as a prerequisite for r107627
Cherry-pick WebKit change r106251 to fix a LayoutTest crash
Diffstat (limited to 'Source/WebCore/css/CSSPrimitiveValue.cpp')
| -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; |