Title: [161750] trunk/Source/WebCore
- Revision
- 161750
- Author
- [email protected]
- Date
- 2014-01-10 23:27:38 -0800 (Fri, 10 Jan 2014)
Log Message
[iOS] Fix COMPILE_ASSERT by updating struct SameSizeAsStyleRareInheritedData
* rendering/style/StyleRareInheritedData.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (161749 => 161750)
--- trunk/Source/WebCore/ChangeLog 2014-01-11 07:05:31 UTC (rev 161749)
+++ trunk/Source/WebCore/ChangeLog 2014-01-11 07:27:38 UTC (rev 161750)
@@ -1,5 +1,11 @@
2014-01-10 David Kilzer <[email protected]>
+ [iOS] Fix COMPILE_ASSERT by updating struct SameSizeAsStyleRareInheritedData
+
+ * rendering/style/StyleRareInheritedData.cpp:
+
+2014-01-10 David Kilzer <[email protected]>
+
[iOS] Fix build of SubframeLoader.cpp
* loader/SubframeLoader.cpp:
Modified: trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp (161749 => 161750)
--- trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp 2014-01-11 07:05:31 UTC (rev 161749)
+++ trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp 2014-01-11 07:27:38 UTC (rev 161750)
@@ -49,6 +49,9 @@
unsigned unsigneds[1];
short hyphenationShorts[3];
+#if PLATFORM(IOS)
+ Color compositionColor;
+#endif
#if ENABLE(IOS_TEXT_AUTOSIZING)
TextSizeAdjustment textSizeAdjust;
#endif
@@ -58,7 +61,7 @@
#endif
#if ENABLE(TOUCH_EVENTS)
- Color touchColors;
+ Color tapHighlightColor;
#endif
};
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
