[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:37:11 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 99ef19f77f7029ad56b04ca41539a660a3af3a80
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Apr 15 18:25:06 2003 +0000
A collection of fixes.
(1) Don't lay out positioned elements so early in
layoutInlineChildren. They need to get a layout only after
all the normal flow kids have gotten a layout (and this happens
already in layoutPositionedObjects).
(2) Fix a mistake with overflow:hidden. I was applying the
overflow-clip for positioned elements only if you had defined
clip using the clip property. This makes iht.com look better
(although it still misrenders pretty badly due to some JS error
we hit in the source).
(3) Patch RenderText's height method to give more accurate
information. This affects all the layout tests. :)
Reviewed by darin
* khtml/rendering/bidi.cpp:
* khtml/rendering/render_layer.cpp:
(RenderLayer::constructZTree):
* khtml/rendering/render_text.cpp:
(RenderText::height):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4108 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index db5e152..bfdaf57 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,29 @@
+2003-04-15 David Hyatt <hyatt at apple.com>
+
+ A collection of fixes.
+
+ (1) Don't lay out positioned elements so early in
+ layoutInlineChildren. They need to get a layout only after
+ all the normal flow kids have gotten a layout (and this happens
+ already in layoutPositionedObjects).
+
+ (2) Fix a mistake with overflow:hidden. I was applying the
+ overflow-clip for positioned elements only if you had defined
+ clip using the clip property. This makes iht.com look better
+ (although it still misrenders pretty badly due to some JS error
+ we hit in the source).
+
+ (3) Patch RenderText's height method to give more accurate
+ information. This affects all the layout tests. :)
+
+ Reviewed by darin
+
+ * khtml/rendering/bidi.cpp:
+ * khtml/rendering/render_layer.cpp:
+ (RenderLayer::constructZTree):
+ * khtml/rendering/render_text.cpp:
+ (RenderText::height):
+
2003-04-14 Trey Matteson <trey at apple.com>
3009051 - Find on Page stops (once) at end of page, should wrap automatically WebKit
@@ -38,6 +64,7 @@
Return a nil for a null element instead of croaking.
(-[WebCoreDOMNode initWithImpl:DOM::]): Ditto.
+>>>>>>> 1.1620
2003-04-14 Maciej Stachowiak <mjs at apple.com>
Reviewed by Trey.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index db5e152..bfdaf57 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,29 @@
+2003-04-15 David Hyatt <hyatt at apple.com>
+
+ A collection of fixes.
+
+ (1) Don't lay out positioned elements so early in
+ layoutInlineChildren. They need to get a layout only after
+ all the normal flow kids have gotten a layout (and this happens
+ already in layoutPositionedObjects).
+
+ (2) Fix a mistake with overflow:hidden. I was applying the
+ overflow-clip for positioned elements only if you had defined
+ clip using the clip property. This makes iht.com look better
+ (although it still misrenders pretty badly due to some JS error
+ we hit in the source).
+
+ (3) Patch RenderText's height method to give more accurate
+ information. This affects all the layout tests. :)
+
+ Reviewed by darin
+
+ * khtml/rendering/bidi.cpp:
+ * khtml/rendering/render_layer.cpp:
+ (RenderLayer::constructZTree):
+ * khtml/rendering/render_text.cpp:
+ (RenderText::height):
+
2003-04-14 Trey Matteson <trey at apple.com>
3009051 - Find on Page stops (once) at end of page, should wrap automatically WebKit
@@ -38,6 +64,7 @@
Return a nil for a null element instead of croaking.
(-[WebCoreDOMNode initWithImpl:DOM::]): Ditto.
+>>>>>>> 1.1620
2003-04-14 Maciej Stachowiak <mjs at apple.com>
Reviewed by Trey.
diff --git a/WebCore/khtml/rendering/bidi.cpp b/WebCore/khtml/rendering/bidi.cpp
index 5a3ff9a..056b2e1 100644
--- a/WebCore/khtml/rendering/bidi.cpp
+++ b/WebCore/khtml/rendering/bidi.cpp
@@ -1249,10 +1249,10 @@ void RenderBlock::layoutInlineChildren(bool relayoutChildren)
//kdDebug(6041) << "layouting replaced or floating child" << endl;
if (relayoutChildren || o->style()->width().isPercent() || o->style()->height().isPercent())
o->setLayouted(false);
- if( !o->layouted() )
- o->layout();
if (o->isPositioned())
o->containingBlock()->insertPositionedObject(o);
+ else if( !o->layouted() )
+ o->layout();
}
else if(o->isText()) // FIXME: Should be able to combine deleteLineBoxes/Runs
static_cast<RenderText *>(o)->deleteRuns();
diff --git a/WebCore/khtml/rendering/render_layer.cpp b/WebCore/khtml/rendering/render_layer.cpp
index 8ab7383..b218bb7 100644
--- a/WebCore/khtml/rendering/render_layer.cpp
+++ b/WebCore/khtml/rendering/render_layer.cpp
@@ -500,11 +500,11 @@ RenderLayer::constructZTree(QRect overflowClipRect, QRect posClipRect,
QRect newOverflowClip = m_object->getOverflowClipRect(x,y);
overflowClipRect = newOverflowClip.intersect(overflowClipRect);
clipRectToApply = clipRectToApply.intersect(newOverflowClip);
+ if (m_object->isPositioned() || m_object->isRelPositioned())
+ posClipRect = newOverflowClip.intersect(posClipRect);
}
if (m_object->hasClip()) {
QRect newPosClip = m_object->getClipRect(x,y);
- if (m_object->hasOverflowClip())
- newPosClip = newPosClip.intersect(m_object->getOverflowClipRect(x,y));
posClipRect = newPosClip.intersect(posClipRect);
overflowClipRect = overflowClipRect.intersect(posClipRect);
clipRectToApply = clipRectToApply.intersect(newPosClip);
diff --git a/WebCore/khtml/rendering/render_text.cpp b/WebCore/khtml/rendering/render_text.cpp
index 93c39f8..ec777dc 100644
--- a/WebCore/khtml/rendering/render_text.cpp
+++ b/WebCore/khtml/rendering/render_text.cpp
@@ -1149,15 +1149,9 @@ void RenderText::setText(DOMStringImpl *text, bool force)
int RenderText::height() const
{
- int retval;
+ int retval = 0;
if ( m_lines.count() )
retval = m_lines[m_lines.count()-1]->m_y + m_lineHeight - m_lines[0]->m_y;
- else
- retval = metrics( false ).height();
-
- // FIXME: Totally bogus.
- retval += borderTop() + paddingTop() + borderBottom() + paddingBottom();
-
return retval;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list