diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-04-09 12:15:07 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-04-09 12:15:07 (GMT) |
| commit | 8f75ee78746a311434db3fe5a3793c6f725fa210 (patch) | |
| tree | bf730bd8bbcd2c0414e16581cfe3f67186d263df /src/3rdparty/webkit/WebCore | |
| parent | 11aebece9ecc3214dd7a8006d980e90dcbddb577 (diff) | |
| download | Qt-8f75ee78746a311434db3fe5a3793c6f725fa210.zip Qt-8f75ee78746a311434db3fe5a3793c6f725fa210.tar.gz Qt-8f75ee78746a311434db3fe5a3793c6f725fa210.tar.bz2 | |
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 14feb62c96ffe2c37e3e2fdac4e370fdbc76ef62 )
Changes in WebKit/qt since the last update:
* r51006 -- https://bugs.webkit.org/show_bug.cgi?id=31475 -- Crash in StringHash::equal due to unaligned string data
Diffstat (limited to 'src/3rdparty/webkit/WebCore')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/ChangeLog | 13 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebCore/plugins/symbian/PluginViewSymbian.cpp | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog index a2bd5c3..b7e46c7 100644 --- a/src/3rdparty/webkit/WebCore/ChangeLog +++ b/src/3rdparty/webkit/WebCore/ChangeLog @@ -1,3 +1,16 @@ +2010-04-09 David Leong <david.leong@nokia.com> + + Reviewed by Simon Hausmann. + + [Qt] Symbian apps crash on exit due to a bad qObject_cast. + + https://bugs.webkit.org/show_bug.cgi?id=37303 + + Added check for NULL to avoid the crash. + + * plugins/symbian/PluginViewSymbian.cpp: + (WebCore::PluginView::platformDestroy): + 2009-11-15 Dave Tapuska <dtapuska@rim.com> Reviewed by George Staikos. diff --git a/src/3rdparty/webkit/WebCore/plugins/symbian/PluginViewSymbian.cpp b/src/3rdparty/webkit/WebCore/plugins/symbian/PluginViewSymbian.cpp index 86f5f6c..0cce1fd 100644 --- a/src/3rdparty/webkit/WebCore/plugins/symbian/PluginViewSymbian.cpp +++ b/src/3rdparty/webkit/WebCore/plugins/symbian/PluginViewSymbian.cpp @@ -453,7 +453,7 @@ bool PluginView::platformStart() void PluginView::platformDestroy() { QWebPageClient* client = m_parentFrame->view()->hostWindow()->platformPageClient(); - if (QGraphicsWebView *webView = qobject_cast<QGraphicsWebView*>(client->pluginParent())) + if (client && qobject_cast<QGraphicsWebView*>(client->pluginParent())) delete static_cast<PluginContainerSymbian*>(platformPluginWidget())->proxy(); else delete platformPluginWidget(); |