Title: [128456] trunk/Source/WebKit/blackberry
- Revision
- 128456
- Author
- [email protected]
- Date
- 2012-09-13 07:29:42 -0700 (Thu, 13 Sep 2012)
Log Message
[BlackBerry] ASSERT failure in InRegionScrollableArea::InRegionScrollableArea
https://bugs.webkit.org/show_bug.cgi?id=96645
PR #207307
Reviewed by George Staikos.
Patch by Antonio Gomes <[email protected]>
We use canScrollRenderBox to promote the layer as scrollable instead
of RenderBox::canScrollAndHasScrollableArea (see comment above the former).
We should assert against the former as well.
* Api/InRegionScroller.cpp:
(BlackBerry::WebKit::InRegionScrollerPrivate::canScrollRenderBox):
* Api/InRegionScroller_p.h:
(WebCore):
(InRegionScrollerPrivate):
* WebKitSupport/InRegionScrollableArea.cpp:
(BlackBerry::WebKit::InRegionScrollableArea::InRegionScrollableArea):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/Api/InRegionScroller.cpp (128455 => 128456)
--- trunk/Source/WebKit/blackberry/Api/InRegionScroller.cpp 2012-09-13 14:21:25 UTC (rev 128455)
+++ trunk/Source/WebKit/blackberry/Api/InRegionScroller.cpp 2012-09-13 14:29:42 UTC (rev 128456)
@@ -360,7 +360,7 @@
// with overflow-y: hidden and overflow-x: auto set.
// The version below fixes it.
// FIXME: Fix RenderBox::canBeScrolledAndHasScrollableArea method instead.
-static bool canScrollRenderBox(RenderBox* box)
+bool InRegionScrollerPrivate::canScrollRenderBox(RenderBox* box)
{
if (!box)
return false;
Modified: trunk/Source/WebKit/blackberry/Api/InRegionScroller_p.h (128455 => 128456)
--- trunk/Source/WebKit/blackberry/Api/InRegionScroller_p.h 2012-09-13 14:21:25 UTC (rev 128455)
+++ trunk/Source/WebKit/blackberry/Api/InRegionScroller_p.h 2012-09-13 14:29:42 UTC (rev 128456)
@@ -28,6 +28,7 @@
namespace WebCore {
class Frame;
class Node;
+class RenderBox;
class RenderObject;
class RenderLayer;
}
@@ -53,6 +54,8 @@
void clearDocumentData(const WebCore::Document*);
+ static bool canScrollRenderBox(WebCore::RenderBox*);
+
WebPagePrivate* m_webPage;
bool m_needsActiveScrollableAreaCalculation;
Modified: trunk/Source/WebKit/blackberry/ChangeLog (128455 => 128456)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-09-13 14:21:25 UTC (rev 128455)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-09-13 14:29:42 UTC (rev 128456)
@@ -1,3 +1,23 @@
+2012-09-13 Antonio Gomes <[email protected]>
+
+ [BlackBerry] ASSERT failure in InRegionScrollableArea::InRegionScrollableArea
+ https://bugs.webkit.org/show_bug.cgi?id=96645
+ PR #207307
+
+ Reviewed by George Staikos.
+
+ We use canScrollRenderBox to promote the layer as scrollable instead
+ of RenderBox::canScrollAndHasScrollableArea (see comment above the former).
+ We should assert against the former as well.
+
+ * Api/InRegionScroller.cpp:
+ (BlackBerry::WebKit::InRegionScrollerPrivate::canScrollRenderBox):
+ * Api/InRegionScroller_p.h:
+ (WebCore):
+ (InRegionScrollerPrivate):
+ * WebKitSupport/InRegionScrollableArea.cpp:
+ (BlackBerry::WebKit::InRegionScrollableArea::InRegionScrollableArea):
+
2012-09-12 Sheriff Bot <[email protected]>
Unreviewed, rolling out r127876.
Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InRegionScrollableArea.cpp (128455 => 128456)
--- trunk/Source/WebKit/blackberry/WebKitSupport/InRegionScrollableArea.cpp 2012-09-13 14:21:25 UTC (rev 128455)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InRegionScrollableArea.cpp 2012-09-13 14:29:42 UTC (rev 128456)
@@ -21,6 +21,7 @@
#include "Frame.h"
#include "LayerWebKitThread.h"
+#include "InRegionScroller_p.h"
#include "RenderBox.h"
#include "RenderLayer.h"
#include "RenderLayerBacking.h"
@@ -82,7 +83,7 @@
RenderBox* box = m_layer->renderBox();
ASSERT(box);
- ASSERT(box->canBeScrolledAndHasScrollableArea());
+ ASSERT(InRegionScrollerPrivate::canScrollRenderBox(box));
ScrollableArea* scrollableArea = static_cast<ScrollableArea*>(m_layer);
m_scrollPosition = m_webPage->mapToTransformed(scrollableArea->scrollPosition());
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
