Changeset 151289 in webkit

Timestamp:

Jun 6, 2013 1:49:34 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Crash in InRegionScrollerPrivate::clearDocumentData
​https://bugs.webkit.org/show_bug.cgi?id=117317

Patch by Genevieve Mak <​gmak@rim.com> on 2013-06-06
Reviewed by Rob Buis.

PR #348994
Need to check the scrollableArea instead of asserting because in this case for the
selection subframe it is allowed to be null.

• Api/InRegionScroller.cpp:

(BlackBerry::WebKit::InRegionScrollerPrivate::clearDocumentData):

Location:

trunk/Source/WebKit/blackberry

Files:

• Api/InRegionScroller.cpp (modified) (1 diff)
• ChangeLog (modified) (1 diff)

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

@@ -114 +114 @@
 {
     InRegionScrollableArea* scrollableArea = static_cast<InRegionScrollableArea*>(m_selectionScrollView);
-    ASSERT(scrollableArea);
-    if (scrollableArea->document() == documentGoingAway)
+    if (scrollableArea && scrollableArea->document() == documentGoingAway)
         resetSelectionScrollView();
 

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-06-06  Genevieve Mak  <gmak@rim.com>
+
+        [BlackBerry] Crash in InRegionScrollerPrivate::clearDocumentData
+        https://bugs.webkit.org/show_bug.cgi?id=117317
+
+        Reviewed by Rob Buis.
+
+        PR #348994
+        Need to check the scrollableArea instead of asserting because in this case for the
+        selection subframe it is allowed to be null.
+
+        * Api/InRegionScroller.cpp:
+        (BlackBerry::WebKit::InRegionScrollerPrivate::clearDocumentData):
+
 2013-06-05  Bear Travis  <betravis@adobe.com>