Changeset 127326 in webkit

Timestamp:

Aug 31, 2012, 3:17:03 PM (13 years ago)

Author:

zhajiang@rim.com

Message:

[BlackBerry] ASSERT failure in RenderBlock::checkPositionedObjectsNeedLayout
​https://bugs.webkit.org/show_bug.cgi?id=95611

Reviewed by Antonio Gomes.
Patch by Jacky Jiang <​zhajiang@rim.com>

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):

Location:

trunk/Source/WebKit/blackberry

Files:

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

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

@@ -3691 +3691 @@
         setShouldResetTilesWhenShown(true);
 
-    bool needsLayout = false;
     bool hasPendingOrientation = m_pendingOrientation != -1;
 
@@ -3697 +3696 @@
         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;
-        }
     }
 
@@ -3737 +3721 @@
 
     // Recompute our virtual viewport.
+    bool needsLayout = false;
     static ViewportArguments defaultViewportArguments;
     if (m_viewportArguments != defaultViewportArguments) {

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2012-08-31  Jacky Jiang  <zhajiang@rim.com>
+
+        [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  <jnetterfield@rim.com>