Title: [127326] trunk/Source/WebKit/blackberry
- Revision
- 127326
- Author
- [email protected]
- Date
- 2012-08-31 15:17:03 -0700 (Fri, 31 Aug 2012)
Log Message
[BlackBerry] ASSERT failure in RenderBlock::checkPositionedObjectsNeedLayout
https://bugs.webkit.org/show_bug.cgi?id=95611
Reviewed by Antonio Gomes.
Patch by Jacky Jiang <[email protected]>
PR:200127
Remove r118405 now as we already have a new fix webkit/43f8394b for
that issue and it is not reproducible anymore after the removal.
In this way, we can get rid of this ASSERT failure as well.
Thanks Antonio for the suggestion.
* Api/WebPage.cpp:
(BlackBerry::WebKit::WebPagePrivate::setViewportSize):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (127325 => 127326)
--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2012-08-31 22:09:54 UTC (rev 127325)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2012-08-31 22:17:03 UTC (rev 127326)
@@ -3690,28 +3690,12 @@
if (!m_visible || !m_backingStore->d->isActive())
setShouldResetTilesWhenShown(true);
- bool needsLayout = false;
bool hasPendingOrientation = m_pendingOrientation != -1;
if (m_hasPendingSurfaceSizeChange) {
resizeSurfaceIfNeeded();
m_hasPendingSurfaceSizeChange = false;
}
- if (!hasPendingOrientation) {
- // If we are not rotating and we've started a viewport resize with
- // the Render tree in dirty state (i.e. it needs layout), lets
- // reset the needsLayout flag for now but set our own 'needsLayout'.
- //
- // Reason: calls like ScrollView::setFixedLayoutSize can trigger a layout
- // if the render tree needs it. We want to avoid it till the viewport resize
- // is actually done (i.e. ScrollView::setViewportSize gets called
- // further down the method).
- if (m_mainFrame->view()->needsLayout()) {
- m_mainFrame->view()->unscheduleRelayout();
- m_mainFrame->contentRenderer()->setNeedsLayout(false);
- needsLayout = true;
- }
- }
// The window buffers might have been recreated, cleared, moved, etc., so:
m_backingStore->d->windowFrontBufferState()->clearBlittedRegion();
@@ -3736,6 +3720,7 @@
setDefaultLayoutSize(transformedActualVisibleSize);
// Recompute our virtual viewport.
+ bool needsLayout = false;
static ViewportArguments defaultViewportArguments;
if (m_viewportArguments != defaultViewportArguments) {
// We may need to infer the width and height for the viewport with respect to the rotation.
Modified: trunk/Source/WebKit/blackberry/ChangeLog (127325 => 127326)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-08-31 22:09:54 UTC (rev 127325)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-08-31 22:17:03 UTC (rev 127326)
@@ -1,3 +1,19 @@
+2012-08-31 Jacky Jiang <[email protected]>
+
+ [BlackBerry] ASSERT failure in RenderBlock::checkPositionedObjectsNeedLayout
+ https://bugs.webkit.org/show_bug.cgi?id=95611
+
+ Reviewed by Antonio Gomes.
+
+ PR:200127
+ Remove r118405 now as we already have a new fix webkit/43f8394b for
+ that issue and it is not reproducible anymore after the removal.
+ In this way, we can get rid of this ASSERT failure as well.
+ Thanks Antonio for the suggestion.
+
+ * Api/WebPage.cpp:
+ (BlackBerry::WebKit::WebPagePrivate::setViewportSize):
+
2012-08-31 Joshua Netterfield <[email protected]>
[BlackBerry] Eliminate WebGL IT policy
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
