diff options
| author | Patrick Scott <phanna@android.com> | 2009-05-12 13:27:25 -0400 |
|---|---|---|
| committer | Patrick Scott <phanna@android.com> | 2009-05-12 14:58:59 -0400 |
| commit | 7b74202eae50facdaecac521fdb210fa565a6333 (patch) | |
| tree | 67a3d0acc77daedccfb4c98972991a75380da71c /WebCore/rendering/style | |
| parent | 25a7d395967c696536aa55f62677c813735354f7 (diff) | |
| download | external_webkit-7b74202eae50facdaecac521fdb210fa565a6333.zip external_webkit-7b74202eae50facdaecac521fdb210fa565a6333.tar.gz external_webkit-7b74202eae50facdaecac521fdb210fa565a6333.tar.bz2 | |
Fix a warning with an Android edit.
Diffstat (limited to 'WebCore/rendering/style')
| -rw-r--r-- | WebCore/rendering/style/StyleRareInheritedData.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/WebCore/rendering/style/StyleRareInheritedData.cpp b/WebCore/rendering/style/StyleRareInheritedData.cpp index f26baa6..680fd57 100644 --- a/WebCore/rendering/style/StyleRareInheritedData.cpp +++ b/WebCore/rendering/style/StyleRareInheritedData.cpp @@ -29,6 +29,9 @@ namespace WebCore { StyleRareInheritedData::StyleRareInheritedData() : textStrokeWidth(RenderStyle::initialTextStrokeWidth()) +#ifdef ANDROID_CSS_TAP_HIGHLIGHT_COLOR + , tapHighlightColor(RenderStyle::initialTapHighlightColor()) +#endif , textShadow(0) , textSecurity(RenderStyle::initialTextSecurity()) , userModify(READ_ONLY) @@ -37,9 +40,6 @@ StyleRareInheritedData::StyleRareInheritedData() , nbspMode(NBNORMAL) , khtmlLineBreak(LBNORMAL) , textSizeAdjust(RenderStyle::initialTextSizeAdjust()) -#ifdef ANDROID_CSS_TAP_HIGHLIGHT_COLOR - , tapHighlightColor(RenderStyle::initialTapHighlightColor()) -#endif , resize(RenderStyle::initialResize()) , userSelect(RenderStyle::initialUserSelect()) { @@ -50,6 +50,9 @@ StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o) , textStrokeColor(o.textStrokeColor) , textStrokeWidth(o.textStrokeWidth) , textFillColor(o.textFillColor) +#ifdef ANDROID_CSS_TAP_HIGHLIGHT_COLOR + , tapHighlightColor(o.tapHighlightColor) +#endif , textShadow(o.textShadow ? new ShadowData(*o.textShadow) : 0) , highlight(o.highlight) , textSecurity(o.textSecurity) @@ -59,9 +62,6 @@ StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o) , nbspMode(o.nbspMode) , khtmlLineBreak(o.khtmlLineBreak) , textSizeAdjust(o.textSizeAdjust) -#ifdef ANDROID_CSS_TAP_HIGHLIGHT_COLOR - , tapHighlightColor(o.tapHighlightColor) -#endif , resize(o.resize) , userSelect(o.userSelect) { |