<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[173499] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/173499">173499</a></dd>
<dt>Author</dt> <dd>enrica@apple.com</dd>
<dt>Date</dt> <dd>2014-09-10 17:25:39 -0700 (Wed, 10 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove iOS-only -webkit-composition-fill-color CSS property.
https://bugs.webkit.org/show_bug.cgi?id=136728
rdar://problem/10439154
Reviewed by Tim Horton.
This property is no longer used on iOS.
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::ComputedStyleExtractor::propertyValue):
* css/CSSParser.cpp:
(WebCore::CSSParser::parseValue):
* css/CSSPropertyNames.in:
* css/StyleResolver.cpp:
(WebCore::StyleResolver::applyProperty):
* editing/EditingStyle.cpp:
* platform/graphics/Color.h:
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintCompositionBackground):
* rendering/style/RenderStyle.h:
* rendering/style/StyleRareInheritedData.cpp:
(WebCore::StyleRareInheritedData::StyleRareInheritedData):
(WebCore::StyleRareInheritedData::operator==):
* rendering/style/StyleRareInheritedData.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSComputedStyleDeclarationcpp">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSPropertyNamesin">trunk/Source/WebCore/css/CSSPropertyNames.in</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingEditingStylecpp">trunk/Source/WebCore/editing/EditingStyle.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsColorh">trunk/Source/WebCore/platform/graphics/Color.h</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineTextBoxcpp">trunk/Source/WebCore/rendering/InlineTextBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleh">trunk/Source/WebCore/rendering/style/RenderStyle.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleRareInheritedDatacpp">trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleRareInheritedDatah">trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173498 => 173499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-11 00:01:47 UTC (rev 173498)
+++ trunk/Source/WebCore/ChangeLog 2014-09-11 00:25:39 UTC (rev 173499)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-09-10 Enrica Casucci <enrica@apple.com>
+
+ Remove iOS-only -webkit-composition-fill-color CSS property.
+ https://bugs.webkit.org/show_bug.cgi?id=136728
+ rdar://problem/10439154
+
+ Reviewed by Tim Horton.
+
+ This property is no longer used on iOS.
+
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::ComputedStyleExtractor::propertyValue):
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseValue):
+ * css/CSSPropertyNames.in:
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::applyProperty):
+ * editing/EditingStyle.cpp:
+ * platform/graphics/Color.h:
+ * rendering/InlineTextBox.cpp:
+ (WebCore::InlineTextBox::paintCompositionBackground):
+ * rendering/style/RenderStyle.h:
+ * rendering/style/StyleRareInheritedData.cpp:
+ (WebCore::StyleRareInheritedData::StyleRareInheritedData):
+ (WebCore::StyleRareInheritedData::operator==):
+ * rendering/style/StyleRareInheritedData.h:
+
</ins><span class="cx"> 2014-09-10 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove ImageSource::ShouldSkipMetadata
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (173498 => 173499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-09-11 00:01:47 UTC (rev 173498)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-09-11 00:25:39 UTC (rev 173499)
</span><span class="lines">@@ -350,10 +350,6 @@
</span><span class="cx"> CSSPropertyWebkitRtlOrdering,
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> CSSPropertyWebkitTouchCallout,
</span><del>-
- // FIXME: This property shouldn't be iOS-specific. Once we fix up its usage in InlineTextBox::paintCompositionBackground()
- // we should move it outside the PLATFORM(IOS)-guard. See <https://bugs.webkit.org/show_bug.cgi?id=126296>.
- CSSPropertyWebkitCompositionFillColor,
</del><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><span class="cx"> CSSPropertyWebkitShapeOutside,
</span><span class="lines">@@ -2718,12 +2714,6 @@
</span><span class="cx"> }
</span><span class="cx"> case CSSPropertyWebkitRtlOrdering:
</span><span class="cx"> return cssValuePool().createIdentifierValue(style->rtlOrdering() ? CSSValueVisual : CSSValueLogical);
</span><del>-#if PLATFORM(IOS)
- // FIXME: This property shouldn't be iOS-specific. Once we fix up its usage in InlineTextBox::paintCompositionBackground()
- // we should remove the PLATFORM(IOS)-guard. See <https://bugs.webkit.org/show_bug.cgi?id=126296>.
- case CSSPropertyWebkitCompositionFillColor:
- return currentColorOrValidColor(style.get(), style->compositionFillColor());
-#endif
</del><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx"> case CSSPropertyWebkitTapHighlightColor:
</span><span class="cx"> return currentColorOrValidColor(style.get(), style->tapHighlightColor());
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (173498 => 173499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2014-09-11 00:01:47 UTC (rev 173498)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2014-09-11 00:25:39 UTC (rev 173499)
</span><span class="lines">@@ -2778,19 +2778,6 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- // FIXME: CSSPropertyWebkitCompositionFillColor shouldn't be iOS-specific. Once we fix up its usage in
- // InlineTextBox::paintCompositionBackground() we should move it outside the PLATFORM(IOS)-guard.
- // See <https://bugs.webkit.org/show_bug.cgi?id=126296>.
- case CSSPropertyWebkitCompositionFillColor:
- if ((id >= CSSValueAqua && id <= CSSValueWindowtext) || id == CSSValueMenu
- || (id >= CSSValueWebkitFocusRingColor && id < CSSValueWebkitText && inQuirksMode())) {
- validPrimitive = true;
- } else {
- parsedValue = parseColor();
- if (parsedValue)
- m_valueList->next();
- }
- break;
</del><span class="cx"> case CSSPropertyWebkitTouchCallout:
</span><span class="cx"> if (id == CSSValueDefault || id == CSSValueNone)
</span><span class="cx"> validPrimitive = true;
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (173498 => 173499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPropertyNames.in 2014-09-11 00:01:47 UTC (rev 173498)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2014-09-11 00:25:39 UTC (rev 173499)
</span><span class="lines">@@ -468,8 +468,4 @@
</span><span class="cx"> #endif
</span><span class="cx"> #if defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS
</span><span class="cx"> -webkit-touch-callout [Inherited]
</span><del>-
-// FIXME: This property shouldn't be iOS-specific. Once we fix up its usage in InlineTextBox::paintCompositionBackground()
-// we should move it outside the WTF_PLATFORM_IOS-guard.
--webkit-composition-fill-color [Inherited]
</del><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (173498 => 173499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2014-09-11 00:01:47 UTC (rev 173498)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2014-09-11 00:25:39 UTC (rev 173499)
</span><span class="lines">@@ -2548,17 +2548,6 @@
</span><span class="cx"> state.style()->setTouchCalloutEnabled(primitiveValue->getStringValue().lower() != "none");
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>-
- // FIXME: CSSPropertyWebkitCompositionFillColor shouldn't be iOS-specific. Once we fix up its usage in
- // InlineTextBox::paintCompositionBackground() we should move it outside the PLATFORM(IOS)-guard.
- // See <https://bugs.webkit.org/show_bug.cgi?id=126296>.
- case CSSPropertyWebkitCompositionFillColor: {
- HANDLE_INHERIT_AND_INITIAL(compositionFillColor, CompositionFillColor);
- if (!primitiveValue)
- break;
- state.style()->setCompositionFillColor(colorFromPrimitiveValue(primitiveValue));
- return;
- }
</del><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx"> case CSSPropertyWebkitTapHighlightColor: {
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditingStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/EditingStyle.cpp (173498 => 173499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/EditingStyle.cpp 2014-09-11 00:01:47 UTC (rev 173498)
+++ trunk/Source/WebCore/editing/EditingStyle.cpp 2014-09-11 00:25:39 UTC (rev 173499)
</span><span class="lines">@@ -74,11 +74,6 @@
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx"> CSSPropertyWebkitTapHighlightColor,
</span><span class="cx"> #endif
</span><del>-#if PLATFORM(IOS)
- // FIXME: CSSPropertyWebkitCompositionFillColor shouldn't be iOS-specific. Once we fix up its usage in InlineTextBox::paintCompositionBackground()
- // we should remove the PLATFORM(IOS)-guard. See <https://bugs.webkit.org/show_bug.cgi?id=126296>.
- CSSPropertyWebkitCompositionFillColor,
-#endif
</del><span class="cx"> CSSPropertyWebkitTextDecorationsInEffect,
</span><span class="cx"> CSSPropertyWebkitTextFillColor,
</span><span class="cx"> #if ENABLE(IOS_TEXT_AUTOSIZING)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsColorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Color.h (173498 => 173499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Color.h 2014-09-11 00:01:47 UTC (rev 173498)
+++ trunk/Source/WebCore/platform/graphics/Color.h 2014-09-11 00:25:39 UTC (rev 173499)
</span><span class="lines">@@ -153,9 +153,9 @@
</span><span class="cx"> static const RGBA32 cyan = 0xFF00FFFF;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- // FIXME: This color shouldn't be iOS-specific. Once we fix up its usage in InlineTextBox::paintCompositionBackground()
- // we should move it outside the PLATFORM(IOS)-guard. See <https://bugs.webkit.org/show_bug.cgi?id=126296>.
</del><span class="cx"> static const RGBA32 compositionFill = 0x3CAFC0E3;
</span><ins>+#else
+ static const RGBA32 compositionFill = 0xFFE1DD55;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineTextBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineTextBox.cpp (173498 => 173499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineTextBox.cpp 2014-09-11 00:01:47 UTC (rev 173498)
+++ trunk/Source/WebCore/rendering/InlineTextBox.cpp 2014-09-11 00:25:39 UTC (rev 173499)
</span><span class="lines">@@ -774,22 +774,14 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> GraphicsContextStateSaver stateSaver(*context);
</span><ins>+ Color compositionColor = Color::compositionFill;
+ updateGraphicsContext(*context, TextPaintStyle(compositionColor, style.colorSpace())); // Don't draw text at all!
</ins><span class="cx">
</span><del>-#if !PLATFORM(IOS)
- // FIXME: Is this color still applicable as of Mavericks? for non-Mac ports? We should
- // be able to move this color information to RenderStyle.
- Color c = Color(225, 221, 85);
-#else
- Color c = style.compositionFillColor();
-#endif
-
- updateGraphicsContext(*context, TextPaintStyle(c, style.colorSpace())); // Don't draw text at all!
-
</del><span class="cx"> LayoutUnit deltaY = renderer().style().isFlippedLinesWritingMode() ? selectionBottom() - logicalBottom() : logicalTop() - selectionTop();
</span><span class="cx"> LayoutRect selectionRect = LayoutRect(boxOrigin.x(), boxOrigin.y() - deltaY, 0, selectionHeight());
</span><span class="cx"> TextRun textRun = constructTextRun(style, font);
</span><span class="cx"> font.adjustSelectionRectForText(textRun, selectionRect, sPos, ePos);
</span><del>- context->fillRect(snapRectToDevicePixelsWithWritingDirection(selectionRect, renderer().document().deviceScaleFactor(), textRun.ltr()), c, style.colorSpace());
</del><ins>+ context->fillRect(snapRectToDevicePixelsWithWritingDirection(selectionRect, renderer().document().deviceScaleFactor(), textRun.ltr()), compositionColor, style.colorSpace());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static StrokeStyle textDecorationStyleToStrokeStyle(TextDecorationStyle decorationStyle)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (173498 => 173499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2014-09-11 00:01:47 UTC (rev 173498)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2014-09-11 00:25:39 UTC (rev 173499)
</span><span class="lines">@@ -1097,7 +1097,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> bool touchCalloutEnabled() const { return rareInheritedData->touchCalloutEnabled; }
</span><del>- Color compositionFillColor() const { return rareInheritedData->compositionFillColor; }
</del><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
</span><span class="cx"> bool useTouchOverflowScrolling() const { return rareInheritedData->useTouchOverflowScrolling; }
</span><span class="lines">@@ -1625,7 +1624,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> void setTouchCalloutEnabled(bool v) { SET_VAR(rareInheritedData, touchCalloutEnabled, v); }
</span><del>- void setCompositionFillColor(const Color &c) { SET_VAR(rareInheritedData, compositionFillColor, c); }
</del><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
</span><span class="cx"> void setUseTouchOverflowScrolling(bool v) { SET_VAR(rareInheritedData, useTouchOverflowScrolling, v); }
</span><span class="lines">@@ -1983,7 +1981,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> static bool initialTouchCalloutEnabled() { return true; }
</span><del>- static Color initialCompositionFillColor() { return Color::compositionFill; }
</del><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx"> static Color initialTapHighlightColor();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleRareInheritedDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp (173498 => 173499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp 2014-09-11 00:01:47 UTC (rev 173498)
+++ trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp 2014-09-11 00:25:39 UTC (rev 173499)
</span><span class="lines">@@ -121,9 +121,6 @@
</span><span class="cx"> , hyphenationLimitLines(-1)
</span><span class="cx"> , m_lineGrid(RenderStyle::initialLineGrid())
</span><span class="cx"> , m_tabSize(RenderStyle::initialTabSize())
</span><del>-#if PLATFORM(IOS)
- , compositionFillColor(RenderStyle::initialCompositionFillColor())
-#endif
</del><span class="cx"> #if ENABLE(IOS_TEXT_AUTOSIZING)
</span><span class="cx"> , textSizeAdjust(RenderStyle::initialTextSizeAdjust())
</span><span class="cx"> #endif
</span><span class="lines">@@ -205,9 +202,6 @@
</span><span class="cx"> , textEmphasisCustomMark(o.textEmphasisCustomMark)
</span><span class="cx"> , m_lineGrid(o.m_lineGrid)
</span><span class="cx"> , m_tabSize(o.m_tabSize)
</span><del>-#if PLATFORM(IOS)
- , compositionFillColor(o.compositionFillColor)
-#endif
</del><span class="cx"> #if ENABLE(IOS_TEXT_AUTOSIZING)
</span><span class="cx"> , textSizeAdjust(o.textSizeAdjust)
</span><span class="cx"> #endif
</span><span class="lines">@@ -298,7 +292,6 @@
</span><span class="cx"> && m_lineBoxContain == o.m_lineBoxContain
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> && touchCalloutEnabled == o.touchCalloutEnabled
</span><del>- && compositionFillColor == o.compositionFillColor
</del><span class="cx"> #endif
</span><span class="cx"> && hyphenationString == o.hyphenationString
</span><span class="cx"> && locale == o.locale
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleRareInheritedDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h (173498 => 173499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h 2014-09-11 00:01:47 UTC (rev 173498)
+++ trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h 2014-09-11 00:25:39 UTC (rev 173499)
</span><span class="lines">@@ -142,9 +142,6 @@
</span><span class="cx"> AtomicString m_lineGrid;
</span><span class="cx"> unsigned m_tabSize;
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
- Color compositionFillColor;
-#endif
</del><span class="cx"> #if ENABLE(IOS_TEXT_AUTOSIZING)
</span><span class="cx"> TextSizeAdjustment textSizeAdjust;
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>