diff options
| author | Ariya Hidayat <ariya.hidayat@nokia.com> | 2009-05-19 19:17:08 +0200 |
|---|---|---|
| committer | Ariya Hidayat <ariya.hidayat@nokia.com> | 2009-05-19 19:19:05 +0200 |
| commit | c06dd76ca4b30fa71297e640a8eaf702d606e937 (patch) | |
| tree | 55a4c6ed47c9b4d624bb8bf85d29ba4a2d8f9049 /src/3rdparty/webkit/WebCore/plugins | |
| parent | 25952e13fb840cd1af3e1adbf60369b587e91fba (diff) | |
Updated WebKit from /home/ariya/dev/webkit/qtwebkit-4.5 to origin/qtwebkit-4.5 ( 40b523e9eaaba38c182e5a9c319f0069ebf98330 )
Changes in WebKit since the last update:
++ b/WebCore/ChangeLog
2009-05-11 Yael Aharon <yael.aharon@nokia.com>
Reviewed by Holger Freyther.
Change Qt port to match the mac and windows ports, and unregister plugins when plugins are stopped.
Not doing that can cause assersion failure.
https://bugs.webkit.org/show_bug.cgi?id=25702
* plugins/qt/PluginViewQt.cpp:
(WebCore::PluginView::stop):
Diffstat (limited to 'src/3rdparty/webkit/WebCore/plugins')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/plugins/qt/PluginViewQt.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/WebCore/plugins/qt/PluginViewQt.cpp b/src/3rdparty/webkit/WebCore/plugins/qt/PluginViewQt.cpp index c8dd0e5461..43c772fadd 100644 --- a/src/3rdparty/webkit/WebCore/plugins/qt/PluginViewQt.cpp +++ b/src/3rdparty/webkit/WebCore/plugins/qt/PluginViewQt.cpp @@ -58,6 +58,7 @@ #include "MouseEvent.h" #include "Page.h" #include "PlatformMouseEvent.h" +#include "PluginMainThreadScheduler.h" #include "RenderLayer.h" #include "Settings.h" @@ -225,6 +226,8 @@ void PluginView::stop() JSC::JSLock::DropAllLocks dropAllLocks(false); + PluginMainThreadScheduler::scheduler().unregisterPlugin(m_instance); + // Clear the window m_npWindow.window = 0; if (m_plugin->pluginFuncs()->setwindow && !m_plugin->quirks().contains(PluginQuirkDontSetNullWindowHandleOnDestroy)) { |