Title: [126996] trunk/Source/WebKit/blackberry
- Revision
- 126996
- Author
- toniki...@webkit.org
- Date
- 2012-08-29 06:00:34 -0700 (Wed, 29 Aug 2012)
Log Message
[BlackBerry] crash while trying to scroll any inner frame
https://bugs.webkit.org/show_bug.cgi?id=95287
PR #198510
Reviewed by George Staikos.
Patch by Antonio Gomes <ago...@rim.com>
Set the starting point of scrolling (slow path only still)
for inner frames. It was left over as set to 0 by r126474.
In practice, patch fixes a crash on gmail.com desktop edition.
* WebKitSupport/InRegionScrollableArea.cpp:
(BlackBerry::WebKit::InRegionScrollableArea::InRegionScrollableArea):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/ChangeLog (126995 => 126996)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-08-29 12:40:27 UTC (rev 126995)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-08-29 13:00:34 UTC (rev 126996)
@@ -1,3 +1,19 @@
+2012-08-28 Antonio Gomes <ago...@rim.com>
+
+ [BlackBerry] crash while trying to scroll any inner frame
+ https://bugs.webkit.org/show_bug.cgi?id=95287
+ PR #198510
+
+ Reviewed by George Staikos.
+
+ Set the starting point of scrolling (slow path only still)
+ for inner frames. It was left over as set to 0 by r126474.
+
+ In practice, patch fixes a crash on gmail.com desktop edition.
+
+ * WebKitSupport/InRegionScrollableArea.cpp:
+ (BlackBerry::WebKit::InRegionScrollableArea::InRegionScrollableArea):
+
2012-08-28 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r126914.
Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InRegionScrollableArea.cpp (126995 => 126996)
--- trunk/Source/WebKit/blackberry/WebKitSupport/InRegionScrollableArea.cpp 2012-08-29 12:40:27 UTC (rev 126995)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InRegionScrollableArea.cpp 2012-08-29 13:00:34 UTC (rev 126996)
@@ -76,7 +76,8 @@
m_scrollsVertically = view->contentsHeight() > view->visibleHeight();
m_overscrollLimitFactor = 0.0; // FIXME eventually support overscroll
- m_cachedCompositedScrollableLayer = 0; // FIXME: Needs composited layer for inner frames.
+ m_camouflagedCompositedScrollableLayer = reinterpret_cast<unsigned>(m_layer->enclosingElement()); // FIXME: Needs composited layer for inner frames.
+ m_cachedNonCompositedScrollableNode = m_layer->enclosingElement();
} else { // RenderBox-based elements case (scrollable boxes (div's, p's, textarea's, etc)).
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
