← Back to branch summary

~jconti/ubuntu/oneiric/webkit/fix_doc_path

« back to all changes in this revision

Viewing changes to WebCore/rendering/RenderFrameSet.cpp

http://bugs.debian.org/547797
http://bugs.debian.org/548499
* New upstream (semi-stable) release
* Fix building on IA64 (Closes: #547797)
  Thanks to Colin Watson <cjwatson@ubuntu.com>
* Fix building on alpha (Closes: #548499)
* Fix building on amd64 FreeBSD

Show diffs side-by-side

added added

removed removed

Lines of Context:
WebCore/rendering/RenderFrameSet.cpp
416
416
        for (int c = 0; c < cols; ++c) {
417
417
            FrameEdgeInfo edgeInfo;
418
418
            if (child->isFrameSet())
419
 
                edgeInfo = static_cast<RenderFrameSet*>(child)->edgeInfo();
 
419
                edgeInfo = toRenderFrameSet(child)->edgeInfo();
420
420
            else
421
 
                edgeInfo = static_cast<RenderFrame*>(child)->edgeInfo();
 
421
                edgeInfo = toRenderFrame(child)->edgeInfo();
422
422
            fillFromEdgeInfo(edgeInfo, r, c);
423
423
            child = child->nextSibling();
424
424
            if (!child)
590
590
void RenderFrameSet::setIsResizing(bool isResizing)
591
591
{
592
592
    m_isResizing = isResizing;
593
 
    for (RenderObject* p = parent(); p; p = p->parent())
594
 
        if (p->isFrameSet())
595
 
            static_cast<RenderFrameSet*>(p)->m_isChildResizing = isResizing;
 
593
    for (RenderObject* ancestor = parent(); ancestor; ancestor = ancestor->parent()) {
 
594
        if (ancestor->isFrameSet())
 
595
            toRenderFrameSet(ancestor)->m_isChildResizing = isResizing;
 
596
    }
596
597
    if (Frame* frame = document()->frame())
597
598
        frame->eventHandler()->setResizingFrameSet(isResizing ? frameSet() : 0);
598
599
}