diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25 index d97f0c0f998e5ccc932bdab1d152b89f4b86afa3..5b7ad35174f4e066f2c898a1635c27d9b857f59d 100644 --- a/WebCore/ChangeLog-2003-10-25 +++ b/WebCore/ChangeLog-2003-10-25 @@ -1,3 +1,16 @@ +2003-01-20 David Hyatt + + Gah. Fix positioned objects and floating objects so that they + don't append themselves to the list of runs in normal flow. + An astoundingly basic bug. :( + + Reviewed by john + + * khtml/rendering/bidi.cpp: + (appendRunsForObject): + * khtml/rendering/render_flow.cpp: + (RenderFlow::addChildToFlow): + 2003-01-19 David Hyatt Fixes for 3150561 (blog articles vanish on stylesheet switch) and diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23 index d97f0c0f998e5ccc932bdab1d152b89f4b86afa3..5b7ad35174f4e066f2c898a1635c27d9b857f59d 100644 --- a/WebCore/ChangeLog-2005-08-23 +++ b/WebCore/ChangeLog-2005-08-23 @@ -1,3 +1,16 @@ +2003-01-20 David Hyatt + + Gah. Fix positioned objects and floating objects so that they + don't append themselves to the list of runs in normal flow. + An astoundingly basic bug. :( + + Reviewed by john + + * khtml/rendering/bidi.cpp: + (appendRunsForObject): + * khtml/rendering/render_flow.cpp: + (RenderFlow::addChildToFlow): + 2003-01-19 David Hyatt Fixes for 3150561 (blog articles vanish on stylesheet switch) and diff --git a/WebCore/khtml/rendering/bidi.cpp b/WebCore/khtml/rendering/bidi.cpp index da585df0c40f3a8af8e4dab00d73e61e4a9b902a..323ccf9a18f4936f5f62cff7cf4f8a481c5c5b37 100644 --- a/WebCore/khtml/rendering/bidi.cpp +++ b/WebCore/khtml/rendering/bidi.cpp @@ -264,7 +264,7 @@ inline QChar::Direction BidiIterator::direction() const static void appendRunsForObject(int start, int end, RenderObject* obj) { - if (start > end) + if (start > end || obj->isSpecial()) return; BidiIterator* nextMidpoint = (smidpoints && smidpoints->count()) ? smidpoints->at(0) : 0; diff --git a/WebCore/khtml/rendering/render_flow.cpp b/WebCore/khtml/rendering/render_flow.cpp index 590e740e7a5ec48776a5735f6b6acb51796802af..0d916532f58b2fa302ccdb7be7235b2ce1bd81c4 100644 --- a/WebCore/khtml/rendering/render_flow.cpp +++ b/WebCore/khtml/rendering/render_flow.cpp @@ -2088,7 +2088,7 @@ void RenderFlow::addChildToFlow(RenderObject* newChild, RenderObject* beforeChil } } } - else if (!m_childrenInline) + else if (!m_childrenInline && !newChild->isSpecial()) { // If we're inserting an inline child but all of our children are blocks, then we have to make sure // it is put into an anomyous block box. We try to use an existing anonymous box if possible, otherwise