Title: [161710] trunk/Source/WebCore
- Revision
- 161710
- Author
- [email protected]
- Date
- 2014-01-10 17:59:21 -0800 (Fri, 10 Jan 2014)
Log Message
iOS build fix: add StyleRareInheritedData::compositionFillColor
* rendering/style/RenderStyle.h:
* rendering/style/StyleRareInheritedData.cpp:
(WebCore::StyleRareInheritedData::StyleRareInheritedData):
(WebCore::StyleRareInheritedData::operator==):
* rendering/style/StyleRareInheritedData.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (161709 => 161710)
--- trunk/Source/WebCore/ChangeLog 2014-01-11 01:50:32 UTC (rev 161709)
+++ trunk/Source/WebCore/ChangeLog 2014-01-11 01:59:21 UTC (rev 161710)
@@ -1,3 +1,13 @@
+2014-01-10 Simon Fraser <[email protected]>
+
+ iOS build fix: add StyleRareInheritedData::compositionFillColor
+
+ * rendering/style/RenderStyle.h:
+ * rendering/style/StyleRareInheritedData.cpp:
+ (WebCore::StyleRareInheritedData::StyleRareInheritedData):
+ (WebCore::StyleRareInheritedData::operator==):
+ * rendering/style/StyleRareInheritedData.h:
+
2014-01-10 Joseph Pecoraro <[email protected]>
Fix MonthInputType.o for iOS. Unreviewed build fix.
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (161709 => 161710)
--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2014-01-11 01:50:32 UTC (rev 161709)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2014-01-11 01:59:21 UTC (rev 161710)
@@ -937,6 +937,7 @@
#endif
#if PLATFORM(IOS)
bool touchCalloutEnabled() const { return rareInheritedData->touchCalloutEnabled; }
+ Color compositionFillColor() const { return rareInheritedData->compositionFillColor; }
#endif
#if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
bool useTouchOverflowScrolling() const { return rareInheritedData->useTouchOverflowScrolling; }
@@ -1821,6 +1822,7 @@
#endif
#if PLATFORM(IOS)
static bool initialTouchCalloutEnabled() { return true; }
+ static Color initialCompositionFillColor() { return Color::compositionFill; }
#endif
#if ENABLE(TOUCH_EVENTS)
static Color initialTapHighlightColor();
Modified: trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp (161709 => 161710)
--- trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp 2014-01-11 01:50:32 UTC (rev 161709)
+++ trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp 2014-01-11 01:59:21 UTC (rev 161710)
@@ -123,6 +123,9 @@
, hyphenationLimitLines(-1)
, m_lineGrid(RenderStyle::initialLineGrid())
, m_tabSize(RenderStyle::initialTabSize())
+#if PLATFORM(IOS)
+ , compositionFillColor(RenderStyle::initialCompositionFillColor())
+#endif
#if ENABLE(IOS_TEXT_AUTOSIZING)
, textSizeAdjust(RenderStyle::initialTextSizeAdjust())
#endif
@@ -207,6 +210,9 @@
, textEmphasisCustomMark(o.textEmphasisCustomMark)
, m_lineGrid(o.m_lineGrid)
, m_tabSize(o.m_tabSize)
+#if PLATFORM(IOS)
+ , compositionFillColor(o.compositionFillColor)
+#endif
#if ENABLE(IOS_TEXT_AUTOSIZING)
, textSizeAdjust(o.textSizeAdjust)
#endif
@@ -298,6 +304,7 @@
&& m_lineBoxContain == o.m_lineBoxContain
#if PLATFORM(IOS)
&& touchCalloutEnabled == o.touchCalloutEnabled
+ && compositionFillColor == o.compositionFillColor
#endif
&& hyphenationString == o.hyphenationString
&& locale == o.locale
Modified: trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h (161709 => 161710)
--- trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h 2014-01-11 01:50:32 UTC (rev 161709)
+++ trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h 2014-01-11 01:59:21 UTC (rev 161710)
@@ -145,6 +145,9 @@
AtomicString m_lineGrid;
unsigned m_tabSize;
+#if PLATFORM(IOS)
+ Color compositionFillColor;
+#endif
#if ENABLE(IOS_TEXT_AUTOSIZING)
TextSizeAdjustment textSizeAdjust;
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
