[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 07:12:48 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 3205416bd7d772e3ccb72795ddabc94f837c36c9
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Dec 9 07:12:19 2002 +0000
Fix for 3007276, styles do not cascade properly through
tables. The font was being reset to the default font
(konq_default) when it needed to be reset to the body's font.
I added a new font family value called konq_body and the
style system resolves that value to be the body's font family list.
Reviewed by: gramps and mjs
* khtml/css/cssstyleselector.cpp:
* khtml/html/html_tableimpl.cpp:
(HTMLTableElementImpl::attach):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2973 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index f3a87dc..92dd818 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,19 @@
2002-12-08 David Hyatt <hyatt at apple.com>
+ Fix for 3007276, styles do not cascade properly through
+ tables. The font was being reset to the default font
+ (konq_default) when it needed to be reset to the body's font.
+ I added a new font family value called konq_body and the
+ style system resolves that value to be the body's font family list.
+
+ Reviewed by: gramps and mjs
+
+ * khtml/css/cssstyleselector.cpp:
+ * khtml/html/html_tableimpl.cpp:
+ (HTMLTableElementImpl::attach):
+
+2002-12-08 David Hyatt <hyatt at apple.com>
+
Fix for 3121814. Forms inside table elements (tbody and table
etc.) can be inline. Just remove the assert and replace it
with a bailout.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index f3a87dc..92dd818 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,19 @@
2002-12-08 David Hyatt <hyatt at apple.com>
+ Fix for 3007276, styles do not cascade properly through
+ tables. The font was being reset to the default font
+ (konq_default) when it needed to be reset to the body's font.
+ I added a new font family value called konq_body and the
+ style system resolves that value to be the body's font family list.
+
+ Reviewed by: gramps and mjs
+
+ * khtml/css/cssstyleselector.cpp:
+ * khtml/html/html_tableimpl.cpp:
+ (HTMLTableElementImpl::attach):
+
+2002-12-08 David Hyatt <hyatt at apple.com>
+
Fix for 3121814. Forms inside table elements (tbody and table
etc.) can be inline. Just remove the assert and replace it
with a bailout.
diff --git a/WebCore/khtml/css/cssstyleselector.cpp b/WebCore/khtml/css/cssstyleselector.cpp
index 1230979..59423ef 100644
--- a/WebCore/khtml/css/cssstyleselector.cpp
+++ b/WebCore/khtml/css/cssstyleselector.cpp
@@ -27,6 +27,7 @@
#include "css/csshelper.h"
#include "rendering/render_object.h"
#include "html/html_documentimpl.h"
+#include "html/html_elementimpl.h"
#include "xml/dom_elementimpl.h"
#include "dom/css_rule.h"
#include "dom/css_value.h"
@@ -2569,6 +2570,28 @@ void CSSStyleSelector::applyRule( DOM::CSSProperty *prop )
face = settings->stdFontName();
fontDef.setGenericFamily(FontDef::eStandard);
}
+ else if (face == "konq_body") {
+ // Obtain the <body> element's font information,
+ // and use its family list.
+ DOM::DocumentImpl* doc = element->getDocument();
+ if (doc && doc->isHTMLDocument()) {
+ DOM::HTMLDocumentImpl* htmldoc =
+ static_cast<DOM::HTMLDocumentImpl*>(doc);
+ DOM::HTMLElementImpl* body = htmldoc->body();
+ if (body && body->renderer()) {
+ FontDef& bodyFontDef =
+ (FontDef&)(body->renderer()->style()->htmlFont().fontDef);
+ fontDef.family = bodyFontDef.firstFamily();
+ fontDef.genericFamily = bodyFontDef.genericFamily;
+ if (style->setFontDef( fontDef )) {
+ fontDirty = true;
+ }
+ break;
+ }
+ }
+
+ face = settings->stdFontName();
+ }
if ( !face.isEmpty() ) {
if (!currFamily) {
diff --git a/WebCore/khtml/html/html_tableimpl.cpp b/WebCore/khtml/html/html_tableimpl.cpp
index 50d0f69..c93ec7b 100644
--- a/WebCore/khtml/html/html_tableimpl.cpp
+++ b/WebCore/khtml/html/html_tableimpl.cpp
@@ -82,7 +82,7 @@ void HTMLTableElementImpl::attach()
if ( getDocument()->parseMode() != DocumentImpl::Strict ) {
addCSSProperty( CSS_PROP_FONT_SIZE, CSS_VAL_MEDIUM );
addCSSProperty( CSS_PROP_COLOR, getDocument()->textColor() );
- addCSSProperty( CSS_PROP_FONT_FAMILY, "konq_default" );
+ addCSSProperty( CSS_PROP_FONT_FAMILY, "konq_body" );
}
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list