[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:38:15 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit ac48647cc8d3b3a48c95814aa86b5a7f72879591
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed May 5 00:16:21 2004 +0000
Fix for 3641331, make sure <th> elements don't reset text-align to center if they inherit a specified
value.
Also remove the styles from <abbr> and <acronym>.
Reviewed by darin
* khtml/css/cssstyleselector.cpp:
(khtml::CSSStyleSelector::adjustRenderStyle):
* khtml/css/html4.css:
* khtml/css/quirks.css:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6540 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 72fe80f..0fecd15 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,17 @@
+2004-05-04 David Hyatt <hyatt at apple.com>
+
+ Fix for 3641331, make sure <th> elements don't reset text-align to center if they inherit a specified
+ value.
+
+ Also remove the styles from <abbr> and <acronym>.
+
+ Reviewed by darin
+
+ * khtml/css/cssstyleselector.cpp:
+ (khtml::CSSStyleSelector::adjustRenderStyle):
+ * khtml/css/html4.css:
+ * khtml/css/quirks.css:
+
2004-05-04 Ken Kocienda <kocienda at apple.com>
Reviewed by Hyatt
diff --git a/WebCore/khtml/css/cssstyleselector.cpp b/WebCore/khtml/css/cssstyleselector.cpp
index 5d94bd4..8f1116b 100644
--- a/WebCore/khtml/css/cssstyleselector.cpp
+++ b/WebCore/khtml/css/cssstyleselector.cpp
@@ -845,6 +845,10 @@ void CSSStyleSelector::adjustRenderStyle(RenderStyle* style, DOM::ElementImpl *e
if (e && (e->id() == ID_FRAME || e->id() == ID_FRAMESET))
style->setPosition(STATIC);
+ // Table headers with a text-align of auto will change the text-align to center.
+ if (e && e->id() == ID_TH && style->textAlign() == TAAUTO)
+ style->setTextAlign(CENTER);
+
// Mutate the display to BLOCK or TABLE for certain cases, e.g., if someone attempts to
// position or float an inline, compact, or run-in. Cache the original display, since it
// may be needed for positioned elements that have to compute their static normal flow
diff --git a/WebCore/khtml/css/html4.css b/WebCore/khtml/css/html4.css
index a7d8aa8..b8302c8 100644
--- a/WebCore/khtml/css/html4.css
+++ b/WebCore/khtml/css/html4.css
@@ -10,454 +10,410 @@
@namespace "http://www.w3.org/1999/xhtml";
html {
- display: block;
+ display: block
}
-/*
- * head and its children all have display=none
- */
+/* The children of the <head> element all have display:none */
head {
- display: none;
+ display: none
}
meta {
- display: none;
+ display: none
}
title {
- display: none;
+ display: none
}
link {
- display: none;
+ display: none
}
style {
- display: none;
+ display: none
}
script {
- display: none;
+ display: none
}
-/*
- * generic block level elements
- */
+/* generic block-level elements */
body {
display: block;
- margin: 8px;
+ margin: 8px
}
p {
- display: block;
- margin: 1.0__qem 0px;
+ display: block;
+ margin: 1.0__qem 0px
}
div {
- display: block;
+ display: block
}
layer {
- display: block;
+ display: block
}
marquee {
display: inline-block;
- overflow: marquee;
+ overflow: marquee
}
address {
- display: block;
+ display: block
}
blockquote {
- display: block;
- margin: 1__qem 40px 1em 40px;
+ display: block;
+ margin: 1__qem 40px 1em 40px
}
-Q {
- display: inline;
+q {
+ display: inline
}
-Q:before {
- content: '"';
- /* content: open-quote; */
+q:before {
+ content: '"'
+ /* FIXME: content: open-quote; */
}
-Q:after {
- content: '"';
- /* content: close-quote; */
+q:after {
+ content: '"'
+ /* FIXME: content: close-quote; */
}
-IFRAME, EMBED, OBJECT {
- width: 300px; height:150px;
+iframe, embed, object {
+ width: 300px;
+ height: 150px
}
-CENTER {
- display: block;
- /* special centering to be able to emulate the html4/netscape behaviour */
- text-align: -khtml-center;
+center {
+ display: block;
+ /* special centering to be able to emulate the html4/netscape behaviour */
+ text-align: -khtml-center
}
-
-HR {
- display: block;
- margin: 0.5em auto;
- border-style: inset;
- border-width: 1px;
-}
-MAP {
- display: inline;
-}
+hr {
+ display: block;
+ margin: 0.5em auto;
+ border-style: inset;
+ border-width: 1px
+}
+map {
+ display: inline
+}
-/*
- * heading elements
- */
+/* heading elements */
-H1 {
- display: block;
- font-size: 2em;
- margin: .67__qem 0 .67em 0;
- font-weight: bold;
+h1 {
+ display: block;
+ font-size: 2em;
+ margin: .67__qem 0 .67em 0;
+ font-weight: bold
}
-H2 {
- display: block;
- font-size: 1.5em;
- margin: .83__qem 0 .83em 0;
- font-weight: bold;
+h2 {
+ display: block;
+ font-size: 1.5em;
+ margin: .83__qem 0 .83em 0;
+ font-weight: bold
}
-H3 {
- display: block;
- font-size: 1.17em;
- margin: 1__qem 0 1em 0;
- font-weight: bold;
+h3 {
+ display: block;
+ font-size: 1.17em;
+ margin: 1__qem 0 1em 0;
+ font-weight: bold
}
-H4 {
- display: block;
- margin: 1.33__qem 0 1.33em 0;
- font-weight: bold;
+h4 {
+ display: block;
+ margin: 1.33__qem 0 1.33em 0;
+ font-weight: bold
}
-H5 {
- display: block;
- font-size: .83em;
- margin: 1.67__qem 0 1.67em 0;
- font-weight: bold;
+h5 {
+ display: block;
+ font-size: .83em;
+ margin: 1.67__qem 0 1.67em 0;
+ font-weight: bold
}
-H6 {
- display: block;
- font-size: .67em;
- margin: 2.33__qem 0 2.33em 0;
- font-weight: bold;
+h6 {
+ display: block;
+ font-size: .67em;
+ margin: 2.33__qem 0 2.33em 0;
+ font-weight: bold
}
-/*
- * tables
- */
+/* tables */
-TABLE {
- display: table;
- border-collapse: separate;
- text-align: -khtml-auto;
- border-spacing: 2px;
- border-color: gray;
+table {
+ display: table;
+ border-collapse: separate;
+ text-align: -khtml-auto;
+ border-spacing: 2px;
+ border-color: gray
}
-TABLE[align="center"] {
- margin-left: auto;
- margin-right: auto;
+table[align="center"] {
+ margin-left: auto;
+ margin-right: auto
}
-THEAD {
- display: table-header-group;
+thead {
+ display: table-header-group;
vertical-align: middle;
- border-color: inherit;
+ border-color: inherit
}
-TBODY {
- display: table-row-group;
+tbody {
+ display: table-row-group;
vertical-align: middle;
- border-color: inherit;
+ border-color: inherit
}
-TFOOT {
- display: table-footer-group;
+tfoot {
+ display: table-footer-group;
vertical-align: middle;
- border-color: inherit;
+ border-color: inherit
}
-COL {
- display: table-column;
+col {
+ display: table-column
}
-
-COLGROUP {
- display: table-column-group;
+
+colgroup {
+ display: table-column-group
}
-TR {
- display: table-row;
- vertical-align: inherit;
- border-color: inherit;
+tr {
+ display: table-row;
+ vertical-align: inherit;
+ border-color: inherit
}
-
-
-TD, TH {
- display: table-cell;
- vertical-align: inherit;
+
+td, th {
+ display: table-cell;
+ vertical-align: inherit
}
-
-TH {
- font-weight: bolder;
- text-align: center;
+
+th {
+ font-weight: bold
}
-CAPTION {
- display: table-caption;
- text-align: -khtml-center;
+caption {
+ display: table-caption;
+ text-align: -khtml-center
}
-/*
- * Lists
- */
+/* Lists */
-UL, MENU, DIR {
- display: block;
- list-style-type: disc;
- margin: 1__qem 0 1em 0;
- padding-left: 40px; /* For RTL, we need to implement padding-start */
+ul, menu, dir {
+ display: block;
+ list-style-type: disc;
+ margin: 1__qem 0 1em 0;
+ padding-left: 40px /* FIXME: For RTL, we need to implement padding-start */
}
-OL {
- display: block;
- list-style-type: decimal;
- margin: 1__qem 0 1em 0;
- padding-left: 40px; /* For RTL, we need to implement padding-start */
+ol {
+ display: block;
+ list-style-type: decimal;
+ margin: 1__qem 0 1em 0;
+ padding-left: 40px /* FIXME: For RTL, we need to implement padding-start */
}
-LI {
- display: list-item;
+li {
+ display: list-item
}
-
-UL UL, OL UL {
- list-style-type: circle;
+ul ul, ol ul {
+ list-style-type: circle
}
-OL OL UL, OL UL UL, UL OL UL, UL UL UL {
- list-style-type: square;
+ol ol ul, ol ul ul, ul ol ul, ul ul ul {
+ list-style-type: square
}
-
-DD {
- display: block;
- margin-left: 40px; /* For RTL, we need to implement margin-start */
+dd {
+ display: block;
+ margin-left: 40px /* FIXME: For RTL, we need to implement margin-start */
}
-DL {
- display: block;
- margin: 1__qem 0 1em 0;
+dl {
+ display: block;
+ margin: 1__qem 0 1em 0
}
-DT {
- display: block;
+dt {
+ display: block
}
-OL UL,
-UL OL,
-UL UL,
-OL OL {
- margin-top: 0;
- margin-bottom: 0;
+ol ul, ul ol, ul ul, ol ol {
+ margin-top: 0;
+ margin-bottom: 0
}
-/*
- * form elements
- */
+/* form elements */
-FORM {
- display: block;
- margin: 0__qem 0 1em 0;
+form {
+ display: block;
+ margin: 0__qem 0 1em 0
}
-LEGEND {
+legend {
display: block;
padding-left: 2px;
padding-right: 2px;
- border: none;
+ border: none
}
-FIELDSET {
+fieldset {
display: block;
margin-left: 2px;
margin-right: 2px;
padding: 0.75em 0.625em;
- border: 2px groove ThreeDFace;
+ border: 2px groove ThreeDFace
}
-BUTTON {
- display: inline-block;
- border: 2px outset ButtonFace;
- background-color: ButtonFace;
- color: ButtonText;
- padding: 2px 2px 2px 2px;
- cursor: default;
+button {
+ display: inline-block;
+ border: 2px outset ButtonFace;
+ background-color: ButtonFace;
+ color: ButtonText;
+ padding: 2px 2px 2px 2px;
+ cursor: default
}
-BUTTON:active {
- border-style: inset;
+button:active {
+ border-style: inset
}
-INPUT, TEXTAREA {
- text-align: -khtml-auto;
+input, textarea {
+ text-align: -khtml-auto
}
-/* XXX Need to implement support for CSS2 system fonts, so that I don't have to hard code this.
- -dwh */
-INPUT, TEXTAREA, SELECT, BUTTON {
+/* FIXME: Need to implement support for CSS2 system fonts, so that I don't have to hard code Lucida Grande. */
+input, textarea, select, button {
margin: 0__qem;
- font: 11px 'Lucida Grande';
+ font: 11px 'Lucida Grande'
}
-INPUT[type="hidden"] {
- display: none;
+input[type="hidden"] {
+ display: none
}
-INPUT[type="radio"], INPUT[type="checkbox"] {
- margin: 3px 0.5ex;
+input[type="radio"], input[type="checkbox"] {
+ margin: 3px 0.5ex
}
-OPTION,
-OPTGROUP,
-AREA,
-PARAM {
- display: none;
+option, optgroup, area, param {
+ display: none
}
-/*
- * inline elements
- */
+/* inline elements */
-U,
-INS {
- text-decoration: underline;
+u, ins {
+ text-decoration: underline
}
-STRONG,
-B {
- font-weight: bolder;
+strong, b {
+ font-weight: bolder
}
-I,
-CITE,
-EM,
-VAR,
-ADDRESS {
- font-style: italic;
+i, cite, em, var, address {
+ font-style: italic
}
-TT,
-CODE,
-KBD,
-SAMP {
- font-family: monospace;
+tt, code, kbd, samp {
+ font-family: monospace
}
-PRE,
-XMP,
-PLAINTEXT {
- display: block;
- font-family: monospace;
- white-space: pre;
- margin: 1__qem 0;
+pre, xmp, plaintext {
+ display: block;
+ font-family: monospace;
+ white-space: pre;
+ margin: 1__qem 0
}
-BIG {
- font-size: larger;
+big {
+ font-size: larger;
}
-SMALL {
- font-size: smaller;
+small {
+ font-size: smaller;
}
-S,
-STRIKE,
-DEL {
- text-decoration: line-through;
+s, strike, del {
+ text-decoration: line-through
}
-SUB {
- vertical-align: sub;
- font-size: smaller;
+sub {
+ vertical-align: sub;
+ font-size: smaller
}
-SUP {
- vertical-align: super;
- font-size: smaller;
+
+sup {
+ vertical-align: super;
+ font-size: smaller
}
-abbr,
-acronym {
- font-style: italic;
+nobr {
+ display: inline;
+ white-space: nowrap
}
-:focus { outline: auto 3px #1f5ccf }
-html:focus,body:focus { outline: none }
-a:-khtml-any-link { color: -khtml-link; text-decoration: underline; }
-a:-khtml-any-link:active { color: -khtml-activelink; }
+wbr {
+ white-space: normal
+}
-/* Bidirectionality settings (do not change) */
+/* End Inline Elements */
-BDO[DIR="ltr"] {
- direction: ltr;
- unicode-bidi: bidi-override;
+:focus {
+ outline: auto 3px #1f5ccf
}
-BDO[DIR="rtl"] {
- direction: rtl;
- unicode-bidi: bidi-override;
+html:focus, body:focus {
+ outline: none
}
-
-/* Elements that are block-level in HTML4 */
-/* ### don't support unicode-bidi at the moment
- ADDRESS, BLOCKQUOTE, BODY, DD, DIV, DL, DT, FIELDSET,
- FORM, FRAME, FRAMESET, H1, H2, H3, H4, H5, H6, IFRAME,
- NOSCRIPT, NOFRAMES, OBJECT, OL, P, UL, APPLET, CENTER,
- DIR, HR, MENU, PRE, LI, TABLE, TR, THEAD, TBODY, TFOOT,
- COL, COLGROUP, TD, TH, CAPTION
- { unicode-bidi: embed }
-*/
-
-/* End bidi settings */
-/*
- * other elements
- */
+a:-khtml-any-link {
+ color: -khtml-link;
+ text-decoration: underline
+}
-noframes {
- display: none;
+a:-khtml-any-link:active {
+ color: -khtml-activelink
}
-frameset {
- display: block;
+/* Bidirectionality settings */
+
+bdo[dir="ltr"] {
+ direction: ltr;
+ unicode-bidi: bidi-override
}
-frame {
- display: block;
+bdo[dir="rtl"] {
+ direction: rtl;
+ unicode-bidi: bidi-override
}
+
+/* End bidi settings */
-nobr {
- display: inline;
- white-space: nowrap;
+/* other elements */
+
+noframes {
+ display: none
}
-wbr {
- white-space: normal;
+frameset, frame {
+ display: block
}
/* noscript is handled internally, as it depends on the html settings */
diff --git a/WebCore/khtml/css/quirks.css b/WebCore/khtml/css/quirks.css
index 3888f91..7406fe0 100644
--- a/WebCore/khtml/css/quirks.css
+++ b/WebCore/khtml/css/quirks.css
@@ -19,7 +19,7 @@ img[align="right"] {
/* Tables reset both line-height and white-space in quirks mode.
Compatible with WinIE. Note that font-family is *not reset*. */
-TABLE {
+table {
white-space: normal;
line-height: normal;
font-weight: normal;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list