← Back to branch summary

~ubuntu-branches/ubuntu/karmic/webkit/karmic-proposed

« back to all changes in this revision

Viewing changes to WebCore/rendering/RenderBlock.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Gustavo Noronha Silva
  • Date: 2009-05-15 18:30:58 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20090515183058-50q5exjo9b1kxy9s
Tags: 1.1.7-1
http://bugs.debian.org/526683
* New upstream release
* debian/libwebkit-1.0-2.symbols:
- updated with the new symbols in 1.1.7
* debian/libwebkit-dev.install, debian/libwebkit-dev.links,
  debian/rules:
- Build, and ship gtk-doc documentation (Closes: #526683)
* debian/copyright:
- updated.

Show diffs side-by-side

added added

removed removed

Lines of Context:
WebCore/rendering/RenderBlock.cpp
4845
4845
    m_maxMargin->m_bottomNeg = neg;
4846
4846
}
4847
4847
 
4848
 
void RenderBlock::absoluteRects(Vector<IntRect>& rects, int tx, int ty, bool topLevel)
 
4848
void RenderBlock::absoluteRects(Vector<IntRect>& rects, int tx, int ty)
4849
4849
{
4850
4850
    // For blocks inside inlines, we go ahead and include margins so that we run right up to the
4851
4851
    // inline boxes above and below us (thus getting merged with them to form a single irregular
4852
4852
    // shape).
4853
 
    if (topLevel && inlineContinuation()) {
 
4853
    if (inlineContinuation()) {
4854
4854
        rects.append(IntRect(tx, ty - collapsedMarginTop(),
4855
4855
                             width(), height() + collapsedMarginTop() + collapsedMarginBottom()));
4856
4856
        inlineContinuation()->absoluteRects(rects,
4857
4857
                                            tx - x() + inlineContinuation()->containingBlock()->x(),
4858
 
                                            ty - y() + inlineContinuation()->containingBlock()->y(), topLevel);
 
4858
                                            ty - y() + inlineContinuation()->containingBlock()->y());
4859
4859
    } else
4860
4860
        rects.append(IntRect(tx, ty, width(), height()));
4861
4861
}
4862
4862
 
4863
 
void RenderBlock::absoluteQuads(Vector<FloatQuad>& quads, bool topLevel)
 
4863
void RenderBlock::absoluteQuads(Vector<FloatQuad>& quads)
4864
4864
{
4865
4865
    // For blocks inside inlines, we go ahead and include margins so that we run right up to the
4866
4866
    // inline boxes above and below us (thus getting merged with them to form a single irregular
4867
4867
    // shape).
4868
 
    if (topLevel && inlineContinuation()) {
 
4868
    if (inlineContinuation()) {
4869
4869
        FloatRect localRect(0, -collapsedMarginTop(),
4870
4870
                            width(), height() + collapsedMarginTop() + collapsedMarginBottom());
4871
4871
        quads.append(localToAbsoluteQuad(localRect));
4872
 
        inlineContinuation()->absoluteQuads(quads, topLevel);
 
4872
        inlineContinuation()->absoluteQuads(quads);
4873
4873
    } else
4874
4874
        quads.append(RenderBox::localToAbsoluteQuad(FloatRect(0, 0, width(), height())));
4875
4875
}