Bug 1243125 - patch 0 - Relax overly-harsh writing mode assertions in nsReflowMetrics size accessors. r=dholbert

This commit is contained in:
Jonathan Kew 2016-02-03 09:24:24 +00:00
parent 1ebb17479d
commit 1012db254c

View File

@ -219,24 +219,29 @@ public:
// width in horizontal writing modes, height in vertical ones), and BSize is
// the size in the block-progression direction.
nscoord ISize(mozilla::WritingMode aWritingMode) const {
CHECK_WRITING_MODE(aWritingMode);
NS_ASSERTION(!aWritingMode.IsOrthogonalTo(mWritingMode),
"mismatched writing mode");
return mISize;
}
nscoord BSize(mozilla::WritingMode aWritingMode) const {
CHECK_WRITING_MODE(aWritingMode);
NS_ASSERTION(!aWritingMode.IsOrthogonalTo(mWritingMode),
"mismatched writing mode");
return mBSize;
}
mozilla::LogicalSize Size(mozilla::WritingMode aWritingMode) const {
CHECK_WRITING_MODE(aWritingMode);
NS_ASSERTION(!aWritingMode.IsOrthogonalTo(mWritingMode),
"mismatched writing mode");
return mozilla::LogicalSize(aWritingMode, mISize, mBSize);
}
nscoord& ISize(mozilla::WritingMode aWritingMode) {
CHECK_WRITING_MODE(aWritingMode);
NS_ASSERTION(!aWritingMode.IsOrthogonalTo(mWritingMode),
"mismatched writing mode");
return mISize;
}
nscoord& BSize(mozilla::WritingMode aWritingMode) {
CHECK_WRITING_MODE(aWritingMode);
NS_ASSERTION(!aWritingMode.IsOrthogonalTo(mWritingMode),
"mismatched writing mode");
return mBSize;
}