Bug 1596339 Part 5 - Use ToString() on nsRect in frame tree dump. r=dholbert

Differential Revision: https://phabricator.services.mozilla.com/D52966

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Ting-Yu Lin 2019-11-15 03:52:14 +00:00
Родитель fec63b8556
Коммит fa2ec9dc21
2 изменённых файлов: 8 добавлений и 17 удалений

Просмотреть файл

@ -7842,8 +7842,7 @@ void nsIFrame::ListGeneric(nsACString& aTo, const char* aPrefix,
if (IBprevsibling) {
aTo += nsPrintfCString(" IBSplitPrevSibling=%p", IBprevsibling);
}
aTo += nsPrintfCString(" {%d,%d,%d,%d}", mRect.x, mRect.y, mRect.width,
mRect.height);
aTo += nsPrintfCString(" %s", ToString(mRect).c_str());
mozilla::WritingMode wm = GetWritingMode();
if (wm.IsVertical() || wm.IsBidiRTL()) {
@ -7866,13 +7865,11 @@ void nsIFrame::ListGeneric(nsACString& aTo, const char* aPrefix,
if (f->HasOverflowAreas()) {
nsRect vo = f->GetVisualOverflowRect();
if (!vo.IsEqualEdges(mRect)) {
aTo += nsPrintfCString(" vis-overflow={%d,%d,%d,%d}", vo.x, vo.y,
vo.width, vo.height);
aTo += nsPrintfCString(" vis-overflow=%s", ToString(vo).c_str());
}
nsRect so = f->GetScrollableOverflowRect();
if (!so.IsEqualEdges(mRect)) {
aTo += nsPrintfCString(" scr-overflow={%d,%d,%d,%d}", so.x, so.y,
so.width, so.height);
aTo += nsPrintfCString(" scr-overflow=%s", ToString(so).c_str());
}
}
bool hasNormalPosition;

Просмотреть файл

@ -242,8 +242,7 @@ void nsLineBox::List(FILE* out, const char* aPrefix, uint32_t aFlags) const {
str += nsPrintfCString("bm=%d ", GetCarriedOutBEndMargin().get());
}
nsRect bounds = GetPhysicalBounds();
str += nsPrintfCString("{%d,%d,%d,%d} ", bounds.x, bounds.y, bounds.width,
bounds.height);
str += nsPrintfCString("%s ", ToString(bounds).c_str());
if (mWritingMode.IsVertical() || mWritingMode.IsBidiRTL()) {
str += nsPrintfCString("wm=%s cs={%d,%d} logical-rect=%s ",
ToString(mWritingMode).c_str(), mContainerSize.width,
@ -252,15 +251,10 @@ void nsLineBox::List(FILE* out, const char* aPrefix, uint32_t aFlags) const {
if (mData &&
(!mData->mOverflowAreas.VisualOverflow().IsEqualEdges(bounds) ||
!mData->mOverflowAreas.ScrollableOverflow().IsEqualEdges(bounds))) {
str += nsPrintfCString("vis-overflow=%d,%d,%d,%d scr-overflow=%d,%d,%d,%d ",
mData->mOverflowAreas.VisualOverflow().x,
mData->mOverflowAreas.VisualOverflow().y,
mData->mOverflowAreas.VisualOverflow().width,
mData->mOverflowAreas.VisualOverflow().height,
mData->mOverflowAreas.ScrollableOverflow().x,
mData->mOverflowAreas.ScrollableOverflow().y,
mData->mOverflowAreas.ScrollableOverflow().width,
mData->mOverflowAreas.ScrollableOverflow().height);
str += nsPrintfCString(
"vis-overflow=%s scr-overflow=%s ",
ToString(mData->mOverflowAreas.VisualOverflow()).c_str(),
ToString(mData->mOverflowAreas.ScrollableOverflow()).c_str());
}
fprintf_stderr(out, "%s<\n", str.get());