From 7b74202eae50facdaecac521fdb210fa565a6333 Mon Sep 17 00:00:00 2001
From: Patrick Scott <phanna@android.com>
Date: Tue, 12 May 2009 13:27:25 -0400
Subject: Fix a warning with an Android edit.

---
 WebCore/rendering/style/StyleRareInheritedData.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'WebCore/rendering/style')

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)
 {
-- 
cgit v1.1