Changeset 140046 in webkit

Timestamp:

Jan 17, 2013 2:38:23 PM (11 years ago)

Author:

yoli@rim.com

Message:

[BlackBerry] InRegionScroller should notify client before it deletes all the scrollables
​https://bugs.webkit.org/show_bug.cgi?id=107162

Reviewed by Rob Buis.
Internally reviewed by Gen Mak and Mike Fenton.

Move the notification code from notifyInRegionScrollStopped() to reset() as there are
other places where reset() gets called.

• Api/InRegionScroller.cpp:

(BlackBerry::WebKit::InRegionScrollerPrivate::reset):

• Api/WebPage.cpp:

(BlackBerry::WebKit::WebPagePrivate::notifyInRegionScrollStopped):

Location:

trunk/Source/WebKit/blackberry

Files:

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

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

@@ -81 +81 @@
 void InRegionScrollerPrivate::reset()
 {
+    // Notify the client side to clear InRegion scrollable areas before we destroy them here.
+    std::vector<Platform::ScrollViewBase*> emptyInRegionScrollableAreas;
+    m_webPage->m_client->notifyInRegionScrollableAreasChanged(emptyInRegionScrollableAreas);
+
     m_needsActiveScrollableAreaCalculation = false;
     for (size_t i = 0; i < m_activeInRegionScrollableAreas.size(); ++i)

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

@@ -1429 +1429 @@
 void WebPagePrivate::notifyInRegionScrollStopped()
 {
-    if (m_inRegionScroller->d->isActive()) {
-        // Notify the client side to clear InRegion scrollable areas before we destroy them here.
-        std::vector<Platform::ScrollViewBase*> emptyInRegionScrollableAreas;
-        m_client->notifyInRegionScrollableAreasChanged(emptyInRegionScrollableAreas);
+    if (m_inRegionScroller->d->isActive())
         m_inRegionScroller->d->reset();
-    }
 }
 

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-01-17  Yong Li  <yoli@rim.com>
+
+        [BlackBerry] InRegionScroller should notify client before it deletes all the scrollables
+        https://bugs.webkit.org/show_bug.cgi?id=107162
+
+        Reviewed by Rob Buis.
+        Internally reviewed by Gen Mak and Mike Fenton.
+
+        Move the notification code from notifyInRegionScrollStopped() to reset() as there are
+        other places where reset() gets called.
+
+        * Api/InRegionScroller.cpp:
+        (BlackBerry::WebKit::InRegionScrollerPrivate::reset):
+        * Api/WebPage.cpp:
+        (BlackBerry::WebKit::WebPagePrivate::notifyInRegionScrollStopped):
+
 2013-01-17  Mike Fenton  <mifenton@rim.com>