Diff
Modified: trunk/Source/WebCore/ChangeLog (173498 => 173499)
--- 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)
@@ -1,3 +1,30 @@
+2014-09-10 Enrica Casucci <[email protected]>
+
+ 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:
+
2014-09-10 Tim Horton <[email protected]>
Remove ImageSource::ShouldSkipMetadata
Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (173498 => 173499)
--- 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)
@@ -350,10 +350,6 @@
CSSPropertyWebkitRtlOrdering,
#if PLATFORM(IOS)
CSSPropertyWebkitTouchCallout,
-
- // 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,
#endif
#if ENABLE(CSS_SHAPES)
CSSPropertyWebkitShapeOutside,
@@ -2718,12 +2714,6 @@
}
case CSSPropertyWebkitRtlOrdering:
return cssValuePool().createIdentifierValue(style->rtlOrdering() ? CSSValueVisual : CSSValueLogical);
-#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
#if ENABLE(TOUCH_EVENTS)
case CSSPropertyWebkitTapHighlightColor:
return currentColorOrValidColor(style.get(), style->tapHighlightColor());
Modified: trunk/Source/WebCore/css/CSSParser.cpp (173498 => 173499)
--- 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)
@@ -2778,19 +2778,6 @@
#endif
#if PLATFORM(IOS)
- // 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;
case CSSPropertyWebkitTouchCallout:
if (id == CSSValueDefault || id == CSSValueNone)
validPrimitive = true;
Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (173498 => 173499)
--- 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)
@@ -468,8 +468,4 @@
#endif
#if defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS
-webkit-touch-callout [Inherited]
-
-// 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]
#endif
Modified: trunk/Source/WebCore/css/StyleResolver.cpp (173498 => 173499)
--- 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)
@@ -2548,17 +2548,6 @@
state.style()->setTouchCalloutEnabled(primitiveValue->getStringValue().lower() != "none");
return;
}
-
- // 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;
- }
#endif
#if ENABLE(TOUCH_EVENTS)
case CSSPropertyWebkitTapHighlightColor: {
Modified: trunk/Source/WebCore/editing/EditingStyle.cpp (173498 => 173499)
--- 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)
@@ -74,11 +74,6 @@
#if ENABLE(TOUCH_EVENTS)
CSSPropertyWebkitTapHighlightColor,
#endif
-#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
CSSPropertyWebkitTextDecorationsInEffect,
CSSPropertyWebkitTextFillColor,
#if ENABLE(IOS_TEXT_AUTOSIZING)
Modified: trunk/Source/WebCore/platform/graphics/Color.h (173498 => 173499)
--- 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)
@@ -153,9 +153,9 @@
static const RGBA32 cyan = 0xFF00FFFF;
#if PLATFORM(IOS)
- // 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>.
static const RGBA32 compositionFill = 0x3CAFC0E3;
+#else
+ static const RGBA32 compositionFill = 0xFFE1DD55;
#endif
private:
Modified: trunk/Source/WebCore/rendering/InlineTextBox.cpp (173498 => 173499)
--- 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)
@@ -774,22 +774,14 @@
return;
GraphicsContextStateSaver stateSaver(*context);
+ Color compositionColor = Color::compositionFill;
+ updateGraphicsContext(*context, TextPaintStyle(compositionColor, style.colorSpace())); // Don't draw text at all!
-#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!
-
LayoutUnit deltaY = renderer().style().isFlippedLinesWritingMode() ? selectionBottom() - logicalBottom() : logicalTop() - selectionTop();
LayoutRect selectionRect = LayoutRect(boxOrigin.x(), boxOrigin.y() - deltaY, 0, selectionHeight());
TextRun textRun = constructTextRun(style, font);
font.adjustSelectionRectForText(textRun, selectionRect, sPos, ePos);
- context->fillRect(snapRectToDevicePixelsWithWritingDirection(selectionRect, renderer().document().deviceScaleFactor(), textRun.ltr()), c, style.colorSpace());
+ context->fillRect(snapRectToDevicePixelsWithWritingDirection(selectionRect, renderer().document().deviceScaleFactor(), textRun.ltr()), compositionColor, style.colorSpace());
}
static StrokeStyle textDecorationStyleToStrokeStyle(TextDecorationStyle decorationStyle)
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (173498 => 173499)
--- 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)
@@ -1097,7 +1097,6 @@
#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; }
@@ -1625,7 +1624,6 @@
#endif
#if PLATFORM(IOS)
void setTouchCalloutEnabled(bool v) { SET_VAR(rareInheritedData, touchCalloutEnabled, v); }
- void setCompositionFillColor(const Color &c) { SET_VAR(rareInheritedData, compositionFillColor, c); }
#endif
#if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
void setUseTouchOverflowScrolling(bool v) { SET_VAR(rareInheritedData, useTouchOverflowScrolling, v); }
@@ -1983,7 +1981,6 @@
#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 (173498 => 173499)
--- 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)
@@ -121,9 +121,6 @@
, 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
@@ -205,9 +202,6 @@
, 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,7 +292,6 @@
&& 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 (173498 => 173499)
--- 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)
@@ -142,9 +142,6 @@
AtomicString m_lineGrid;
unsigned m_tabSize;
-#if PLATFORM(IOS)
- Color compositionFillColor;
-#endif
#if ENABLE(IOS_TEXT_AUTOSIZING)
TextSizeAdjustment textSizeAdjust;
#endif
