-- trunk/KDE/kdelibs/khtml/rendering/render_block.cpp  2010/01/28 10:28:10     1081434

++ trunk/KDE/kdelibs/khtml/rendering/render_block.cpp  2010/01/28 10:28:19     1081435

    // We also clear floats if we are too big to sit on the same line as a float, and happen to flow around floats.

    // We also clear floats if we are too big to sit on the same line as

    // FIXME: Note that the remaining space checks aren't quite accurate, since you should be able to clear only some floats (the minimum # needed

    // a float, and happen to flow around floats.

    // to fit) and not all (we should be using nearestFloatBottom and looping).

    if (!result && child->flowAroundFloats() && !style()->width().isAuto()) {

    if (!result && child->flowAroundFloats()) {

        bool canClearLine;

        bool canClear = true;

        int lw = lineWidth(yPos, &canClearLine);

        bool needsRecalc = child->usesLineWidth();

        if (((child->style()->width().isPercent() && child->width() > lw) ||

        int cury = yPos;

            (child->style()->width().isFixed() && child->minWidth() > lw)) &&

        int childw = 0;

              child->minWidth() <= availableWidth() && canClearLine)

        int aw = availableWidth();

            result = qMax(0, floatBottom() - yPos);

        while (true) {

            int curw = lineWidth(cury, &canClear);

            if (!canClear || curw == aw)

                return cury-yPos;

            if (!childw || needsRecalc) {

                int oy = child->yPos();

                int ow = child->width();

                child->setPos(child->xPos(), cury);

                child->calcWidth();

                childw = child->width();

                child->setPos(child->xPos(), oy);

                child->setWidth(ow);

            }

            if (childw <= curw)

                return cury-yPos;

            if (!(cury = nearestFloatBottom(cury)))

                return 0;

        }