Changeset 122162 in webkit

Timestamp:

Jul 9, 2012 4:05:17 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] PagePopupBlackBerry::closePopup() should always clear the pointer in WebPagePrivate
​https://bugs.webkit.org/show_bug.cgi?id=90817

Patch by Yong Li <​yoli@rim.com> on 2012-07-09
Reviewed by Rob Buis.

PR# 174085.
PagePopupBlackBerry::closePopup() should always clear the pointer in WebPagePrivate to avoid crashes.
This patch also removes unused variable m_parentPopup and its setter.

• Api/WebPage.cpp:

(BlackBerry::WebKit::WebPagePrivate::WebPagePrivate): Remove m_parentPopup.

• Api/WebPage_p.h:

(WebPagePrivate):

• WebCoreSupport/ChromeClientBlackBerry.cpp:

(WebCore::ChromeClientBlackBerry::closePagePopup):

• WebCoreSupport/PagePopupBlackBerry.cpp:

(WebCore::PagePopupBlackBerry::init): Remove the setParentPopup() call.
(WebCore::PagePopupBlackBerry::closePopup): Clear the reference in WebPagePrivate.

• WebCoreSupport/SelectPopupClient.cpp:

(WebCore::SelectPopupClient::setValueAndClosePopup): Add an assert for valid m_element.

Location:

trunk/Source/WebKit/blackberry

Files:

• Api/WebPage.cpp (modified) (2 diffs)
• Api/WebPage_p.h (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• WebCoreSupport/ChromeClientBlackBerry.cpp (modified) (1 diff)
• WebCoreSupport/PagePopupBlackBerry.cpp (modified) (2 diffs)
• WebCoreSupport/SelectPopupClient.cpp (modified) (1 diff)

trunk/Source/WebKit/blackberry/Api/WebPage.cpp

@@ -405 +405 @@
     , m_deferredTasksTimer(this, &WebPagePrivate::deferredTasksTimerFired)
     , m_selectPopup(0)
-    , m_parentPopup(0)
     , m_autofillManager(AutofillManager::create(this))
 {
@@ -6667 +6666 @@
 }
 
-void WebPagePrivate::setParentPopup(PagePopupBlackBerry* webPopup)
-{
-    m_parentPopup = webPopup;
-}
-
 void WebPagePrivate::setInspectorOverlayClient(WebCore::InspectorOverlay::InspectorOverlayClient* inspectorOverlayClient)
 {

trunk/Source/WebKit/blackberry/Api/WebPage_p.h

@@ -623 +623 @@
     // The popup that opened in this webpage
     WebCore::PagePopupBlackBerry* m_selectPopup;
-    // The popup that owned this webpage
-    WebCore::PagePopupBlackBerry* m_parentPopup;
 
     RefPtr<WebCore::AutofillManager> m_autofillManager;

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2012-07-09  Yong Li  <yoli@rim.com>
+
+        [BlackBerry] PagePopupBlackBerry::closePopup() should always clear the pointer in WebPagePrivate
+        https://bugs.webkit.org/show_bug.cgi?id=90817
+
+        Reviewed by Rob Buis.
+
+        PR# 174085.
+        PagePopupBlackBerry::closePopup() should always clear the pointer in WebPagePrivate to avoid crashes.
+        This patch also removes unused variable m_parentPopup and its setter.
+
+        * Api/WebPage.cpp:
+        (BlackBerry::WebKit::WebPagePrivate::WebPagePrivate): Remove m_parentPopup.
+        * Api/WebPage_p.h:
+        (WebPagePrivate):
+        * WebCoreSupport/ChromeClientBlackBerry.cpp:
+        (WebCore::ChromeClientBlackBerry::closePagePopup):
+        * WebCoreSupport/PagePopupBlackBerry.cpp:
+        (WebCore::PagePopupBlackBerry::init): Remove the setParentPopup() call.
+        (WebCore::PagePopupBlackBerry::closePopup): Clear the reference in WebPagePrivate.
+        * WebCoreSupport/SelectPopupClient.cpp:
+        (WebCore::SelectPopupClient::setValueAndClosePopup): Add an assert for valid m_element.
+
 2012-07-09  Mike Lattanzio  <mlattanzio@rim.com>
 

trunk/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.cpp

@@ -317 +317 @@
 void ChromeClientBlackBerry::closePagePopup(PagePopup*)
 {
-    if (hasOpenedPopup()) {
-        PagePopupBlackBerry* webPopup = m_webPagePrivate->m_webPage->popup();
-        webPopup->closePopup();
-        m_webPagePrivate->m_webPage->popupClosed();
-    }
+    if (!hasOpenedPopup())
+        return;
+
+    PagePopupBlackBerry* webPopup = m_webPagePrivate->m_webPage->popup();
+    webPopup->closePopup();
 }
 

trunk/Source/WebKit/blackberry/WebCoreSupport/PagePopupBlackBerry.cpp

@@ -68 +68 @@
 
     installDomFunction(webpage->d->mainFrame());
-
-    webpage->d->setParentPopup(this);
 
     return true;
@@ -163 +161 @@
     m_client->didClosePopup();
     m_webPagePrivate->client()->closePopupWebView();
+    m_webPagePrivate->m_webPage->popupClosed();
 }
 

trunk/Source/WebKit/blackberry/WebCoreSupport/SelectPopupClient.cpp

@@ -145 +145 @@
 void SelectPopupClient::setValueAndClosePopup(int, const String& stringValue)
 {
-
+    ASSERT(m_element);
     ASSERT(m_size == stringValue.length());