Diff
Modified: trunk/LayoutTests/ChangeLog (107288 => 107289)
--- trunk/LayoutTests/ChangeLog 2012-02-09 21:47:58 UTC (rev 107288)
+++ trunk/LayoutTests/ChangeLog 2012-02-09 21:59:07 UTC (rev 107289)
@@ -1,3 +1,25 @@
+2012-02-09 David Hyatt <[email protected]>
+
+ https://bugs.webkit.org/show_bug.cgi?id=78256
+
+ Rename line-grid-snap to line-snap so that it matches the draft proposal for the
+ property.
+
+ Reviewed by Dan Bernstein.
+
+ * fast/line-grid/line-grid-contains-value.html:
+ * fast/line-grid/line-grid-floating.html:
+ * fast/line-grid/line-grid-inside-columns.html:
+ * fast/line-grid/line-grid-into-columns.html:
+ * fast/line-grid/line-grid-into-floats.html:
+ * fast/line-grid/line-grid-nested.html:
+ * fast/line-grid/line-grid-positioned.html:
+ * fast/line-grid/line-grid-snap-parsing.html: Removed.
+ * fast/line-grid/line-snap-parsing-expected.txt: Added.
+ * fast/line-grid/line-snap-parsing.html: Added.
+ * fast/line-grid/script-tests/line-grid-snap-parsing.js: Removed.
+ * fast/line-grid/script-tests/line-snap-parsing.js: Added.
+
2012-02-09 Julien Chaffraix <[email protected]>
Unreviewed rebaseline, yet another small font difference.
Modified: trunk/LayoutTests/fast/line-grid/line-grid-contains-value.html (107288 => 107289)
--- trunk/LayoutTests/fast/line-grid/line-grid-contains-value.html 2012-02-09 21:47:58 UTC (rev 107288)
+++ trunk/LayoutTests/fast/line-grid/line-grid-contains-value.html 2012-02-09 21:59:07 UTC (rev 107289)
@@ -2,14 +2,14 @@
<html>
<head>
<style>
-.grid { -webkit-line-grid: simple; -webkit-line-grid-snap: baseline;
+.grid { -webkit-line-grid: simple; -webkit-line-snap: baseline;
font-size:36px; position:absolute;
padding:10px; }
</style>
</head>
<body>
<div style="left:10px; top:10px; width:600px" class="grid">
-<div style="-webkit-line-grid-snap:contain;font-size:48px">
+<div style="-webkit-line-snap:contain;font-size:48px">
This header should be centered in the grid lines.
</div>
<div style="font-size:12px">
Modified: trunk/LayoutTests/fast/line-grid/line-grid-floating.html (107288 => 107289)
--- trunk/LayoutTests/fast/line-grid/line-grid-floating.html 2012-02-09 21:47:58 UTC (rev 107288)
+++ trunk/LayoutTests/fast/line-grid/line-grid-floating.html 2012-02-09 21:59:07 UTC (rev 107289)
@@ -2,7 +2,7 @@
<html>
<head>
<style>
-.grid { -webkit-line-grid: simple; -webkit-line-grid-snap: baseline;
+.grid { -webkit-line-grid: simple; -webkit-line-snap: baseline;
font-size:36px; float:left;border:2px solid black;
padding:10px; margin:5px }
</style>
Modified: trunk/LayoutTests/fast/line-grid/line-grid-inside-columns.html (107288 => 107289)
--- trunk/LayoutTests/fast/line-grid/line-grid-inside-columns.html 2012-02-09 21:47:58 UTC (rev 107288)
+++ trunk/LayoutTests/fast/line-grid/line-grid-inside-columns.html 2012-02-09 21:59:07 UTC (rev 107289)
@@ -2,7 +2,7 @@
<html>
<head>
<style>
-.grid { -webkit-line-grid: simple; -webkit-line-grid-snap: baseline;
+.grid { -webkit-line-grid: simple; -webkit-line-snap: baseline;
font-size:36px; }</style>
</head>
<body>
Modified: trunk/LayoutTests/fast/line-grid/line-grid-into-columns.html (107288 => 107289)
--- trunk/LayoutTests/fast/line-grid/line-grid-into-columns.html 2012-02-09 21:47:58 UTC (rev 107288)
+++ trunk/LayoutTests/fast/line-grid/line-grid-into-columns.html 2012-02-09 21:59:07 UTC (rev 107289)
@@ -2,7 +2,7 @@
<html>
<head>
<style>
-.grid { -webkit-line-grid: simple; -webkit-line-grid-snap: baseline;
+.grid { -webkit-line-grid: simple; -webkit-line-snap: baseline;
font-size:36px; position:relative; width:800px}</style>
</head>
<body style="margin:0">
Modified: trunk/LayoutTests/fast/line-grid/line-grid-into-floats.html (107288 => 107289)
--- trunk/LayoutTests/fast/line-grid/line-grid-into-floats.html 2012-02-09 21:47:58 UTC (rev 107288)
+++ trunk/LayoutTests/fast/line-grid/line-grid-into-floats.html 2012-02-09 21:59:07 UTC (rev 107289)
@@ -2,7 +2,7 @@
<html>
<head>
<style>
-.grid { -webkit-line-grid: simple; -webkit-line-grid-snap: baseline;
+.grid { -webkit-line-grid: simple; -webkit-line-snap: baseline;
font-size:36px;
padding:10px; }
</style>
Modified: trunk/LayoutTests/fast/line-grid/line-grid-nested.html (107288 => 107289)
--- trunk/LayoutTests/fast/line-grid/line-grid-nested.html 2012-02-09 21:47:58 UTC (rev 107288)
+++ trunk/LayoutTests/fast/line-grid/line-grid-nested.html 2012-02-09 21:59:07 UTC (rev 107289)
@@ -17,4 +17,4 @@
</div>
</div>
This test passes if it doesn't crash.
-</body>
\ No newline at end of file
+</body>
Modified: trunk/LayoutTests/fast/line-grid/line-grid-positioned.html (107288 => 107289)
--- trunk/LayoutTests/fast/line-grid/line-grid-positioned.html 2012-02-09 21:47:58 UTC (rev 107288)
+++ trunk/LayoutTests/fast/line-grid/line-grid-positioned.html 2012-02-09 21:59:07 UTC (rev 107289)
@@ -2,7 +2,7 @@
<html>
<head>
<style>
-.grid { -webkit-line-grid: simple; -webkit-line-grid-snap: baseline;
+.grid { -webkit-line-grid: simple; -webkit-line-snap: baseline;
font-size:36px; position:absolute;border:2px solid black;
padding:10px; }
</style>
Deleted: trunk/LayoutTests/fast/line-grid/line-grid-snap-parsing-expected.txt (107288 => 107289)
--- trunk/LayoutTests/fast/line-grid/line-grid-snap-parsing-expected.txt 2012-02-09 21:47:58 UTC (rev 107288)
+++ trunk/LayoutTests/fast/line-grid/line-grid-snap-parsing-expected.txt 2012-02-09 21:59:07 UTC (rev 107289)
@@ -1,23 +0,0 @@
-Test parsing of the CSS line-grid property.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS test("-webkit-line-grid-snap: none") is "none"
-PASS test("-webkit-line-grid-snap: baseline") is "baseline"
-PASS test("-webkit-line-grid-snap: contain") is "contain"
-PASS test("-webkit-line-grid-snap: ;") is ""
-PASS test("-webkit-line-grid-snap: 1") is ""
-PASS test("-webkit-line-grid-snap: 1.2") is ""
-PASS test("-webkit-line-grid-snap: -1") is ""
-PASS test("-webkit-line-grid-snap: 12px") is ""
-PASS testComputedStyle("none") is "none"
-PASS testComputedStyle("") is "none"
-PASS testComputedStyle("12px") is "none"
-PASS testInherited("none") is "none"
-PASS testInherited("baseline") is "baseline"
-PASS testInherited("contain") is "contain"
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Deleted: trunk/LayoutTests/fast/line-grid/line-grid-snap-parsing.html (107288 => 107289)
--- trunk/LayoutTests/fast/line-grid/line-grid-snap-parsing.html 2012-02-09 21:47:58 UTC (rev 107288)
+++ trunk/LayoutTests/fast/line-grid/line-grid-snap-parsing.html 2012-02-09 21:59:07 UTC (rev 107289)
@@ -1,10 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<script src=""
-</head>
-<body>
-<script src=""
-<script src=""
-</body>
-</html>
Added: trunk/LayoutTests/fast/line-grid/line-snap-parsing-expected.txt (0 => 107289)
--- trunk/LayoutTests/fast/line-grid/line-snap-parsing-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/line-grid/line-snap-parsing-expected.txt 2012-02-09 21:59:07 UTC (rev 107289)
@@ -0,0 +1,23 @@
+Test parsing of the CSS line-snap property.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS test("-webkit-line-snap: none") is "none"
+PASS test("-webkit-line-snap: baseline") is "baseline"
+PASS test("-webkit-line-snap: contain") is "contain"
+PASS test("-webkit-line-snap: ;") is ""
+PASS test("-webkit-line-snap: 1") is ""
+PASS test("-webkit-line-snap: 1.2") is ""
+PASS test("-webkit-line-snap: -1") is ""
+PASS test("-webkit-line-snap: 12px") is ""
+PASS testComputedStyle("none") is "none"
+PASS testComputedStyle("") is "none"
+PASS testComputedStyle("12px") is "none"
+PASS testInherited("none") is "none"
+PASS testInherited("baseline") is "baseline"
+PASS testInherited("contain") is "contain"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: trunk/LayoutTests/fast/line-grid/line-snap-parsing.html (0 => 107289)
--- trunk/LayoutTests/fast/line-grid/line-snap-parsing.html (rev 0)
+++ trunk/LayoutTests/fast/line-grid/line-snap-parsing.html 2012-02-09 21:59:07 UTC (rev 107289)
@@ -0,0 +1,10 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src=""
+</head>
+<body>
+<script src=""
+<script src=""
+</body>
+</html>
Deleted: trunk/LayoutTests/fast/line-grid/script-tests/line-grid-snap-parsing.js (107288 => 107289)
--- trunk/LayoutTests/fast/line-grid/script-tests/line-grid-snap-parsing.js 2012-02-09 21:47:58 UTC (rev 107288)
+++ trunk/LayoutTests/fast/line-grid/script-tests/line-grid-snap-parsing.js 2012-02-09 21:59:07 UTC (rev 107289)
@@ -1,49 +0,0 @@
-description('Test parsing of the CSS line-grid property.');
-
-function test(declaration) {
- var div = document.createElement("div");
- div.setAttribute("style", declaration);
- return div.style.webkitLineGridSnap;
-}
-
-function testComputedStyle(value) {
- var div = document.createElement("div");
- document.body.appendChild(div);
- div.style.setProperty("-webkit-line-grid-snap", value);
- var webkitFlowComputedValue = getComputedStyle(div).getPropertyValue("-webkit-line-grid-snap");
- document.body.removeChild(div);
- return webkitFlowComputedValue;
-}
-
-function testInherited(parentValue) {
- var parentDiv = document.createElement("div");
- document.body.appendChild(parentDiv);
- parentDiv.style.setProperty("-webkit-line-grid-snap", parentValue);
-
- var childDiv = document.createElement("div");
- parentDiv.appendChild(childDiv);
-
- var childWebKitFlowComputedValue = getComputedStyle(childDiv).getPropertyValue("-webkit-line-grid-snap");
-
- parentDiv.removeChild(childDiv);
- document.body.removeChild(parentDiv);
-
- return childWebKitFlowComputedValue;
-}
-
-shouldBeEqualToString('test("-webkit-line-grid-snap: none")', "none");
-shouldBeEqualToString('test("-webkit-line-grid-snap: baseline")', "baseline");
-shouldBeEqualToString('test("-webkit-line-grid-snap: contain")', "contain");
-shouldBeEqualToString('test("-webkit-line-grid-snap: ;")', "");
-shouldBeEqualToString('test("-webkit-line-grid-snap: 1")', "");
-shouldBeEqualToString('test("-webkit-line-grid-snap: 1.2")', "");
-shouldBeEqualToString('test("-webkit-line-grid-snap: -1")', "");
-shouldBeEqualToString('test("-webkit-line-grid-snap: 12px")', "");
-
-shouldBeEqualToString('testComputedStyle("none")', "none");
-shouldBeEqualToString('testComputedStyle("")', "none");
-shouldBeEqualToString('testComputedStyle("12px")', "none");
-
-shouldBeEqualToString('testInherited("none")', "none");
-shouldBeEqualToString('testInherited("baseline")', "baseline");
-shouldBeEqualToString('testInherited("contain")', "contain");
Added: trunk/LayoutTests/fast/line-grid/script-tests/line-snap-parsing.js (0 => 107289)
--- trunk/LayoutTests/fast/line-grid/script-tests/line-snap-parsing.js (rev 0)
+++ trunk/LayoutTests/fast/line-grid/script-tests/line-snap-parsing.js 2012-02-09 21:59:07 UTC (rev 107289)
@@ -0,0 +1,49 @@
+description('Test parsing of the CSS line-snap property.');
+
+function test(declaration) {
+ var div = document.createElement("div");
+ div.setAttribute("style", declaration);
+ return div.style.webkitLineSnap;
+}
+
+function testComputedStyle(value) {
+ var div = document.createElement("div");
+ document.body.appendChild(div);
+ div.style.setProperty("-webkit-line-snap", value);
+ var webkitFlowComputedValue = getComputedStyle(div).getPropertyValue("-webkit-line-snap");
+ document.body.removeChild(div);
+ return webkitFlowComputedValue;
+}
+
+function testInherited(parentValue) {
+ var parentDiv = document.createElement("div");
+ document.body.appendChild(parentDiv);
+ parentDiv.style.setProperty("-webkit-line-snap", parentValue);
+
+ var childDiv = document.createElement("div");
+ parentDiv.appendChild(childDiv);
+
+ var childWebKitFlowComputedValue = getComputedStyle(childDiv).getPropertyValue("-webkit-line-snap");
+
+ parentDiv.removeChild(childDiv);
+ document.body.removeChild(parentDiv);
+
+ return childWebKitFlowComputedValue;
+}
+
+shouldBeEqualToString('test("-webkit-line-snap: none")', "none");
+shouldBeEqualToString('test("-webkit-line-snap: baseline")', "baseline");
+shouldBeEqualToString('test("-webkit-line-snap: contain")', "contain");
+shouldBeEqualToString('test("-webkit-line-snap: ;")', "");
+shouldBeEqualToString('test("-webkit-line-snap: 1")', "");
+shouldBeEqualToString('test("-webkit-line-snap: 1.2")', "");
+shouldBeEqualToString('test("-webkit-line-snap: -1")', "");
+shouldBeEqualToString('test("-webkit-line-snap: 12px")', "");
+
+shouldBeEqualToString('testComputedStyle("none")', "none");
+shouldBeEqualToString('testComputedStyle("")', "none");
+shouldBeEqualToString('testComputedStyle("12px")', "none");
+
+shouldBeEqualToString('testInherited("none")', "none");
+shouldBeEqualToString('testInherited("baseline")', "baseline");
+shouldBeEqualToString('testInherited("contain")', "contain");
Modified: trunk/Source/WebCore/ChangeLog (107288 => 107289)
--- trunk/Source/WebCore/ChangeLog 2012-02-09 21:47:58 UTC (rev 107288)
+++ trunk/Source/WebCore/ChangeLog 2012-02-09 21:59:07 UTC (rev 107289)
@@ -1,3 +1,42 @@
+2012-02-09 David Hyatt <[email protected]>
+
+ https://bugs.webkit.org/show_bug.cgi?id=78256
+
+ Rename line-grid-snap to line-snap so that it matches the draft proposal for the
+ property.
+
+ Reviewed by Dan Bernstein.
+
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore):
+ (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseValue):
+ * css/CSSPrimitiveValueMappings.h:
+ (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
+ (WebCore::CSSPrimitiveValue::operator LineSnap):
+ * css/CSSProperty.cpp:
+ (WebCore::CSSProperty::isInheritedProperty):
+ * css/CSSPropertyNames.in:
+ * css/CSSStyleApplyProperty.cpp:
+ (WebCore::CSSStyleApplyProperty::CSSStyleApplyProperty):
+ * css/CSSStyleSelector.cpp:
+ (WebCore::CSSStyleSelector::applyProperty):
+ * rendering/RootInlineBox.cpp:
+ (WebCore::RootInlineBox::alignBoxesInBlockDirection):
+ (WebCore::RootInlineBox::lineSnapAdjustment):
+ * rendering/RootInlineBox.h:
+ (RootInlineBox):
+ * rendering/style/RenderStyle.cpp:
+ (WebCore::RenderStyle::diff):
+ * rendering/style/RenderStyle.h:
+ * rendering/style/RenderStyleConstants.h:
+ * rendering/style/StyleRareInheritedData.cpp:
+ (WebCore::StyleRareInheritedData::StyleRareInheritedData):
+ (WebCore::StyleRareInheritedData::operator==):
+ * rendering/style/StyleRareInheritedData.h:
+ (StyleRareInheritedData):
+
2012-02-09 Benjamin Poulain <[email protected]>
The localization of htmlSelectMultipleItems() needs better support of pluralization
Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (107288 => 107289)
--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2012-02-09 21:47:58 UTC (rev 107288)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2012-02-09 21:59:07 UTC (rev 107289)
@@ -243,7 +243,7 @@
CSSPropertyWebkitLineBreak,
CSSPropertyWebkitLineClamp,
CSSPropertyWebkitLineGrid,
- CSSPropertyWebkitLineGridSnap,
+ CSSPropertyWebkitLineSnap,
CSSPropertyWebkitLocale,
CSSPropertyWebkitMarginBeforeCollapse,
CSSPropertyWebkitMarginAfterCollapse,
@@ -2207,8 +2207,8 @@
if (style->lineGrid().isNull())
return cssValuePool->createIdentifierValue(CSSValueNone);
return cssValuePool->createValue(style->lineGrid(), CSSPrimitiveValue::CSS_STRING);
- case CSSPropertyWebkitLineGridSnap:
- return CSSPrimitiveValue::create(style->lineGridSnap());
+ case CSSPropertyWebkitLineSnap:
+ return CSSPrimitiveValue::create(style->lineSnap());
case CSSPropertyWebkitWritingMode:
return cssValuePool->createValue(style->writingMode());
case CSSPropertyWebkitTextCombine:
Modified: trunk/Source/WebCore/css/CSSParser.cpp (107288 => 107289)
--- trunk/Source/WebCore/css/CSSParser.cpp 2012-02-09 21:47:58 UTC (rev 107288)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2012-02-09 21:59:07 UTC (rev 107289)
@@ -2049,7 +2049,7 @@
}
}
break;
- case CSSPropertyWebkitLineGridSnap:
+ case CSSPropertyWebkitLineSnap:
if (id == CSSValueNone || id == CSSValueBaseline || id == CSSValueContain)
validPrimitive = true;
break;
Modified: trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h (107288 => 107289)
--- trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2012-02-09 21:47:58 UTC (rev 107288)
+++ trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2012-02-09 21:59:07 UTC (rev 107289)
@@ -3158,35 +3158,35 @@
}
}
-template<> inline CSSPrimitiveValue::CSSPrimitiveValue(LineGridSnap gridSnap)
+template<> inline CSSPrimitiveValue::CSSPrimitiveValue(LineSnap gridSnap)
: CSSValue(PrimitiveClass)
{
m_primitiveUnitType = CSS_IDENT;
switch (gridSnap) {
- case LineGridSnapNone:
+ case LineSnapNone:
m_value.ident = CSSValueNone;
break;
- case LineGridSnapBaseline:
+ case LineSnapBaseline:
m_value.ident = CSSValueBaseline;
break;
- case LineGridSnapContain:
+ case LineSnapContain:
m_value.ident = CSSValueContain;
break;
}
}
-template<> inline CSSPrimitiveValue::operator LineGridSnap() const
+template<> inline CSSPrimitiveValue::operator LineSnap() const
{
switch (m_value.ident) {
case CSSValueNone:
- return LineGridSnapNone;
+ return LineSnapNone;
case CSSValueBaseline:
- return LineGridSnapBaseline;
+ return LineSnapBaseline;
case CSSValueContain:
- return LineGridSnapContain;
+ return LineSnapContain;
default:
ASSERT_NOT_REACHED();
- return LineGridSnapNone;
+ return LineSnapNone;
}
}
Modified: trunk/Source/WebCore/css/CSSProperty.cpp (107288 => 107289)
--- trunk/Source/WebCore/css/CSSProperty.cpp 2012-02-09 21:47:58 UTC (rev 107288)
+++ trunk/Source/WebCore/css/CSSProperty.cpp 2012-02-09 21:59:07 UTC (rev 107289)
@@ -331,7 +331,7 @@
case CSSPropertyWebkitLineBoxContain:
case CSSPropertyWebkitLineBreak:
case CSSPropertyWebkitLineGrid:
- case CSSPropertyWebkitLineGridSnap:
+ case CSSPropertyWebkitLineSnap:
case CSSPropertyWebkitNbspMode:
case CSSPropertyWebkitPrintColorAdjust:
case CSSPropertyWebkitRtlOrdering:
Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (107288 => 107289)
--- trunk/Source/WebCore/css/CSSPropertyNames.in 2012-02-09 21:47:58 UTC (rev 107288)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2012-02-09 21:59:07 UTC (rev 107289)
@@ -274,7 +274,7 @@
-webkit-line-break
-webkit-line-clamp
-webkit-line-grid
--webkit-line-grid-snap
+-webkit-line-snap
-webkit-logical-width
-webkit-logical-height
-webkit-margin-after-collapse
Modified: trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp (107288 => 107289)
--- trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp 2012-02-09 21:47:58 UTC (rev 107288)
+++ trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp 2012-02-09 21:59:07 UTC (rev 107289)
@@ -1926,7 +1926,7 @@
setPropertyHandler(CSSPropertyWebkitHyphenateLimitLines, ApplyPropertyNumber<short, &RenderStyle::hyphenationLimitLines, &RenderStyle::setHyphenationLimitLines, &RenderStyle::initialHyphenationLimitLines, CSSValueNoLimit>::createHandler());
setPropertyHandler(CSSPropertyWebkitLineGrid, ApplyPropertyString<MapNoneToNull, &RenderStyle::lineGrid, &RenderStyle::setLineGrid, &RenderStyle::initialLineGrid>::createHandler());
- setPropertyHandler(CSSPropertyWebkitLineGridSnap, ApplyPropertyDefault<LineGridSnap, &RenderStyle::lineGridSnap, LineGridSnap, &RenderStyle::setLineGridSnap, LineGridSnap, &RenderStyle::initialLineGridSnap>::createHandler());
+ setPropertyHandler(CSSPropertyWebkitLineSnap, ApplyPropertyDefault<LineSnap, &RenderStyle::lineSnap, LineSnap, &RenderStyle::setLineSnap, LineSnap, &RenderStyle::initialLineSnap>::createHandler());
setPropertyHandler(CSSPropertyWebkitTextCombine, ApplyPropertyDefault<TextCombine, &RenderStyle::textCombine, TextCombine, &RenderStyle::setTextCombine, TextCombine, &RenderStyle::initialTextCombine>::createHandler());
setPropertyHandler(CSSPropertyWebkitTextEmphasisPosition, ApplyPropertyDefault<TextEmphasisPosition, &RenderStyle::textEmphasisPosition, TextEmphasisPosition, &RenderStyle::setTextEmphasisPosition, TextEmphasisPosition, &RenderStyle::initialTextEmphasisPosition>::createHandler());
Modified: trunk/Source/WebCore/css/CSSStyleSelector.cpp (107288 => 107289)
--- trunk/Source/WebCore/css/CSSStyleSelector.cpp 2012-02-09 21:47:58 UTC (rev 107288)
+++ trunk/Source/WebCore/css/CSSStyleSelector.cpp 2012-02-09 21:59:07 UTC (rev 107289)
@@ -4070,7 +4070,7 @@
case CSSPropertyWebkitHyphenateLimitBefore:
case CSSPropertyWebkitHyphenateLimitLines:
case CSSPropertyWebkitLineGrid:
- case CSSPropertyWebkitLineGridSnap:
+ case CSSPropertyWebkitLineSnap:
case CSSPropertyWebkitTextCombine:
case CSSPropertyWebkitTextEmphasisPosition:
case CSSPropertyWebkitTextEmphasisStyle:
Modified: trunk/Source/WebCore/rendering/RootInlineBox.cpp (107288 => 107289)
--- trunk/Source/WebCore/rendering/RootInlineBox.cpp 2012-02-09 21:47:58 UTC (rev 107288)
+++ trunk/Source/WebCore/rendering/RootInlineBox.cpp 2012-02-09 21:59:07 UTC (rev 107289)
@@ -286,7 +286,7 @@
heightOfBlock += annotationsAdjustment;
}
- LayoutUnit gridSnapAdjustment = lineGridSnapAdjustment();
+ LayoutUnit gridSnapAdjustment = lineSnapAdjustment();
if (gridSnapAdjustment) {
adjustBlockDirectionPosition(gridSnapAdjustment);
heightOfBlock += gridSnapAdjustment;
@@ -326,11 +326,11 @@
return result;
}
-LayoutUnit RootInlineBox::lineGridSnapAdjustment(LayoutUnit delta) const
+LayoutUnit RootInlineBox::lineSnapAdjustment(LayoutUnit delta) const
{
// If our block doesn't have snapping turned on, do nothing.
// FIXME: Implement bounds snapping.
- if (block()->style()->lineGridSnap() == LineGridSnapNone)
+ if (block()->style()->lineSnap() == LineSnapNone)
return 0;
// Get the current line grid and offset.
@@ -377,7 +377,7 @@
firstTextTop = pageLogicalTop + lineGridBox->logicalTop() - lineGrid->borderBefore() - lineGrid->paddingBefore() + lineGridPaginationOrigin;
}
- if (block()->style()->lineGridSnap() == LineGridSnapContain) {
+ if (block()->style()->lineSnap() == LineSnapContain) {
// Compute the desired offset from the text-top of a grid line.
// Look at our height (logicalHeight()).
// Look at the total available height. It's going to be (textBottom - textTop) + (n-1)*(multiple with leading)
@@ -414,7 +414,7 @@
return result;
// Put ourselves at the top of the next page to force a snap onto the new grid established by that page.
- return lineGridSnapAdjustment(newPageLogicalTop - (blockOffset + lineTopWithLeading()));
+ return lineSnapAdjustment(newPageLogicalTop - (blockOffset + lineTopWithLeading()));
}
GapRects RootInlineBox::lineSelectionGap(RenderBlock* rootBlock, const LayoutPoint& rootBlockPhysicalPosition, const LayoutSize& offsetFromRootBlock,
Modified: trunk/Source/WebCore/rendering/RootInlineBox.h (107288 => 107289)
--- trunk/Source/WebCore/rendering/RootInlineBox.h 2012-02-09 21:47:58 UTC (rev 107288)
+++ trunk/Source/WebCore/rendering/RootInlineBox.h 2012-02-09 21:59:07 UTC (rev 107289)
@@ -183,7 +183,7 @@
private:
void setHasEllipsisBox(bool hasEllipsisBox) { m_hasEllipsisBoxOrHyphen = hasEllipsisBox; }
- LayoutUnit lineGridSnapAdjustment(LayoutUnit delta = 0) const;
+ LayoutUnit lineSnapAdjustment(LayoutUnit delta = 0) const;
int beforeAnnotationsAdjustment() const;
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (107288 => 107289)
--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2012-02-09 21:47:58 UTC (rev 107288)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2012-02-09 21:59:07 UTC (rev 107289)
@@ -466,7 +466,7 @@
|| rareInheritedData->textEmphasisCustomMark != other->rareInheritedData->textEmphasisCustomMark
|| rareInheritedData->m_lineBoxContain != other->rareInheritedData->m_lineBoxContain
|| rareInheritedData->m_lineGrid != other->rareInheritedData->m_lineGrid
- || rareInheritedData->m_lineGridSnap != other->rareInheritedData->m_lineGridSnap)
+ || rareInheritedData->m_lineSnap != other->rareInheritedData->m_lineSnap)
return StyleDifferenceLayout;
if (!rareInheritedData->shadowDataEquivalent(*other->rareInheritedData.get()))
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (107288 => 107289)
--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2012-02-09 21:47:58 UTC (rev 107288)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2012-02-09 21:59:07 UTC (rev 107289)
@@ -903,7 +903,7 @@
RegionOverflow regionOverflow() const { return static_cast<RegionOverflow>(rareNonInheritedData->m_regionOverflow); }
const AtomicString& lineGrid() const { return rareInheritedData->m_lineGrid; }
- LineGridSnap lineGridSnap() const { return static_cast<LineGridSnap>(rareInheritedData->m_lineGridSnap); }
+ LineSnap lineSnap() const { return static_cast<LineSnap>(rareInheritedData->m_lineSnap); }
WrapFlow wrapFlow() const { return static_cast<WrapFlow>(rareNonInheritedData->m_wrapFlow); }
WrapThrough wrapThrough() const { return static_cast<WrapThrough>(rareNonInheritedData->m_wrapThrough); }
@@ -1302,7 +1302,7 @@
// End CSS3 Setters
void setLineGrid(const AtomicString& lineGrid) { SET_VAR(rareInheritedData, m_lineGrid, lineGrid); }
- void setLineGridSnap(LineGridSnap lineGridSnap) { SET_VAR(rareInheritedData, m_lineGridSnap, lineGridSnap); }
+ void setLineSnap(LineSnap lineSnap) { SET_VAR(rareInheritedData, m_lineSnap, lineSnap); }
void setFlowThread(const AtomicString& flowThread) { SET_VAR(rareNonInheritedData, m_flowThread, flowThread); }
void setRegionThread(const AtomicString& regionThread) { SET_VAR(rareNonInheritedData, m_regionThread, regionThread); }
@@ -1631,7 +1631,7 @@
#endif
static const AtomicString& initialLineGrid() { return nullAtom; }
- static LineGridSnap initialLineGridSnap() { return LineGridSnapNone; }
+ static LineSnap initialLineSnap() { return LineSnapNone; }
static const AtomicString& initialFlowThread() { return nullAtom; }
static const AtomicString& initialRegionThread() { return nullAtom; }
Modified: trunk/Source/WebCore/rendering/style/RenderStyleConstants.h (107288 => 107289)
--- trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2012-02-09 21:47:58 UTC (rev 107288)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2012-02-09 21:59:07 UTC (rev 107289)
@@ -454,7 +454,7 @@
enum ColumnAxis { HorizontalColumnAxis, VerticalColumnAxis, AutoColumnAxis };
-enum LineGridSnap { LineGridSnapNone, LineGridSnapBaseline, LineGridSnapContain };
+enum LineSnap { LineSnapNone, LineSnapBaseline, LineSnapContain };
enum WrapFlow { WrapFlowAuto, WrapFlowBoth, WrapFlowLeft, WrapFlowRight, WrapFlowMaximum, WrapFlowClear };
Modified: trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp (107288 => 107289)
--- trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp 2012-02-09 21:47:58 UTC (rev 107288)
+++ trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp 2012-02-09 21:59:07 UTC (rev 107289)
@@ -53,7 +53,7 @@
, textEmphasisPosition(TextEmphasisPositionOver)
, m_lineBoxContain(RenderStyle::initialLineBoxContain())
, m_imageRendering(RenderStyle::initialImageRendering())
- , m_lineGridSnap(RenderStyle::initialLineGridSnap())
+ , m_lineSnap(RenderStyle::initialLineSnap())
, hyphenationLimitBefore(-1)
, hyphenationLimitAfter(-1)
, hyphenationLimitLines(-1)
@@ -97,7 +97,7 @@
, textEmphasisPosition(o.textEmphasisPosition)
, m_lineBoxContain(o.m_lineBoxContain)
, m_imageRendering(o.m_imageRendering)
- , m_lineGridSnap(o.m_lineGridSnap)
+ , m_lineSnap(o.m_lineSnap)
, hyphenationString(o.hyphenationString)
, hyphenationLimitBefore(o.hyphenationLimitBefore)
, hyphenationLimitAfter(o.hyphenationLimitAfter)
@@ -168,7 +168,7 @@
&& QuotesData::equal(quotes.get(), o.quotes.get())
&& m_lineGrid == o.m_lineGrid
&& m_imageRendering == o.m_imageRendering
- && m_lineGridSnap == o.m_lineGridSnap;
+ && m_lineSnap == o.m_lineSnap;
}
bool StyleRareInheritedData::shadowDataEquivalent(const StyleRareInheritedData& o) const
Modified: trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h (107288 => 107289)
--- trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h 2012-02-09 21:47:58 UTC (rev 107288)
+++ trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h 2012-02-09 21:59:07 UTC (rev 107289)
@@ -91,7 +91,7 @@
unsigned m_lineBoxContain: 7; // LineBoxContain
// CSS Image Values Level 3
unsigned m_imageRendering : 2; // EImageRendering
- unsigned m_lineGridSnap : 2; // LineGridSnap
+ unsigned m_lineSnap : 2; // LineSnap
AtomicString hyphenationString;
short hyphenationLimitBefore;
