corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1146107 - Replace MOZ_ASSERT with NS_WARN_IF_FALSE on isize check in ruby base container. r=dholbert

Browse Source
This commit is contained in:
Xidorn Quan
2015-03-31 16:30:29 +11:00
parent af01044b67
commit 25e5616bf2
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
layout/generic/crashtests/1146107.html Normal file
View File

@@ -0,0 +1,6 @@
<!DOCTYPE html>
<html>
<body>
<div style="display: ruby-base; margin: -47891343%"></div>
</body>
</html>

1
layout/generic/crashtests/crashtests.list
View File

@@ -579,4 +579,5 @@ asserts(3-7) load 1137723-2.html # bug 1019192, bug 1138133
asserts(0-3) load 1134667.html asserts(0-3) load 1134667.html
asserts(0-3) load 1134667.html asserts(0-3) load 1134667.html
asserts(0-3) load 1134667.html asserts(0-3) load 1134667.html
load 1146107.html
load 1146114.html load 1146114.html

5
layout/generic/nsRubyBaseContainerFrame.cpp
View File

@@ -518,8 +518,9 @@ nsRubyBaseContainerFrame::Reflow(nsPresContext* aPresContext,
// When there are no frames inside the ruby base container, EndSpan // When there are no frames inside the ruby base container, EndSpan
// will return 0. However, in this case, the actual width of the // will return 0. However, in this case, the actual width of the
// container could be non-zero because of non-empty ruby annotations. // container could be non-zero because of non-empty ruby annotations.
MOZ_ASSERT(NS_INLINE_IS_BREAK(aStatus) || // XXX When bug 765861 gets fixed, this warning should be upgraded.
isize == lineSpanSize || mFrames.IsEmpty()); NS_WARN_IF_FALSE(NS_INLINE_IS_BREAK(aStatus) ||
isize == lineSpanSize || mFrames.IsEmpty(), "bad isize");
// If there exists any span, the columns must either be completely // If there exists any span, the columns must either be completely
// reflowed, or be not reflowed at all. // reflowed, or be not reflowed at all.