Title: [140950] trunk/Source/WebCore
- Revision
- 140950
- Author
- [email protected]
- Date
- 2013-01-28 00:24:36 -0800 (Mon, 28 Jan 2013)
Log Message
Unreviewed, rolling out r140554.
http://trac.webkit.org/changeset/140554
https://bugs.webkit.org/show_bug.cgi?id=108057
Caused tables/table-section-overflow-clip-crash.html and
bug2479-5.html to crash. (Requested by keishi on #webkit).
Patch by Sheriff Bot <[email protected]> on 2013-01-28
* rendering/RenderBox.cpp:
(WebCore::RenderBox::minPreferredLogicalWidth):
(WebCore::RenderBox::maxPreferredLogicalWidth):
* rendering/mathml/RenderMathMLOperator.cpp:
(WebCore::RenderMathMLOperator::computePreferredLogicalWidths):
* rendering/mathml/RenderMathMLRoot.cpp:
(WebCore::RenderMathMLRoot::computePreferredLogicalWidths):
* rendering/mathml/RenderMathMLRow.cpp:
(WebCore::RenderMathMLRow::computePreferredLogicalWidths):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (140949 => 140950)
--- trunk/Source/WebCore/ChangeLog 2013-01-28 08:05:35 UTC (rev 140949)
+++ trunk/Source/WebCore/ChangeLog 2013-01-28 08:24:36 UTC (rev 140950)
@@ -1,3 +1,22 @@
+2013-01-28 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r140554.
+ http://trac.webkit.org/changeset/140554
+ https://bugs.webkit.org/show_bug.cgi?id=108057
+
+ Caused tables/table-section-overflow-clip-crash.html and
+ bug2479-5.html to crash. (Requested by keishi on #webkit).
+
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::minPreferredLogicalWidth):
+ (WebCore::RenderBox::maxPreferredLogicalWidth):
+ * rendering/mathml/RenderMathMLOperator.cpp:
+ (WebCore::RenderMathMLOperator::computePreferredLogicalWidths):
+ * rendering/mathml/RenderMathMLRoot.cpp:
+ (WebCore::RenderMathMLRoot::computePreferredLogicalWidths):
+ * rendering/mathml/RenderMathMLRow.cpp:
+ (WebCore::RenderMathMLRow::computePreferredLogicalWidths):
+
2013-01-24 Yury Semikhatsky <[email protected]>
Web Inspector: each node in a detached DOM tree is shown in its own "detached DOM tree" entry in heap profiler
Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (140949 => 140950)
--- trunk/Source/WebCore/rendering/RenderBox.cpp 2013-01-28 08:05:35 UTC (rev 140949)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2013-01-28 08:24:36 UTC (rev 140950)
@@ -858,24 +858,16 @@
LayoutUnit RenderBox::minPreferredLogicalWidth() const
{
- if (preferredLogicalWidthsDirty()) {
-#ifndef NDEBUG
- SetLayoutNeededForbiddenScope layoutForbiddenScope(const_cast<RenderBox*>(this));
-#endif
+ if (preferredLogicalWidthsDirty())
const_cast<RenderBox*>(this)->computePreferredLogicalWidths();
- }
return m_minPreferredLogicalWidth;
}
LayoutUnit RenderBox::maxPreferredLogicalWidth() const
{
- if (preferredLogicalWidthsDirty()) {
-#ifndef NDEBUG
- SetLayoutNeededForbiddenScope layoutForbiddenScope(const_cast<RenderBox*>(this));
-#endif
+ if (preferredLogicalWidthsDirty())
const_cast<RenderBox*>(this)->computePreferredLogicalWidths();
- }
return m_maxPreferredLogicalWidth;
}
Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp (140949 => 140950)
--- trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp 2013-01-28 08:05:35 UTC (rev 140949)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp 2013-01-28 08:24:36 UTC (rev 140950)
@@ -83,21 +83,11 @@
void RenderMathMLOperator::computePreferredLogicalWidths()
{
ASSERT(preferredLogicalWidthsDirty());
-
-#ifndef NDEBUG
- // FIXME: Remove the setNeedsLayoutIsForbidden calls once mathml stops modifying the render tree here.
- bool oldSetNeedsLayoutIsForbidden = isSetNeedsLayoutForbidden();
- setNeedsLayoutIsForbidden(false);
-#endif
// Check for an uninitialized operator.
if (!firstChild())
updateFromElement();
-
-#ifndef NDEBUG
- setNeedsLayoutIsForbidden(oldSetNeedsLayoutIsForbidden);
-#endif
-
+
RenderMathMLBlock::computePreferredLogicalWidths();
}
Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLRoot.cpp (140949 => 140950)
--- trunk/Source/WebCore/rendering/mathml/RenderMathMLRoot.cpp 2013-01-28 08:05:35 UTC (rev 140949)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLRoot.cpp 2013-01-28 08:24:36 UTC (rev 140950)
@@ -187,12 +187,6 @@
{
ASSERT(preferredLogicalWidthsDirty() && needsLayout());
-#ifndef NDEBUG
- // FIXME: Remove the setNeedsLayoutIsForbidden calls once mathml stops modifying the render tree here.
- bool oldSetNeedsLayoutIsForbidden = isSetNeedsLayoutForbidden();
- setNeedsLayoutIsForbidden(false);
-#endif
-
computeChildrenPreferredLogicalHeights();
int baseHeight = firstChild() ? roundToInt(preferredLogicalHeightAfterSizing(firstChild())) : style()->fontSize();
@@ -225,11 +219,7 @@
m_indexTop = - rootExtraTop;
} else
m_intrinsicPaddingStart = frontWidth;
-
-#ifndef NDEBUG
- setNeedsLayoutIsForbidden(oldSetNeedsLayoutIsForbidden);
-#endif
-
+
RenderMathMLBlock::computePreferredLogicalWidths();
// Shrink our logical width to its probable value now without triggering unnecessary relayout of our children.
Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLRow.cpp (140949 => 140950)
--- trunk/Source/WebCore/rendering/mathml/RenderMathMLRow.cpp 2013-01-28 08:05:35 UTC (rev 140949)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLRow.cpp 2013-01-28 08:24:36 UTC (rev 140950)
@@ -54,13 +54,7 @@
void RenderMathMLRow::computePreferredLogicalWidths()
{
ASSERT(preferredLogicalWidthsDirty() && needsLayout());
-
-#ifndef NDEBUG
- // FIXME: Remove the setNeedsLayoutIsForbidden calls once mathml stops modifying the render tree here.
- bool oldSetNeedsLayoutIsForbidden = isSetNeedsLayoutForbidden();
- setNeedsLayoutIsForbidden(false);
-#endif
-
+
computeChildrenPreferredLogicalHeights();
int stretchLogicalHeight = 0;
for (RenderObject* child = firstChild(); child; child = child->nextSibling()) {
@@ -83,11 +77,7 @@
renderMo->stretchToHeight(stretchLogicalHeight);
}
}
-
-#ifndef NDEBUG
- setNeedsLayoutIsForbidden(oldSetNeedsLayoutIsForbidden);
-#endif
-
+
RenderMathMLBlock::computePreferredLogicalWidths();
// Shrink our logical width to its probable value now without triggering unnecessary relayout of our children.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
