diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-07-26 14:31:43 (GMT) |
---|---|---|
committer | Jesper Thomschutz <jesper.thomschutz@nokia.com> | 2010-08-02 07:58:40 (GMT) |
commit | 0cb96302e364831dd0826d0916e39de277a9fc02 (patch) | |
tree | 546f240b213459c185b09de4798c412830fcaf59 /src/3rdparty/webkit/WebKit/qt/ChangeLog | |
parent | 97a37b14e772e2b493787a5df994697e18e11243 (diff) | |
download | Qt-0cb96302e364831dd0826d0916e39de277a9fc02.zip Qt-0cb96302e364831dd0826d0916e39de277a9fc02.tar.gz Qt-0cb96302e364831dd0826d0916e39de277a9fc02.tar.bz2 |
Updated WebKit to 0be9ff9f2b1ec2b748885ac15299bc1c65aca590
Integrated changes:
|| <https://webkit.org/b/42474> || Spatial navigation: do not consider outline for focusable element boundaries ||
|| <https://webkit.org/b/41484> || [Qt] Clamp color stops passed to QGradient to 1.0 ||
|| <https://webkit.org/b/29381> || [Qt] [Regression] QWebView::setHtml() executes script body twice ||
|| <https://webkit.org/b/30879> || Loading HTML with a JS alert() when the DocumentLoader has been set to not defer data load results in ASSERT ||
(cherry picked from commit 9f657356f897d8bf4c92965a8bc1af82107e2379)
Diffstat (limited to 'src/3rdparty/webkit/WebKit/qt/ChangeLog')
-rw-r--r-- | src/3rdparty/webkit/WebKit/qt/ChangeLog | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/ChangeLog b/src/3rdparty/webkit/WebKit/qt/ChangeLog index 1075b24..b2bff0c 100644 --- a/src/3rdparty/webkit/WebKit/qt/ChangeLog +++ b/src/3rdparty/webkit/WebKit/qt/ChangeLog @@ -1,3 +1,51 @@ +2009-10-30 Tor Arne Vestbø <tor.arne.vestbo@nokia.com> + + Reviewed by Kenneth Rohde Christiansen. + + [Qt] Use the default timeout interval for JS as the HTML tokenizer delay for setHtml() + + This ensures that long-running JavaScript (for example due to a modal alert() dialog), + will not trigger a deferred load after only 500ms (the default tokenizer delay) while + still giving a reasonable timeout (10 seconds) to prevent deadlock. + + https://bugs.webkit.org/show_bug.cgi?id=29381 + + * Api/qwebframe.cpp: Document the behaviour + * WebCoreSupport/FrameLoaderClientQt.cpp: set the custom tokenizer delay for substitute loads + * tests/qwebframe/tst_qwebframe.cpp: Add test + +2010-07-07 Tor Arne Vestbø <tor.arne.vestbo@nokia.com> + + Reviewed by Darin Adler. + + Prevent assertion/duplicate loads for non-deferred subtitute-data loads + + https://bugs.webkit.org/show_bug.cgi?id=30879 + + MainResourceLoader uses the member m_initialRequest to store requests for future + deferred loads. When doing the actual load in handleDataLoadNow(), we therefore + have to clear this request so that subsequent entries into the loader will not + start yet another load. + + This can happen as a result of a PageGroupLoadDeferrer going out of scope when + returning from Chrome::runJavaScriptAlert(), which calls setDeferredLoading(false), + but only in the case of using both substitute-data and non-deferred main resource + load together. That's why two new DRT functions were added: + + * queueLoadHTMLString() + * setDeferMainResourceLoad() + + The change adds DRT hooks for Mac, Win and Qt for these two functions. For Mac + and Win the hook uses new SPI in WebDataSource. For Qt a new static member was + added to the FrameLoaderClientQt and accessed though DumpRenderTreeSupportQt. + + * WebCoreSupport/DumpRenderTreeSupportQt.cpp: + (DumpRenderTreeSupportQt::setDeferMainResourceDataLoad): + * WebCoreSupport/DumpRenderTreeSupportQt.h: + * WebCoreSupport/FrameLoaderClientQt.cpp: + (WebCore::FrameLoaderClientQt::createDocumentLoader): + * WebCoreSupport/FrameLoaderClientQt.h: + 2010-07-23 David Boddie <dboddie@trolltech.com> Reviewed by Simon Hausmann. |