[webkit-changes] cvs commit: WebCore/khtml/rendering
render_flexbox.cpp
Timothy
thatcher at opensource.apple.com
Fri Nov 11 11:40:26 PST 2005
thatcher 05/11/11 11:40:26
Modified: . Tag: Safari-1-3-branch ChangeLog
khtml/rendering Tag: Safari-1-3-branch render_flexbox.cpp
Log:
Fix for http://bugzilla.opendarwin.org/show_bug.cgi?id=4170
and <rdar://problem/3849434> SLIDER: Article length goes from a
subject line, back to the whole article, when decreasing (4170)
Patch by Ricci Adams
Reviewed by Dave Hyatt
* khtml/rendering/render_flexbox.cpp:
(RenderFlexibleBox::layoutVerticalBox): clamp the value
Revision Changes Path
No revision
No revision
1.335.2.14 +12 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.335.2.13
retrieving revision 1.335.2.14
diff -u -r1.335.2.13 -r1.335.2.14
--- ChangeLog 11 Nov 2005 18:24:14 -0000 1.335.2.13
+++ ChangeLog 11 Nov 2005 19:40:21 -0000 1.335.2.14
@@ -1,5 +1,17 @@
2005-11-11 Timothy Hatcher <timothy at apple.com>
+ Fix for http://bugzilla.opendarwin.org/show_bug.cgi?id=4170
+ and <rdar://problem/3849434> SLIDER: Article length goes from a
+ subject line, back to the whole article, when decreasing (4170)
+
+ Patch by Ricci Adams
+ Reviewed by Dave Hyatt
+
+ * khtml/rendering/render_flexbox.cpp:
+ (RenderFlexibleBox::layoutVerticalBox): clamp the value
+
+2005-11-11 Timothy Hatcher <timothy at apple.com>
+
Merged fix from TOT to Safari-1-3-branch
2005-11-11 Beth Dakin <bdakin at apple.com>
No revision
No revision
1.21.10.1 +1 -0 WebCore/khtml/rendering/render_flexbox.cpp
Index: render_flexbox.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_flexbox.cpp,v
retrieving revision 1.21
retrieving revision 1.21.10.1
diff -u -r1.21 -r1.21.10.1
--- render_flexbox.cpp 17 Aug 2004 22:03:28 -0000 1.21
+++ render_flexbox.cpp 11 Nov 2005 19:40:25 -0000 1.21.10.1
@@ -727,6 +727,7 @@
if (lineCount <= numVisibleLines) continue;
int newHeight = blockChild->heightForLineCount(numVisibleLines);
+ if (newHeight == -1 && numVisibleLines == 0) newHeight = 0;
if (newHeight == child->height()) continue;
child->setChildNeedsLayout(true);
More information about the webkit-changes
mailing list