[iOS] Fix COMPILE_ASSERT by updating struct SameSizeAsStyleRareInheritedData
authorddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 11 Jan 2014 07:27:38 +0000 (07:27 +0000)
committerddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 11 Jan 2014 07:27:38 +0000 (07:27 +0000)
* rendering/style/StyleRareInheritedData.cpp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@161750 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/rendering/style/StyleRareInheritedData.cpp

index 9631759..f603a43 100644 (file)
@@ -1,5 +1,11 @@
 2014-01-10  David Kilzer  <ddkilzer@apple.com>
 
+        [iOS] Fix COMPILE_ASSERT by updating struct SameSizeAsStyleRareInheritedData
+
+        * rendering/style/StyleRareInheritedData.cpp:
+
+2014-01-10  David Kilzer  <ddkilzer@apple.com>
+
         [iOS] Fix build of SubframeLoader.cpp
 
         * loader/SubframeLoader.cpp:
index 44eb6c5..28b99b3 100644 (file)
@@ -49,6 +49,9 @@ struct SameSizeAsStyleRareInheritedData : public RefCounted<SameSizeAsStyleRareI
     unsigned unsigneds[1];
     short hyphenationShorts[3];
 
+#if PLATFORM(IOS)
+    Color compositionColor;
+#endif
 #if ENABLE(IOS_TEXT_AUTOSIZING)
     TextSizeAdjustment textSizeAdjust;
 #endif
@@ -58,7 +61,7 @@ struct SameSizeAsStyleRareInheritedData : public RefCounted<SameSizeAsStyleRareI
 #endif
 
 #if ENABLE(TOUCH_EVENTS)
-    Color touchColors;
+    Color tapHighlightColor;
 #endif
 };