Title: [120091] trunk/Source/WebKit/blackberry
Revision
120091
Author
commit-qu...@webkit.org
Date
2012-06-12 10:28:59 -0700 (Tue, 12 Jun 2012)

Log Message

[BlackBerry] Fix crash in InputHandler
https://bugs.webkit.org/show_bug.cgi?id=88808

Patch by Crystal Zhang <haizh...@rim.com> on 2012-06-12
Reviewed by Antonio Gomes.

m_page is destroyed before InputHandler, so should move the call to destroy popup to chromeDestroyed().

* WebCoreSupport/ChromeClientBlackBerry.cpp:
(WebCore::ChromeClientBlackBerry::chromeDestroyed():
* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::InputHandler::~InputHandler):

Modified Paths

Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (120090 => 120091)


--- trunk/Source/WebKit/blackberry/ChangeLog	2012-06-12 17:11:35 UTC (rev 120090)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-06-12 17:28:59 UTC (rev 120091)
@@ -1,3 +1,17 @@
+2012-06-12  Crystal Zhang  <haizh...@rim.com>
+
+        [BlackBerry] Fix crash in InputHandler
+        https://bugs.webkit.org/show_bug.cgi?id=88808
+
+        Reviewed by Antonio Gomes.
+
+        m_page is destroyed before InputHandler, so should move the call to destroy popup to chromeDestroyed().
+
+        * WebCoreSupport/ChromeClientBlackBerry.cpp:
+        (WebCore::ChromeClientBlackBerry::chromeDestroyed():
+        * WebKitSupport/InputHandler.cpp:
+        (BlackBerry::WebKit::InputHandler::~InputHandler):
+
 2012-06-12  Yong Li  <y...@rim.com>
 
         [BlackBerry] Use a safer way to shrink JS memory usage

Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.cpp (120090 => 120091)


--- trunk/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.cpp	2012-06-12 17:11:35 UTC (rev 120090)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.cpp	2012-06-12 17:28:59 UTC (rev 120091)
@@ -148,6 +148,8 @@
 
 void ChromeClientBlackBerry::chromeDestroyed()
 {
+    // Destroy popup if we have.
+    closePagePopup(0);
     delete this;
 }
 

Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (120090 => 120091)


--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-06-12 17:11:35 UTC (rev 120090)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-06-12 17:28:59 UTC (rev 120091)
@@ -125,7 +125,6 @@
 
 InputHandler::~InputHandler()
 {
-    m_webPage->m_page->chrome()->client()->closePagePopup(0);
 }
 
 static BlackBerryInputType convertInputType(const HTMLInputElement* inputElement)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to