Commit e44b3300 authored by zack's avatar zack

Fix the rendering crashes due to triggered

asserts and improve a bit the layout scheduling in the
Qt port


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@20509 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 701900a4
......@@ -204,10 +204,8 @@ void QWebFrame::resizeEvent(QResizeEvent *e)
{
QAbstractScrollArea::resizeEvent(e);
if (d->frame && d->frameView) {
RenderObject *renderer = d->frame->renderer();
if (renderer)
renderer->setNeedsLayout(true);
d->frameView->scheduleRelayout();
d->frame->forceLayout();
d->frame->view()->adjustViewSize();
}
d->_q_adjustScrollbars();
}
......@@ -238,9 +236,8 @@ void QWebFrame::paintEvent(QPaintEvent *ev)
time.start();
#endif
QRect clip = ev->rect();
if (d->frameView->layoutPending()) {
//qDebug()<<"pending "<<m_frameView->layoutPending()
// <<" delayed = "<<m_frameView->haveDelayedLayoutScheduled();
if (d->frameView->needsLayout()) {
d->frameView->layout();
}
QPainter p(viewport());
......
2007-03-27 Zack Rusin <zrusin@trolltech.com>
Fix the rendering crashes due triggered
asserts. Improve a bit the layout
scheduling.
* Api/qwebframe.cpp:
(QWebFrame::resizeEvent):
(QWebFrame::paintEvent):
* WebCoreSupport/FrameLoaderClientQt.cpp:
(WebCore::FrameLoaderClientQt::forceLayout):
2007-03-16 Lars Knoll <lars@trolltech.com>
Fix the Qt build once again.
......
......@@ -179,7 +179,8 @@ void FrameLoaderClientQt::makeRepresentation(DocumentLoader*)
void FrameLoaderClientQt::forceLayout()
{
notImplemented();
m_frame->view()->setNeedsLayout();
m_frame->view()->layout();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment