diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-04-29 14:41:36 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-04-29 14:41:36 (GMT) |
| commit | eeaea3e7e3697c78567ad6ad51b6e30ccc712ee8 (patch) | |
| tree | fcb9fb53aa6ac04d91cd033b7cc89571da8f71e5 /src/3rdparty/webkit/WebKit | |
| parent | 60fb7f10ec84824d94960a2b4e0906ccf1f2df59 (diff) | |
| download | Qt-eeaea3e7e3697c78567ad6ad51b6e30ccc712ee8.zip Qt-eeaea3e7e3697c78567ad6ad51b6e30ccc712ee8.tar.gz Qt-eeaea3e7e3697c78567ad6ad51b6e30ccc712ee8.tar.bz2 | |
Updated WebKit to 1a40220a82197023c1b1ac6eff027be6dd3168d3
Changes integrated:
|| <https://webkit.org/b/38179> || [Qt] QWebPage::setViewportSize() forces two layout of the render tree ||
|| <https://webkit.org/b/31719> || [Qt] Loading of large page can take up to 10 seconds ||
Diffstat (limited to 'src/3rdparty/webkit/WebKit')
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp | 1 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/ChangeLog | 14 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp index 7bde2f6..f28524a 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp @@ -2208,7 +2208,6 @@ void QWebPage::setViewportSize(const QSize &size) const if (frame->d->frame && frame->d->frame->view()) { WebCore::FrameView* view = frame->d->frame->view(); view->setFrameRect(QRect(QPoint(0, 0), size)); - view->forceLayout(); view->adjustViewSize(); } } diff --git a/src/3rdparty/webkit/WebKit/qt/ChangeLog b/src/3rdparty/webkit/WebKit/qt/ChangeLog index defb2a6..8594f09 100644 --- a/src/3rdparty/webkit/WebKit/qt/ChangeLog +++ b/src/3rdparty/webkit/WebKit/qt/ChangeLog @@ -1,3 +1,17 @@ +2010-04-29 Andreas Kling <andreas.kling@nokia.com> + + Reviewed by Simon Hausmann. + + Remove unnecessary call to FrameView::forceLayout() in setViewportSize() + This prevents a double relayout on resize. + + https://bugs.webkit.org/show_bug.cgi?id=38179 + + Thanks to Nate Whetsell <nathan.whetsell@gmail.com> for spotting this. + + * Api/qwebpage.cpp: + (QWebPage::setViewportSize): + 2010-04-29 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by Tor Arne Vestbø. |