[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 06:52:10 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit a4351347576dd06a7b55d761ee06efa46b819dba
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Oct 22 20:06:12 2002 +0000
Removing konq's flow-around-floats hack for <blockquote> and
<dl>. These objects are allowed to flow under floats. Fixes
www.webreference.com's front page.
Also fixing a bug in my <td> margin collapsing quirk that
prevented lists (ol,ul,dl,menu,dir) from collapsing their
top margins into the td.
* khtml/css/html4.css:
* khtml/rendering/render_flow.cpp:
(RenderFlow::layoutBlockChildren):
(RenderFlow::addChild):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2409 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 8095fb1..7462e29 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,20 @@
2002-10-22 David Hyatt <hyatt at apple.com>
+ Removing konq's flow-around-floats hack for <blockquote> and
+ <dl>. These objects are allowed to flow under floats. Fixes
+ www.webreference.com's front page.
+
+ Also fixing a bug in my <td> margin collapsing quirk that
+ prevented lists (ol,ul,dl,menu,dir) from collapsing their
+ top margins into the td.
+
+ * khtml/css/html4.css:
+ * khtml/rendering/render_flow.cpp:
+ (RenderFlow::layoutBlockChildren):
+ (RenderFlow::addChild):
+
+2002-10-22 David Hyatt <hyatt at apple.com>
+
Fix a typo in my change to the h1 rule.
* khtml/css/html4.css:
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 8095fb1..7462e29 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,20 @@
2002-10-22 David Hyatt <hyatt at apple.com>
+ Removing konq's flow-around-floats hack for <blockquote> and
+ <dl>. These objects are allowed to flow under floats. Fixes
+ www.webreference.com's front page.
+
+ Also fixing a bug in my <td> margin collapsing quirk that
+ prevented lists (ol,ul,dl,menu,dir) from collapsing their
+ top margins into the td.
+
+ * khtml/css/html4.css:
+ * khtml/rendering/render_flow.cpp:
+ (RenderFlow::layoutBlockChildren):
+ (RenderFlow::addChild):
+
+2002-10-22 David Hyatt <hyatt at apple.com>
+
Fix a typo in my change to the h1 rule.
* khtml/css/html4.css:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 8095fb1..7462e29 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,20 @@
2002-10-22 David Hyatt <hyatt at apple.com>
+ Removing konq's flow-around-floats hack for <blockquote> and
+ <dl>. These objects are allowed to flow under floats. Fixes
+ www.webreference.com's front page.
+
+ Also fixing a bug in my <td> margin collapsing quirk that
+ prevented lists (ol,ul,dl,menu,dir) from collapsing their
+ top margins into the td.
+
+ * khtml/css/html4.css:
+ * khtml/rendering/render_flow.cpp:
+ (RenderFlow::layoutBlockChildren):
+ (RenderFlow::addChild):
+
+2002-10-22 David Hyatt <hyatt at apple.com>
+
Fix a typo in my change to the h1 rule.
* khtml/css/html4.css:
diff --git a/WebCore/khtml/css/html4.css b/WebCore/khtml/css/html4.css
index e5abeb3..4c4045f 100644
--- a/WebCore/khtml/css/html4.css
+++ b/WebCore/khtml/css/html4.css
@@ -84,7 +84,6 @@ address {
blockquote {
display: block;
margin: 1_qem 40px 1em 40px;
- -konq-flow-mode: -konq-around-floats
}
Q {
@@ -292,7 +291,7 @@ UL, MENU, DIR {
list-style-type: disc;
margin: 1_qem 0 1em 0;
padding-left: 40px;
- -konq-flow-mode: -konq-around-floats
+ -konq-flow-mode: -konq-around-floats;
}
OL {
@@ -300,7 +299,7 @@ OL {
list-style-type: decimal;
margin: 1_qem 0 1em 0;
padding-left: 40px;
- -konq-flow-mode: -konq-around-floats
+ -konq-flow-mode: -konq-around-floats;
}
LI {
@@ -329,7 +328,6 @@ DD {
DL {
display: block;
margin: 1_qem 0 1em 0;
- -konq-flow-mode: -konq-around-floats
}
DT {
diff --git a/WebCore/khtml/rendering/render_flow.cpp b/WebCore/khtml/rendering/render_flow.cpp
index 70b3e36..15c6707 100644
--- a/WebCore/khtml/rendering/render_flow.cpp
+++ b/WebCore/khtml/rendering/render_flow.cpp
@@ -458,7 +458,7 @@ void RenderFlow::layoutBlockChildren( bool relayoutChildren )
// See if the top margin is quirky. We only care if this child has
// margins that will collapse with us.
- bool topQuirk = (posTop-negTop) != 0 ? child->isTopMarginQuirk() : false;
+ bool topQuirk = child->isTopMarginQuirk();
if (canCollapseWithChildren && topMarginContributor && !clearOccurred) {
// This child is collapsing with the top of the
@@ -474,11 +474,11 @@ void RenderFlow::layoutBlockChildren( bool relayoutChildren )
// collapse it away, even if the margin is smaller (www.webreference.com
// has an example of this, a <dt> with 0.8em author-specified inside
// a <dl> inside a <td>.
- if (!topQuirk)
+ if (!topQuirk && (posTop-negTop))
m_topMarginQuirk = false;
}
- if (isTableCell() && topMarginContributor)
+ if (isTableCell() && topMarginContributor && (posTop-negTop))
topChildQuirk = topQuirk;
int ypos = m_height;
@@ -519,8 +519,8 @@ void RenderFlow::layoutBlockChildren( bool relayoutChildren )
if (child->style()->display() == INLINE)
prevPosMargin = prevNegMargin = 0;
- bottomChildQuirk =
- (prevPosMargin-prevNegMargin) != 0 ? child->isBottomMarginQuirk() : false;
+ if (prevPosMargin-prevNegMargin)
+ bottomChildQuirk = child->isBottomMarginQuirk();
}
child->setPos(child->xPos(), ypos);
}
@@ -1670,7 +1670,7 @@ void RenderFlow::addChild(RenderObject *newChild, RenderObject *beforeChild)
insertPseudoChild(RenderStyle::AFTER, newChild, beforeChild);
if ( madeBoxesNonInline )
- removeLeftoverAnonymousBoxes();
+ removeLeftoverAnonymousBoxes();
}
void RenderFlow::makeChildrenNonInline(RenderObject *box2Start)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list