Diff
Modified: trunk/LayoutTests/ChangeLog (120734 => 120735)
--- trunk/LayoutTests/ChangeLog 2012-06-19 17:57:24 UTC (rev 120734)
+++ trunk/LayoutTests/ChangeLog 2012-06-19 17:59:44 UTC (rev 120735)
@@ -1,3 +1,23 @@
+2012-06-19 Andreas Kling <[email protected]>
+
+ Remove the -webkit-match-nearest-mail-blockquote-color property.
+ <http://webkit.org/b/89480>
+
+ Reviewed by Antti Koivisto.
+
+ * fast/css/getComputedStyle/resources/property-names.js:
+ * fast/dom/CSSStyleDeclaration/access-longest-css-property-expected.txt:
+ * fast/dom/CSSStyleDeclaration/access-longest-css-property.html:
+ * platform/chromium-mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
+ * platform/chromium-win/fast/css/getComputedStyle/computed-style-expected.txt:
+ * platform/chromium-win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
+ * platform/gtk/fast/css/getComputedStyle/computed-style-expected.txt:
+ * platform/mac/fast/css/getComputedStyle/computed-style-expected.txt:
+ * platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
+ * platform/qt/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
+ * platform/win/fast/css/getComputedStyle/computed-style-expected.txt:
+ * platform/win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
+
2012-06-19 Abhishek Arya <[email protected]>
Crash in WebCore::RenderSVGModelObject::checkIntersection
Modified: trunk/LayoutTests/fast/css/getComputedStyle/resources/property-names.js (120734 => 120735)
--- trunk/LayoutTests/fast/css/getComputedStyle/resources/property-names.js 2012-06-19 17:57:24 UTC (rev 120734)
+++ trunk/LayoutTests/fast/css/getComputedStyle/resources/property-names.js 2012-06-19 17:59:44 UTC (rev 120735)
@@ -24,6 +24,5 @@
"overflow",
"-webkit-mask-position-x",
"-webkit-mask-position-y",
- "-webkit-match-nearest-mail-blockquote-color",
"-webkit-text-size-adjust",
];
Modified: trunk/LayoutTests/fast/dom/CSSStyleDeclaration/access-longest-css-property-expected.txt (120734 => 120735)
--- trunk/LayoutTests/fast/dom/CSSStyleDeclaration/access-longest-css-property-expected.txt 2012-06-19 17:57:24 UTC (rev 120734)
+++ trunk/LayoutTests/fast/dom/CSSStyleDeclaration/access-longest-css-property-expected.txt 2012-06-19 17:59:44 UTC (rev 120735)
@@ -3,9 +3,9 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-PASS getComputedStyle(document.body).webkitMatchNearestMailBlockquoteColor is "match"
-PASS document.getElementById("target").style.webkitMatchNearestMailBlockquoteColor is "match"
-PASS document.body.style.webkitMatchNearestMailBlockquoteColor is ""
+PASS getComputedStyle(document.body).webkitBorderBottomRightRadius is "5px"
+PASS document.getElementById("target").style.webkitBorderBottomRightRadius is "5px"
+PASS document.body.style.webkitBorderBottomRightRadius is ""
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/fast/dom/CSSStyleDeclaration/access-longest-css-property.html (120734 => 120735)
--- trunk/LayoutTests/fast/dom/CSSStyleDeclaration/access-longest-css-property.html 2012-06-19 17:57:24 UTC (rev 120734)
+++ trunk/LayoutTests/fast/dom/CSSStyleDeclaration/access-longest-css-property.html 2012-06-19 17:59:44 UTC (rev 120735)
@@ -3,21 +3,21 @@
<script src=""
<style>
* {
--webkit-match-nearest-mail-blockquote-color: match;
+-webkit-border-bottom-right-radius: 5px;
}
</style>
</head>
<body>
-<div id="target" style="-webkit-match-nearest-mail-blockquote-color: match;"></div>
+<div id="target" style="-webkit-border-bottom-right-radius: 5px;;"></div>
<!--
Note for updating the test:
-Please replace '-webkit-match-nearest-mail-blockquote-color' by the longest name if '-webkit-match-nearest-mail-blockquote-color' is removed.
+Please replace '-webkit-border-bottom-right-radius' by the longest name if '-webkit-border-bottom-right-radius' is removed.
-->
<script>
description("The test parsing of the boundary value by checking the longest CSS property.");
-shouldBeEqualToString('getComputedStyle(document.body).webkitMatchNearestMailBlockquoteColor', 'match');
-shouldBeEqualToString('document.getElementById("target").style.webkitMatchNearestMailBlockquoteColor', 'match');
-shouldBeEqualToString('document.body.style.webkitMatchNearestMailBlockquoteColor', '');
+shouldBeEqualToString('getComputedStyle(document.body).webkitBorderBottomRightRadius', '5px');
+shouldBeEqualToString('document.getElementById("target").style.webkitBorderBottomRightRadius', '5px');
+shouldBeEqualToString('document.body.style.webkitBorderBottomRightRadius', '');
</script>
<script src=""
</body>
Modified: trunk/LayoutTests/platform/chromium-mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt (120734 => 120735)
--- trunk/LayoutTests/platform/chromium-mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2012-06-19 17:57:24 UTC (rev 120734)
+++ trunk/LayoutTests/platform/chromium-mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2012-06-19 17:59:44 UTC (rev 120735)
@@ -273,7 +273,6 @@
overflow: visible
-webkit-mask-position-x: 0%
-webkit-mask-position-y: 0%
- -webkit-match-nearest-mail-blockquote-color: normal
-webkit-text-size-adjust: auto
After changing grandparent's 'color' and the parent's 'font-size' inherited properties:
Modified: trunk/LayoutTests/platform/chromium-win/fast/css/getComputedStyle/computed-style-expected.txt (120734 => 120735)
--- trunk/LayoutTests/platform/chromium-win/fast/css/getComputedStyle/computed-style-expected.txt 2012-06-19 17:57:24 UTC (rev 120734)
+++ trunk/LayoutTests/platform/chromium-win/fast/css/getComputedStyle/computed-style-expected.txt 2012-06-19 17:59:44 UTC (rev 120735)
@@ -277,6 +277,5 @@
overflow: visible;
-webkit-mask-position-x: 0%;
-webkit-mask-position-y: 0%;
--webkit-match-nearest-mail-blockquote-color: normal;
-webkit-text-size-adjust: auto;
Modified: trunk/LayoutTests/platform/chromium-win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt (120734 => 120735)
--- trunk/LayoutTests/platform/chromium-win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2012-06-19 17:57:24 UTC (rev 120734)
+++ trunk/LayoutTests/platform/chromium-win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2012-06-19 17:59:44 UTC (rev 120735)
@@ -273,7 +273,6 @@
overflow: visible
-webkit-mask-position-x: 0%
-webkit-mask-position-y: 0%
- -webkit-match-nearest-mail-blockquote-color: normal
-webkit-text-size-adjust: auto
After changing grandparent's 'color' and the parent's 'font-size' inherited properties:
Modified: trunk/LayoutTests/platform/gtk/fast/css/getComputedStyle/computed-style-expected.txt (120734 => 120735)
--- trunk/LayoutTests/platform/gtk/fast/css/getComputedStyle/computed-style-expected.txt 2012-06-19 17:57:24 UTC (rev 120734)
+++ trunk/LayoutTests/platform/gtk/fast/css/getComputedStyle/computed-style-expected.txt 2012-06-19 17:59:44 UTC (rev 120735)
@@ -276,6 +276,5 @@
overflow: visible;
-webkit-mask-position-x: 0%;
-webkit-mask-position-y: 0%;
--webkit-match-nearest-mail-blockquote-color: normal;
-webkit-text-size-adjust: auto;
Modified: trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-expected.txt (120734 => 120735)
--- trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-expected.txt 2012-06-19 17:57:24 UTC (rev 120734)
+++ trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-expected.txt 2012-06-19 17:59:44 UTC (rev 120735)
@@ -277,6 +277,5 @@
overflow: visible;
-webkit-mask-position-x: 0%;
-webkit-mask-position-y: 0%;
--webkit-match-nearest-mail-blockquote-color: normal;
-webkit-text-size-adjust: auto;
Modified: trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt (120734 => 120735)
--- trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2012-06-19 17:57:24 UTC (rev 120734)
+++ trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2012-06-19 17:59:44 UTC (rev 120735)
@@ -273,7 +273,6 @@
overflow: visible
-webkit-mask-position-x: 0%
-webkit-mask-position-y: 0%
- -webkit-match-nearest-mail-blockquote-color: normal
-webkit-text-size-adjust: auto
After changing grandparent's 'color' and the parent's 'font-size' inherited properties:
Modified: trunk/LayoutTests/platform/qt/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt (120734 => 120735)
--- trunk/LayoutTests/platform/qt/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2012-06-19 17:57:24 UTC (rev 120734)
+++ trunk/LayoutTests/platform/qt/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2012-06-19 17:59:44 UTC (rev 120735)
@@ -273,7 +273,6 @@
overflow: visible
-webkit-mask-position-x: 0%
-webkit-mask-position-y: 0%
- -webkit-match-nearest-mail-blockquote-color: normal
-webkit-text-size-adjust: auto
After changing grandparent's 'color' and the parent's 'font-size' inherited properties:
Modified: trunk/LayoutTests/platform/win/fast/css/getComputedStyle/computed-style-expected.txt (120734 => 120735)
--- trunk/LayoutTests/platform/win/fast/css/getComputedStyle/computed-style-expected.txt 2012-06-19 17:57:24 UTC (rev 120734)
+++ trunk/LayoutTests/platform/win/fast/css/getComputedStyle/computed-style-expected.txt 2012-06-19 17:59:44 UTC (rev 120735)
@@ -264,6 +264,5 @@
overflow: visible;
-webkit-mask-position-x: 0%;
-webkit-mask-position-y: 0%;
--webkit-match-nearest-mail-blockquote-color: normal;
-webkit-text-size-adjust: auto;
Modified: trunk/LayoutTests/platform/win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt (120734 => 120735)
--- trunk/LayoutTests/platform/win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2012-06-19 17:57:24 UTC (rev 120734)
+++ trunk/LayoutTests/platform/win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2012-06-19 17:59:44 UTC (rev 120735)
@@ -260,7 +260,6 @@
overflow: visible
-webkit-mask-position-x: 0%
-webkit-mask-position-y: 0%
- -webkit-match-nearest-mail-blockquote-color: normal
-webkit-text-size-adjust: auto
After changing grandparent's 'color' and the parent's 'font-size' inherited properties:
Modified: trunk/Source/WebCore/ChangeLog (120734 => 120735)
--- trunk/Source/WebCore/ChangeLog 2012-06-19 17:57:24 UTC (rev 120734)
+++ trunk/Source/WebCore/ChangeLog 2012-06-19 17:59:44 UTC (rev 120735)
@@ -1,3 +1,37 @@
+2012-06-19 Andreas Kling <[email protected]>
+
+ Remove the -webkit-match-nearest-mail-blockquote-color property.
+ <http://webkit.org/b/89480>
+
+ Reviewed by Antti Koivisto.
+
+ This property does nothing except taking up a bit on StyleRareNonInheritedData.
+ It's apparently famous for being the longest property name we support.
+ This passes the torch to -webkit-border-bottom-right-radius.
+
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
+ * css/CSSParser.cpp:
+ (WebCore::isValidKeywordPropertyAndValue):
+ (WebCore::isKeywordPropertyID):
+ (WebCore::CSSParser::parseValue):
+ * css/CSSPrimitiveValueMappings.h:
+ * css/CSSProperty.cpp:
+ (WebCore::CSSProperty::isInheritedProperty):
+ * css/CSSPropertyNames.in:
+ * css/CSSValueKeywords.in:
+ * css/StyleBuilder.cpp:
+ (WebCore::StyleBuilder::StyleBuilder):
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::collectMatchingRulesForList):
+ * rendering/style/RenderStyle.h:
+ * rendering/style/RenderStyleConstants.h:
+ * rendering/style/StyleRareNonInheritedData.cpp:
+ (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
+ (WebCore::StyleRareNonInheritedData::operator==):
+ * rendering/style/StyleRareNonInheritedData.h:
+ (StyleRareNonInheritedData):
+
2012-06-19 Andrew Lo <[email protected]>
[BlackBerry] Animations continue to request frames after they have finished
Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (120734 => 120735)
--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2012-06-19 17:57:24 UTC (rev 120734)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2012-06-19 17:59:44 UTC (rev 120735)
@@ -2029,8 +2029,6 @@
return cssValuePool().createValue(style->khtmlLineBreak());
case CSSPropertyWebkitNbspMode:
return cssValuePool().createValue(style->nbspMode());
- case CSSPropertyWebkitMatchNearestMailBlockquoteColor:
- return cssValuePool().createValue(style->matchNearestMailBlockquoteColor());
case CSSPropertyResize:
return cssValuePool().createValue(style->resize());
case CSSPropertyWebkitFontKerning:
Modified: trunk/Source/WebCore/css/CSSParser.cpp (120734 => 120735)
--- trunk/Source/WebCore/css/CSSParser.cpp 2012-06-19 17:57:24 UTC (rev 120734)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2012-06-19 17:59:44 UTC (rev 120735)
@@ -758,10 +758,6 @@
if (valueID == CSSValueNone || valueID == CSSValueSlide || valueID == CSSValueScroll || valueID == CSSValueAlternate)
return true;
break;
- case CSSPropertyWebkitMatchNearestMailBlockquoteColor: // normal | match
- if (valueID == CSSValueNormal || valueID == CSSValueMatch)
- return true;
- break;
case CSSPropertyWebkitNbspMode: // normal | space
if (valueID == CSSValueNormal || valueID == CSSValueSpace)
return true;
@@ -945,7 +941,6 @@
case CSSPropertyWebkitMarginTopCollapse:
case CSSPropertyWebkitMarqueeDirection:
case CSSPropertyWebkitMarqueeStyle:
- case CSSPropertyWebkitMatchNearestMailBlockquoteColor:
case CSSPropertyWebkitNbspMode:
#if ENABLE(OVERFLOW_SCROLLING)
case CSSPropertyWebkitOverflowScrolling:
@@ -2659,7 +2654,6 @@
case CSSPropertyWebkitMarginTopCollapse:
case CSSPropertyWebkitMarqueeDirection:
case CSSPropertyWebkitMarqueeStyle:
- case CSSPropertyWebkitMatchNearestMailBlockquoteColor:
case CSSPropertyWebkitNbspMode:
#if ENABLE(OVERFLOW_SCROLLING)
case CSSPropertyWebkitOverflowScrolling:
Modified: trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h (120734 => 120735)
--- trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2012-06-19 17:57:24 UTC (rev 120734)
+++ trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2012-06-19 17:59:44 UTC (rev 120735)
@@ -1904,33 +1904,6 @@
}
}
-template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EMatchNearestMailBlockquoteColor e)
- : CSSValue(PrimitiveClass)
-{
- m_primitiveUnitType = CSS_IDENT;
- switch (e) {
- case BCNORMAL:
- m_value.ident = CSSValueNormal;
- break;
- case MATCH:
- m_value.ident = CSSValueMatch;
- break;
- }
-}
-
-template<> inline CSSPrimitiveValue::operator EMatchNearestMailBlockquoteColor() const
-{
- switch (m_value.ident) {
- case CSSValueNormal:
- return BCNORMAL;
- case CSSValueMatch:
- return MATCH;
- default:
- ASSERT_NOT_REACHED();
- return BCNORMAL;
- }
-}
-
template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ENBSPMode e)
: CSSValue(PrimitiveClass)
{
Modified: trunk/Source/WebCore/css/CSSProperty.cpp (120734 => 120735)
--- trunk/Source/WebCore/css/CSSProperty.cpp 2012-06-19 17:57:24 UTC (rev 120734)
+++ trunk/Source/WebCore/css/CSSProperty.cpp 2012-06-19 17:59:44 UTC (rev 120735)
@@ -600,7 +600,6 @@
case CSSPropertyWebkitMaskRepeatX:
case CSSPropertyWebkitMaskRepeatY:
case CSSPropertyWebkitMaskSize:
- case CSSPropertyWebkitMatchNearestMailBlockquoteColor:
case CSSPropertyWebkitMaxLogicalWidth:
case CSSPropertyWebkitMaxLogicalHeight:
case CSSPropertyWebkitMinLogicalWidth:
Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (120734 => 120735)
--- trunk/Source/WebCore/css/CSSPropertyNames.in 2012-06-19 17:57:24 UTC (rev 120734)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2012-06-19 17:59:44 UTC (rev 120735)
@@ -327,7 +327,6 @@
-webkit-mask-repeat-x
-webkit-mask-repeat-y
-webkit-mask-size
--webkit-match-nearest-mail-blockquote-color
-webkit-max-logical-width
-webkit-max-logical-height
-webkit-min-logical-width
Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (120734 => 120735)
--- trunk/Source/WebCore/css/CSSValueKeywords.in 2012-06-19 17:57:24 UTC (rev 120734)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in 2012-06-19 17:59:44 UTC (rev 120735)
@@ -151,7 +151,6 @@
inactivecaptiontext
infobackground
infotext
-match
menutext
scrollbar
threeddarkshadow
Modified: trunk/Source/WebCore/css/StyleBuilder.cpp (120734 => 120735)
--- trunk/Source/WebCore/css/StyleBuilder.cpp 2012-06-19 17:57:24 UTC (rev 120734)
+++ trunk/Source/WebCore/css/StyleBuilder.cpp 2012-06-19 17:59:44 UTC (rev 120735)
@@ -2037,7 +2037,6 @@
setPropertyHandler(CSSPropertyWebkitMaskRepeatX, ApplyPropertyFillLayer<EFillRepeat, CSSPropertyWebkitMaskRepeatX, MaskFillLayer, &RenderStyle::accessMaskLayers, &RenderStyle::maskLayers, &FillLayer::isRepeatXSet, &FillLayer::repeatX, &FillLayer::setRepeatX, &FillLayer::clearRepeatX, &FillLayer::initialFillRepeatX, &StyleResolver::mapFillRepeatX>::createHandler());
setPropertyHandler(CSSPropertyWebkitMaskRepeatY, ApplyPropertyFillLayer<EFillRepeat, CSSPropertyWebkitMaskRepeatY, MaskFillLayer, &RenderStyle::accessMaskLayers, &RenderStyle::maskLayers, &FillLayer::isRepeatYSet, &FillLayer::repeatY, &FillLayer::setRepeatY, &FillLayer::clearRepeatY, &FillLayer::initialFillRepeatY, &StyleResolver::mapFillRepeatY>::createHandler());
setPropertyHandler(CSSPropertyWebkitMaskSize, ApplyPropertyFillLayer<FillSize, CSSPropertyWebkitMaskSize, MaskFillLayer, &RenderStyle::accessMaskLayers, &RenderStyle::maskLayers, &FillLayer::isSizeSet, &FillLayer::size, &FillLayer::setSize, &FillLayer::clearSize, &FillLayer::initialFillSize, &StyleResolver::mapFillSize>::createHandler());
- setPropertyHandler(CSSPropertyWebkitMatchNearestMailBlockquoteColor, ApplyPropertyDefault<EMatchNearestMailBlockquoteColor, &RenderStyle::matchNearestMailBlockquoteColor, EMatchNearestMailBlockquoteColor, &RenderStyle::setMatchNearestMailBlockquoteColor, EMatchNearestMailBlockquoteColor, &RenderStyle::initialMatchNearestMailBlockquoteColor>::createHandler());
setPropertyHandler(CSSPropertyWebkitNbspMode, ApplyPropertyDefault<ENBSPMode, &RenderStyle::nbspMode, ENBSPMode, &RenderStyle::setNBSPMode, ENBSPMode, &RenderStyle::initialNBSPMode>::createHandler());
setPropertyHandler(CSSPropertyWebkitPerspectiveOrigin, ApplyPropertyExpanding<SuppressValue, CSSPropertyWebkitPerspectiveOriginX, CSSPropertyWebkitPerspectiveOriginY>::createHandler());
setPropertyHandler(CSSPropertyWebkitPerspectiveOriginX, ApplyPropertyLength<&RenderStyle::perspectiveOriginX, &RenderStyle::setPerspectiveOriginX, &RenderStyle::initialPerspectiveOriginX>::createHandler());
Modified: trunk/Source/WebCore/css/StyleResolver.cpp (120734 => 120735)
--- trunk/Source/WebCore/css/StyleResolver.cpp 2012-06-19 17:57:24 UTC (rev 120734)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2012-06-19 17:59:44 UTC (rev 120735)
@@ -4344,7 +4344,6 @@
case CSSPropertyWebkitMaskRepeatX:
case CSSPropertyWebkitMaskRepeatY:
case CSSPropertyWebkitMaskSize:
- case CSSPropertyWebkitMatchNearestMailBlockquoteColor:
case CSSPropertyWebkitNbspMode:
case CSSPropertyWebkitPerspectiveOrigin:
case CSSPropertyWebkitPerspectiveOriginX:
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (120734 => 120735)
--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2012-06-19 17:57:24 UTC (rev 120734)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2012-06-19 17:59:44 UTC (rev 120735)
@@ -860,7 +860,6 @@
EWordWrap wordWrap() const { return static_cast<EWordWrap>(rareInheritedData->wordWrap); }
ENBSPMode nbspMode() const { return static_cast<ENBSPMode>(rareInheritedData->nbspMode); }
EKHTMLLineBreak khtmlLineBreak() const { return static_cast<EKHTMLLineBreak>(rareInheritedData->khtmlLineBreak); }
- EMatchNearestMailBlockquoteColor matchNearestMailBlockquoteColor() const { return static_cast<EMatchNearestMailBlockquoteColor>(rareNonInheritedData->matchNearestMailBlockquoteColor); }
const AtomicString& highlight() const { return rareInheritedData->highlight; }
Hyphens hyphens() const { return static_cast<Hyphens>(rareInheritedData->hyphens); }
short hyphenationLimitBefore() const { return rareInheritedData->hyphenationLimitBefore; }
@@ -1301,7 +1300,6 @@
void setWordWrap(EWordWrap b) { SET_VAR(rareInheritedData, wordWrap, b); }
void setNBSPMode(ENBSPMode b) { SET_VAR(rareInheritedData, nbspMode, b); }
void setKHTMLLineBreak(EKHTMLLineBreak b) { SET_VAR(rareInheritedData, khtmlLineBreak, b); }
- void setMatchNearestMailBlockquoteColor(EMatchNearestMailBlockquoteColor c) { SET_VAR(rareNonInheritedData, matchNearestMailBlockquoteColor, c); }
void setHighlight(const AtomicString& h) { SET_VAR(rareInheritedData, highlight, h); }
void setHyphens(Hyphens h) { SET_VAR(rareInheritedData, hyphens, h); }
void setHyphenationLimitBefore(short limit) { SET_VAR(rareInheritedData, hyphenationLimitBefore, limit); }
@@ -1632,7 +1630,6 @@
static EWordWrap initialWordWrap() { return NormalWordWrap; }
static ENBSPMode initialNBSPMode() { return NBNORMAL; }
static EKHTMLLineBreak initialKHTMLLineBreak() { return LBNORMAL; }
- static EMatchNearestMailBlockquoteColor initialMatchNearestMailBlockquoteColor() { return BCNORMAL; }
static const AtomicString& initialHighlight() { return nullAtom; }
static ESpeak initialSpeak() { return SpeakNormal; }
static Hyphens initialHyphens() { return HyphensManual; }
Modified: trunk/Source/WebCore/rendering/style/RenderStyleConstants.h (120734 => 120735)
--- trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2012-06-19 17:57:24 UTC (rev 120734)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2012-06-19 17:59:44 UTC (rev 120735)
@@ -219,10 +219,6 @@
LBNORMAL, AFTER_WHITE_SPACE
};
-enum EMatchNearestMailBlockquoteColor {
- BCNORMAL, MATCH
-};
-
enum EResize {
RESIZE_NONE, RESIZE_BOTH, RESIZE_HORIZONTAL, RESIZE_VERTICAL
};
Modified: trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp (120734 => 120735)
--- trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp 2012-06-19 17:57:24 UTC (rev 120734)
+++ trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp 2012-06-19 17:59:44 UTC (rev 120735)
@@ -68,7 +68,6 @@
, textOverflow(RenderStyle::initialTextOverflow())
, marginBeforeCollapse(MCOLLAPSE)
, marginAfterCollapse(MCOLLAPSE)
- , matchNearestMailBlockquoteColor(RenderStyle::initialMatchNearestMailBlockquoteColor())
, m_appearance(RenderStyle::initialAppearance())
, m_borderFit(RenderStyle::initialBorderFit())
, m_textCombine(RenderStyle::initialTextCombine())
@@ -140,7 +139,6 @@
, textOverflow(o.textOverflow)
, marginBeforeCollapse(o.marginBeforeCollapse)
, marginAfterCollapse(o.marginAfterCollapse)
- , matchNearestMailBlockquoteColor(o.matchNearestMailBlockquoteColor)
, m_appearance(o.m_appearance)
, m_borderFit(o.m_borderFit)
, m_textCombine(o.m_textCombine)
@@ -218,7 +216,6 @@
&& textOverflow == o.textOverflow
&& marginBeforeCollapse == o.marginBeforeCollapse
&& marginAfterCollapse == o.marginAfterCollapse
- && matchNearestMailBlockquoteColor == o.matchNearestMailBlockquoteColor
&& m_appearance == o.m_appearance
&& m_borderFit == o.m_borderFit
&& m_textCombine == o.m_textCombine
Modified: trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h (120734 => 120735)
--- trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h 2012-06-19 17:57:24 UTC (rev 120734)
+++ trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h 2012-06-19 17:59:44 UTC (rev 120735)
@@ -169,7 +169,6 @@
unsigned textOverflow : 1; // Whether or not lines that spill out should be truncated with "..."
unsigned marginBeforeCollapse : 2; // EMarginCollapse
unsigned marginAfterCollapse : 2; // EMarginCollapse
- unsigned matchNearestMailBlockquoteColor : 1; // EMatchNearestMailBlockquoteColor, FIXME: This property needs to be eliminated. It should never have been added.
unsigned m_appearance : 6; // EAppearance
unsigned m_borderFit : 1; // EBorderFit
unsigned m_textCombine : 1; // CSS3 text-combine properties
