Title: [131793] trunk/Source/WebKit/blackberry
- Revision
- 131793
- Author
- commit-qu...@webkit.org
- Date
- 2012-10-18 12:53:38 -0700 (Thu, 18 Oct 2012)
Log Message
Crash in InRegionScrollableArea constructor while loading page
https://bugs.webkit.org/show_bug.cgi?id=99733
Patch by John Griggs <jgri...@rim.com> on 2012-10-18
Reviewed by Antonio Gomes.
Check scrollLayer and avoid constructing InRegionScrollableArea when it is NULL.
* Api/InRegionScroller.cpp:
(BlackBerry::WebKit::InRegionScrollerPrivate::calculateInRegionScrollableAreasForPoint):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/Api/InRegionScroller.cpp (131792 => 131793)
--- trunk/Source/WebKit/blackberry/Api/InRegionScroller.cpp 2012-10-18 19:46:03 UTC (rev 131792)
+++ trunk/Source/WebKit/blackberry/Api/InRegionScroller.cpp 2012-10-18 19:53:38 UTC (rev 131793)
@@ -219,6 +219,9 @@
return;
}
+ if (!renderView->compositor()->scrollLayer())
+ continue;
+
if (canScrollInnerFrame(view->frame())) {
pushBackInRegionScrollable(new InRegionScrollableArea(m_webPage, layer));
continue;
Modified: trunk/Source/WebKit/blackberry/ChangeLog (131792 => 131793)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-10-18 19:46:03 UTC (rev 131792)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-10-18 19:53:38 UTC (rev 131793)
@@ -1,3 +1,17 @@
+2012-10-18 John Griggs <jgri...@rim.com>
+
+ 2012-10-18 John Griggs <jgri...@rim.com>
+
+ Crash in InRegionScrollableArea constructor while loading page
+ https://bugs.webkit.org/show_bug.cgi?id=99733
+
+ Reviewed by Antonio Gomes.
+
+ Check scrollLayer and avoid constructing InRegionScrollableArea when it is NULL.
+
+ * Api/InRegionScroller.cpp:
+ (BlackBerry::WebKit::InRegionScrollerPrivate::calculateInRegionScrollableAreasForPoint):
+
2012-10-17 Jacky Jiang <zhaji...@rim.com>
[BlackBerry] Possible redundant zoomToInitialScaleOnLoad() in WebPagePrivate::setLoadState
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
