[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 18:39:11 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 72946e35fb6c41eed2d5c62c416abb97fe77d9f4
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Dec 15 06:48:44 2010 +0000
2010-12-14 takano takumi <takano at apple.com>
Reviewed by Dan Bernstein.
text-combine value names have been changed in the css3 proposal.
https://bugs.webkit.org/show_bug.cgi?id=51089
* fast/text/international/text-combine-parser-test-expected.txt: Result updated.
* fast/text/international/text-combine-parser-test.html: Test updated.
2010-12-14 takano takumi <takano at apple.com>
Reviewed by Dan Bernstein.
text-combine value names have been changed in the css3 proposal.
https://bugs.webkit.org/show_bug.cgi?id=51089
Changed text-combine's value names from "none|cluster|upright" to "none|horizontal".
* css/CSSParser.cpp: Changed value name.
(WebCore::CSSParser::parseValue):
* css/CSSPrimitiveValueMappings.h: Changed value name.
(WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
(WebCore::CSSPrimitiveValue::operator TextCombine):
* css/CSSValueKeywords.in: No more text-combine specific values needed since
"horizontal" is already there.
* rendering/style/RenderStyleConstants.h: Changed value name.
* rendering/style/StyleRareNonInheritedData.h: Changed textCombine field size.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74098 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 4859bc7..0183b9d 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-14 takano takumi <takano at apple.com>
+ Reviewed by Dan Bernstein.
+
+ text-combine value names have been changed in the css3 proposal.
+ https://bugs.webkit.org/show_bug.cgi?id=51089
+
+ * fast/text/international/text-combine-parser-test-expected.txt: Result updated.
+ * fast/text/international/text-combine-parser-test.html: Test updated.
+
2010-12-14 Cosmin Truta <ctruta at chromium.org>
Reviewed by Eric Seidel.
diff --git a/LayoutTests/fast/text/international/text-combine-parser-test-expected.txt b/LayoutTests/fast/text/international/text-combine-parser-test-expected.txt
index 4cda7b5..3a18144 100644
--- a/LayoutTests/fast/text/international/text-combine-parser-test-expected.txt
+++ b/LayoutTests/fast/text/international/text-combine-parser-test-expected.txt
@@ -1,11 +1,9 @@
text-combine parser test
-webkit-text-combine:none
--webkit-text-combine:cluster
--webkit-text-combine:upright
+-webkit-text-combine:horizontal
Okay if -webkit-text-combine values above and below are the same.
-webkit-text-combine:none
--webkit-text-combine:cluster
--webkit-text-combine:upright
+-webkit-text-combine:horizontal
diff --git a/LayoutTests/fast/text/international/text-combine-parser-test.html b/LayoutTests/fast/text/international/text-combine-parser-test.html
index 61fd180..ce98e63 100644
--- a/LayoutTests/fast/text/international/text-combine-parser-test.html
+++ b/LayoutTests/fast/text/international/text-combine-parser-test.html
@@ -14,7 +14,7 @@ function test()
if (window.layoutTestController)
layoutTestController.dumpAsText();
- var textCombineValues = ["none", "cluster", "upright"];
+ var textCombineValues = ["none", "horizontal"];
var pElems = document.getElementsByTagName("div");
for ( i = 0 ; i < pElems.length ; ++i )
{
@@ -28,8 +28,7 @@ function test()
<body onload="test()">
<p>text-combine parser test</p>
<div>-webkit-text-combine:none</div>
-<div>-webkit-text-combine:cluster</div>
-<div>-webkit-text-combine:upright</div>
+<div>-webkit-text-combine:horizontal</div>
<p>Okay if -webkit-text-combine values above and below are the same.</p>
<hr>
<p><ol id=console></ol></p>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 65aeade..174dc24 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2010-12-14 takano takumi <takano at apple.com>
+
+ Reviewed by Dan Bernstein.
+
+ text-combine value names have been changed in the css3 proposal.
+ https://bugs.webkit.org/show_bug.cgi?id=51089
+
+ Changed text-combine's value names from "none|cluster|upright" to "none|horizontal".
+
+ * css/CSSParser.cpp: Changed value name.
+ (WebCore::CSSParser::parseValue):
+ * css/CSSPrimitiveValueMappings.h: Changed value name.
+ (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
+ (WebCore::CSSPrimitiveValue::operator TextCombine):
+ * css/CSSValueKeywords.in: No more text-combine specific values needed since
+ "horizontal" is already there.
+ * rendering/style/RenderStyleConstants.h: Changed value name.
+ * rendering/style/StyleRareNonInheritedData.h: Changed textCombine field size.
+
2010-12-14 Koan-Sin Tan <koansin.tan at gmail.com>
Reviewed by Alexey Proskuryakov.
diff --git a/WebCore/css/CSSParser.cpp b/WebCore/css/CSSParser.cpp
index 12b8eea..392e548 100644
--- a/WebCore/css/CSSParser.cpp
+++ b/WebCore/css/CSSParser.cpp
@@ -1779,7 +1779,7 @@ bool CSSParser::parseValue(int propId, bool important)
break;
case CSSPropertyWebkitTextCombine:
- if (id == CSSValueNone || id == CSSValueCluster || id == CSSValueUpright)
+ if (id == CSSValueNone || id == CSSValueHorizontal)
validPrimitive = true;
break;
diff --git a/WebCore/css/CSSPrimitiveValueMappings.h b/WebCore/css/CSSPrimitiveValueMappings.h
index 177a97e..fb4aff3 100644
--- a/WebCore/css/CSSPrimitiveValueMappings.h
+++ b/WebCore/css/CSSPrimitiveValueMappings.h
@@ -2054,11 +2054,8 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(TextCombine e)
case TextCombineNone:
m_value.ident = CSSValueNone;
break;
- case TextCombineCluster:
- m_value.ident = CSSValueCluster;
- break;
- case TextCombineUpright:
- m_value.ident = CSSValueUpright;
+ case TextCombineHorizontal:
+ m_value.ident = CSSValueHorizontal;
break;
}
}
@@ -2068,10 +2065,8 @@ template<> inline CSSPrimitiveValue::operator TextCombine() const
switch (m_value.ident) {
case CSSValueNone:
return TextCombineNone;
- case CSSValueCluster:
- return TextCombineCluster;
- case CSSValueUpright:
- return TextCombineUpright;
+ case CSSValueHorizontal:
+ return TextCombineHorizontal;
default:
ASSERT_NOT_REACHED();
return TextCombineNone;
diff --git a/WebCore/css/CSSValueKeywords.in b/WebCore/css/CSSValueKeywords.in
index f733ee2..1f14c9d 100644
--- a/WebCore/css/CSSValueKeywords.in
+++ b/WebCore/css/CSSValueKeywords.in
@@ -767,10 +767,6 @@ vertical-rl
vertical-lr
horizontal-bt
-# -webkit-text-combine
-cluster
-upright
-
# -webkit-text-emphasis-position
over
under
diff --git a/WebCore/rendering/style/RenderStyleConstants.h b/WebCore/rendering/style/RenderStyleConstants.h
index 8dbce8e..0839864 100644
--- a/WebCore/rendering/style/RenderStyleConstants.h
+++ b/WebCore/rendering/style/RenderStyleConstants.h
@@ -134,7 +134,7 @@ enum WritingMode {
};
enum TextCombine {
- TextCombineNone, TextCombineCluster, TextCombineUpright
+ TextCombineNone, TextCombineHorizontal
};
enum EFillAttachment {
diff --git a/WebCore/rendering/style/StyleRareNonInheritedData.h b/WebCore/rendering/style/StyleRareNonInheritedData.h
index a53eee7..89437f6 100644
--- a/WebCore/rendering/style/StyleRareNonInheritedData.h
+++ b/WebCore/rendering/style/StyleRareNonInheritedData.h
@@ -103,7 +103,7 @@ public:
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 : 2; // CSS3 text-combine properties
+ unsigned m_textCombine : 1; // CSS3 text-combine properties
short m_counterIncrement;
short m_counterReset;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list