[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
hyatt
hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:03:16 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit edadb3e93a37724b27fb5d27cc630de09b92bbc4
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Oct 18 21:30:55 2003 +0000
Change the names of the border-spacing properties to border-horizontal-spacing and border-vertical-spacing.
Reviewed by NOBODY (Straightforward).
* khtml/css/cssparser.cpp:
(CSSParser::parseValue):
* khtml/css/cssproperties.c:
(findProp):
* khtml/css/cssproperties.h:
* khtml/css/cssproperties.in:
* khtml/css/cssstyleselector.cpp:
(khtml::CSSStyleSelector::applyRule):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5212 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 47dc121..bde6a5a 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,20 @@
2003-10-18 David Hyatt <hyatt at apple.com>
+ Change the names of the border-spacing properties to border-horizontal-spacing and border-vertical-spacing.
+
+ Reviewed by NOBODY (Straightforward).
+
+ * khtml/css/cssparser.cpp:
+ (CSSParser::parseValue):
+ * khtml/css/cssproperties.c:
+ (findProp):
+ * khtml/css/cssproperties.h:
+ * khtml/css/cssproperties.in:
+ * khtml/css/cssstyleselector.cpp:
+ (khtml::CSSStyleSelector::applyRule):
+
+2003-10-18 David Hyatt <hyatt at apple.com>
+
Fix for diveintomark className parsing bug. class="bigblue blue" would fail to match a rule with .blue.
The bug was in the selector matching code for class attributes.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 47dc121..bde6a5a 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,20 @@
2003-10-18 David Hyatt <hyatt at apple.com>
+ Change the names of the border-spacing properties to border-horizontal-spacing and border-vertical-spacing.
+
+ Reviewed by NOBODY (Straightforward).
+
+ * khtml/css/cssparser.cpp:
+ (CSSParser::parseValue):
+ * khtml/css/cssproperties.c:
+ (findProp):
+ * khtml/css/cssproperties.h:
+ * khtml/css/cssproperties.in:
+ * khtml/css/cssstyleselector.cpp:
+ (khtml::CSSStyleSelector::applyRule):
+
+2003-10-18 David Hyatt <hyatt at apple.com>
+
Fix for diveintomark className parsing bug. class="bigblue blue" would fail to match a rule with .blue.
The bug was in the selector matching code for class attributes.
diff --git a/WebCore/khtml/css/cssparser.cpp b/WebCore/khtml/css/cssparser.cpp
index 3919dd4..8a91325 100644
--- a/WebCore/khtml/css/cssparser.cpp
+++ b/WebCore/khtml/css/cssparser.cpp
@@ -689,8 +689,8 @@ bool CSSParser::parseValue( int propId, bool important )
break;
case CSS_PROP_BORDER_SPACING: {
- const int properties[2] = { CSS_PROP__KHTML_HORIZONTAL_BORDER_SPACING,
- CSS_PROP__KHTML_VERTICAL_BORDER_SPACING };
+ const int properties[2] = { CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING,
+ CSS_PROP__KHTML_BORDER_VERTICAL_SPACING };
int num = valueList->numValues;
if (num == 1) {
if (!parseValue(properties[0], important)) return false;
@@ -705,8 +705,8 @@ bool CSSParser::parseValue( int propId, bool important )
}
return false;
}
- case CSS_PROP__KHTML_HORIZONTAL_BORDER_SPACING:
- case CSS_PROP__KHTML_VERTICAL_BORDER_SPACING:
+ case CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING:
+ case CSS_PROP__KHTML_BORDER_VERTICAL_SPACING:
valid_primitive = validUnit(value, FLength|FNonNeg, strict&(!nonCSSHint));
break;
case CSS_PROP_SCROLLBAR_FACE_COLOR: // IE5.5
diff --git a/WebCore/khtml/css/cssproperties.c b/WebCore/khtml/css/cssproperties.c
index 41f4efa..0f1b5f2 100644
--- a/WebCore/khtml/css/cssproperties.c
+++ b/WebCore/khtml/css/cssproperties.c
@@ -232,8 +232,8 @@ findProp (register const char *str, register unsigned int len)
{"-khtml-box-lines", CSS_PROP__KHTML_BOX_LINES},
{"-khtml-box-align", CSS_PROP__KHTML_BOX_ALIGN},
{"marker-offset", CSS_PROP_MARKER_OFFSET},
- {"-khtml-vertical-border-spacing", CSS_PROP__KHTML_VERTICAL_BORDER_SPACING},
- {"-khtml-horizontal-border-spacing", CSS_PROP__KHTML_HORIZONTAL_BORDER_SPACING},
+ {"-khtml-border-vertical-spacing", CSS_PROP__KHTML_BORDER_VERTICAL_SPACING},
+ {"-khtml-border-horizontal-spacing", CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING},
{"border-left-color", CSS_PROP_BORDER_LEFT_COLOR},
{"outline-color", CSS_PROP_OUTLINE_COLOR},
{"scrollbar-track-color", CSS_PROP_SCROLLBAR_TRACK_COLOR},
@@ -417,8 +417,8 @@ static const char * const propertyList[] = {
"background-position-y",
"border-collapse",
"border-spacing",
-"-khtml-horizontal-border-spacing",
-"-khtml-vertical-border-spacing",
+"-khtml-border-horizontal-spacing",
+"-khtml-border-vertical-spacing",
"border-top-color",
"border-right-color",
"border-bottom-color",
diff --git a/WebCore/khtml/css/cssproperties.h b/WebCore/khtml/css/cssproperties.h
index 04b6fc6..a1fa2e0 100644
--- a/WebCore/khtml/css/cssproperties.h
+++ b/WebCore/khtml/css/cssproperties.h
@@ -16,8 +16,8 @@
#define CSS_PROP_BACKGROUND_POSITION_Y 7
#define CSS_PROP_BORDER_COLLAPSE 8
#define CSS_PROP_BORDER_SPACING 9
-#define CSS_PROP__KHTML_HORIZONTAL_BORDER_SPACING 10
-#define CSS_PROP__KHTML_VERTICAL_BORDER_SPACING 11
+#define CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING 10
+#define CSS_PROP__KHTML_BORDER_VERTICAL_SPACING 11
#define CSS_PROP_BORDER_TOP_COLOR 12
#define CSS_PROP_BORDER_RIGHT_COLOR 13
#define CSS_PROP_BORDER_BOTTOM_COLOR 14
diff --git a/WebCore/khtml/css/cssproperties.in b/WebCore/khtml/css/cssproperties.in
index 9e0725b..233d2dd 100644
--- a/WebCore/khtml/css/cssproperties.in
+++ b/WebCore/khtml/css/cssproperties.in
@@ -24,8 +24,8 @@ background-position-y
border-collapse
border-spacing
--khtml-horizontal-border-spacing
--khtml-vertical-border-spacing
+-khtml-border-horizontal-spacing
+-khtml-border-vertical-spacing
border-top-color
border-right-color
border-bottom-color
diff --git a/WebCore/khtml/css/cssstyleselector.cpp b/WebCore/khtml/css/cssstyleselector.cpp
index 8d8ffa9..8afbbd3 100644
--- a/WebCore/khtml/css/cssstyleselector.cpp
+++ b/WebCore/khtml/css/cssstyleselector.cpp
@@ -2172,13 +2172,13 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
style->setVerticalBorderSpacing(parentStyle->verticalBorderSpacing());
break;
}
- case CSS_PROP__KHTML_HORIZONTAL_BORDER_SPACING: {
+ case CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING: {
if (!primitiveValue) break;
short spacing = primitiveValue->computeLength(style, paintDeviceMetrics);
style->setHorizontalBorderSpacing(spacing);
break;
}
- case CSS_PROP__KHTML_VERTICAL_BORDER_SPACING: {
+ case CSS_PROP__KHTML_BORDER_VERTICAL_SPACING: {
if (!primitiveValue) break;
short spacing = primitiveValue->computeLength(style, paintDeviceMetrics);
style->setVerticalBorderSpacing(spacing);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list