Changeset 93490 in webkit

Timestamp:

Aug 21, 2011 8:53:54 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

[Qt] Fixes premature plugin unload bug
​https://bugs.webkit.org/show_bug.cgi?id=66628

Patch by Lindsay Mathieson <​lindsay.mathieson@gmail.com> on 2011-08-21
Reviewed by Benjamin Poulain.

The QtPlatformPlugin was allocated on the stack, so its destructor is unloading the
plugin at the end of the scope. This patch moves the local creation of QtPlatformPlugin
to class member (TextCheckerClientQt::m_platformPlugin), preventing premature unloading
of plugin.

• WebCoreSupport/TextCheckerClientQt.cpp:

(WebCore::TextCheckerClientQt::loadSpellChecker):

• WebCoreSupport/TextCheckerClientQt.h:

Location:

trunk/Source/WebKit/qt

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/TextCheckerClientQt.cpp (modified) (1 diff)
• WebCoreSupport/TextCheckerClientQt.h (modified) (2 diffs)

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2011-08-21  Lindsay Mathieson  <lindsay.mathieson@gmail.com>
+
+        [Qt] Fixes premature plugin unload bug
+        https://bugs.webkit.org/show_bug.cgi?id=66628
+        
+        Reviewed by Benjamin Poulain.
+
+        The QtPlatformPlugin was allocated on the stack, so its destructor is unloading the
+        plugin at the end of the scope. This patch moves the local creation of QtPlatformPlugin
+        to class member (TextCheckerClientQt::m_platformPlugin), preventing premature unloading
+        of plugin.            
+        
+        * WebCoreSupport/TextCheckerClientQt.cpp:
+        (WebCore::TextCheckerClientQt::loadSpellChecker):
+        * WebCoreSupport/TextCheckerClientQt.h:
+
 2011-08-17  Adam Roben  <aroben@apple.com>
 

trunk/Source/WebKit/qt/WebCoreSupport/TextCheckerClientQt.cpp

@@ -153 +153 @@
         return true;
 
-    QtPlatformPlugin platformPlugin;
-    if ((m_spellChecker = platformPlugin.createSpellChecker()))
+    if ((m_spellChecker = m_platformPlugin.createSpellChecker()))
         return true;
 

trunk/Source/WebKit/qt/WebCoreSupport/TextCheckerClientQt.h

@@ -30 +30 @@
 #define TextCheckerClientQt_h
 
+#include "QtPlatformPlugin.h"
 #include "TextCheckerClient.h"
 #include "qwebkitplatformplugin.h"
@@ -59 +60 @@
 
 private:
+    QtPlatformPlugin m_platformPlugin;
     OwnPtr<QWebSpellChecker> m_spellChecker;
 };