diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-07-02 16:07:20 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-07-02 16:07:20 +0200 |
| commit | 9951dd835e8c0ccad1a0c92eb2af96f778242fc3 (patch) | |
| tree | 106c600119bdcc601e7ae6fbe8e9315967d261a0 /src/3rdparty/webkit/WebCore | |
| parent | e720c269b5f98da6c2b430df84cd86c3aede3d81 (diff) | |
| download | qt4-tools-9951dd835e8c0ccad1a0c92eb2af96f778242fc3.tar.gz | |
Updated WebKit to d59845f6fec84f15da116f50a1a0e52ce26116e9
Integrated:
|| <https://webkit.org/b/36618> || [Qt] LayoutTests/http/tests/appcache/fallback.html crashes ||
|| <https://webkit.org/b/39359> || [Qt] TiledBackingStore updates broken when not using resizesToContents mode ||
Diffstat (limited to 'src/3rdparty/webkit/WebCore')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/ChangeLog | 13 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebCore/platform/network/qt/ResourceHandleQt.cpp | 4 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebCore/platform/qt/QWebPageClient.h | 2 |
3 files changed, 18 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog index 5ba94de578..a4ae758caa 100644 --- a/src/3rdparty/webkit/WebCore/ChangeLog +++ b/src/3rdparty/webkit/WebCore/ChangeLog @@ -1,3 +1,16 @@ +2010-03-26 Shu Chang <chang.shu@nokia.com> + + Reviewed by Eric Seidel. + + [Qt] Prevent referring d->m_job in the future because calling abort() + deletes the instance itself. + https://bugs.webkit.org/show_bug.cgi?id=36618 + + Test: http/tests/appcache/fallback.html + + * platform/network/qt/ResourceHandleQt.cpp: + (WebCore::ResourceHandle::cancel): + 2010-06-28 Sam Magnuson <smagnuson@netflix.com> Reviewed by Kenneth Rohde Christiansen. diff --git a/src/3rdparty/webkit/WebCore/platform/network/qt/ResourceHandleQt.cpp b/src/3rdparty/webkit/WebCore/platform/network/qt/ResourceHandleQt.cpp index f006c08add..aaa306aa65 100644 --- a/src/3rdparty/webkit/WebCore/platform/network/qt/ResourceHandleQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/network/qt/ResourceHandleQt.cpp @@ -144,8 +144,10 @@ bool ResourceHandle::start(Frame* frame) void ResourceHandle::cancel() { - if (d->m_job) + if (d->m_job) { d->m_job->abort(); + d->m_job = 0; + } } bool ResourceHandle::loadsBlocked() diff --git a/src/3rdparty/webkit/WebCore/platform/qt/QWebPageClient.h b/src/3rdparty/webkit/WebCore/platform/qt/QWebPageClient.h index 8e48d1f0f0..d3978b8c2e 100644 --- a/src/3rdparty/webkit/WebCore/platform/qt/QWebPageClient.h +++ b/src/3rdparty/webkit/WebCore/platform/qt/QWebPageClient.h @@ -90,6 +90,8 @@ public: virtual QStyle* style() const = 0; virtual QRectF graphicsItemVisibleRect() const { return QRectF(); } + + virtual bool viewResizesToContentsEnabled() const = 0; protected: #ifndef QT_NO_CURSOR |