Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-09 13:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 118794 remove pxiel frame error r=mkaply sr=attinasi

Browse Source 
bug 110596 adding form frames to debug reflow - part2 r=karnaze sr=attinasi
This commit is contained in:
bernd.mielke%snafu.de 2002-01-09 15:27:41 +00:00
parent 0328c83836
commit 9eaa65079e
4 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
layout/generic/nsBulletFrame.cpp
View File

@ -1261,7 +1261,7 @@ nsBulletFrame::GetDesiredSize(nsIPresContext* aCX,
}
aCX->GetPixelsToTwips(&p2t);
bulletSize = NSIntPixelsToTwips(bulletSize, p2t);
mPadding.bottom = ascent / 8;
mPadding.bottom = NSIntPixelsToTwips((nscoord) NSToIntRound((float)ascent / (8.0f * p2t)),p2t);
aMetrics.width = mPadding.right + bulletSize;
aMetrics.height = mPadding.bottom + bulletSize;
aMetrics.ascent = mPadding.bottom + bulletSize;

12
layout/generic/nsFrame.cpp
View File

@ -4571,14 +4571,25 @@ void DR_State::InitFrameTypeTable()
{
AddFrameTypeInfo(nsLayoutAtoms::areaFrame, "area", "area");
AddFrameTypeInfo(nsLayoutAtoms::blockFrame, "block", "block");
AddFrameTypeInfo(nsLayoutAtoms::boxFrame, "box", "box");
AddFrameTypeInfo(nsLayoutAtoms::brFrame, "br", "br");
AddFrameTypeInfo(nsLayoutAtoms::bulletFrame, "bullet", "bullet");
AddFrameTypeInfo(nsLayoutAtoms::comboBoxFrame, "combo", "comboBox");
AddFrameTypeInfo(nsLayoutAtoms::fieldSetFrame, "field", "fieldset");
AddFrameTypeInfo(nsLayoutAtoms::fileControlFrame, "file", "fileControl");
AddFrameTypeInfo(nsLayoutAtoms::formControlFrame, "form", "form");
AddFrameTypeInfo(nsLayoutAtoms::gfxButtonControlFrame, "button", "gfxButtonControl");
AddFrameTypeInfo(nsLayoutAtoms::gfxCheckBoxFrame, "check", "gfxCheckBox");
AddFrameTypeInfo(nsLayoutAtoms::gfxRadioControlFrame, "radio", "gfxRadioControl");
AddFrameTypeInfo(nsLayoutAtoms::hrFrame, "hr", "hr");
AddFrameTypeInfo(nsLayoutAtoms::htmlFrameInnerFrame, "frameI", "htmlFrameInner");
AddFrameTypeInfo(nsLayoutAtoms::htmlFrameOuterFrame, "frameO", "htmlFrameOuter");
AddFrameTypeInfo(nsLayoutAtoms::imageFrame, "img", "image");
AddFrameTypeInfo(nsLayoutAtoms::imageControlFrame, "imgC", "imageControl");
AddFrameTypeInfo(nsLayoutAtoms::inlineFrame, "inline", "inline");
AddFrameTypeInfo(nsLayoutAtoms::isIndexFrame, "index", "isIndex");
AddFrameTypeInfo(nsLayoutAtoms::labelFrame, "label", "label");
AddFrameTypeInfo(nsLayoutAtoms::legendFrame, "legend", "legend");
AddFrameTypeInfo(nsLayoutAtoms::letterFrame, "letter", "letter");
AddFrameTypeInfo(nsLayoutAtoms::lineFrame, "line", "line");
AddFrameTypeInfo(nsLayoutAtoms::listControlFrame, "select", "select");
@ -4599,6 +4610,7 @@ void DR_State::InitFrameTypeTable()
AddFrameTypeInfo(nsLayoutAtoms::tableRowFrame, "row", "tableRow");
AddFrameTypeInfo(nsLayoutAtoms::textInputFrame, "textCtl", "textInput");
AddFrameTypeInfo(nsLayoutAtoms::textFrame, "text", "text");
AddFrameTypeInfo(nsLayoutAtoms::textInputFrame, "textInp", "textInput");
AddFrameTypeInfo(nsLayoutAtoms::viewportFrame, "VP", "viewport");
AddFrameTypeInfo(nsnull, "unknown", "unknown");
}

2
layout/html/base/src/nsBulletFrame.cpp
View File

@ -1261,7 +1261,7 @@ nsBulletFrame::GetDesiredSize(nsIPresContext* aCX,
}
aCX->GetPixelsToTwips(&p2t);
bulletSize = NSIntPixelsToTwips(bulletSize, p2t);
mPadding.bottom = ascent / 8;
mPadding.bottom = NSIntPixelsToTwips((nscoord) NSToIntRound((float)ascent / (8.0f * p2t)),p2t);
aMetrics.width = mPadding.right + bulletSize;
aMetrics.height = mPadding.bottom + bulletSize;
aMetrics.ascent = mPadding.bottom + bulletSize;

12
layout/html/base/src/nsFrame.cpp
View File

@ -4571,14 +4571,25 @@ void DR_State::InitFrameTypeTable()
{
AddFrameTypeInfo(nsLayoutAtoms::areaFrame, "area", "area");
AddFrameTypeInfo(nsLayoutAtoms::blockFrame, "block", "block");
AddFrameTypeInfo(nsLayoutAtoms::boxFrame, "box", "box");
AddFrameTypeInfo(nsLayoutAtoms::brFrame, "br", "br");
AddFrameTypeInfo(nsLayoutAtoms::bulletFrame, "bullet", "bullet");
AddFrameTypeInfo(nsLayoutAtoms::comboBoxFrame, "combo", "comboBox");
AddFrameTypeInfo(nsLayoutAtoms::fieldSetFrame, "field", "fieldset");
AddFrameTypeInfo(nsLayoutAtoms::fileControlFrame, "file", "fileControl");
AddFrameTypeInfo(nsLayoutAtoms::formControlFrame, "form", "form");
AddFrameTypeInfo(nsLayoutAtoms::gfxButtonControlFrame, "button", "gfxButtonControl");
AddFrameTypeInfo(nsLayoutAtoms::gfxCheckBoxFrame, "check", "gfxCheckBox");
AddFrameTypeInfo(nsLayoutAtoms::gfxRadioControlFrame, "radio", "gfxRadioControl");
AddFrameTypeInfo(nsLayoutAtoms::hrFrame, "hr", "hr");
AddFrameTypeInfo(nsLayoutAtoms::htmlFrameInnerFrame, "frameI", "htmlFrameInner");
AddFrameTypeInfo(nsLayoutAtoms::htmlFrameOuterFrame, "frameO", "htmlFrameOuter");
AddFrameTypeInfo(nsLayoutAtoms::imageFrame, "img", "image");
AddFrameTypeInfo(nsLayoutAtoms::imageControlFrame, "imgC", "imageControl");
AddFrameTypeInfo(nsLayoutAtoms::inlineFrame, "inline", "inline");
AddFrameTypeInfo(nsLayoutAtoms::isIndexFrame, "index", "isIndex");
AddFrameTypeInfo(nsLayoutAtoms::labelFrame, "label", "label");
AddFrameTypeInfo(nsLayoutAtoms::legendFrame, "legend", "legend");
AddFrameTypeInfo(nsLayoutAtoms::letterFrame, "letter", "letter");
AddFrameTypeInfo(nsLayoutAtoms::lineFrame, "line", "line");
AddFrameTypeInfo(nsLayoutAtoms::listControlFrame, "select", "select");
@ -4599,6 +4610,7 @@ void DR_State::InitFrameTypeTable()
AddFrameTypeInfo(nsLayoutAtoms::tableRowFrame, "row", "tableRow");
AddFrameTypeInfo(nsLayoutAtoms::textInputFrame, "textCtl", "textInput");
AddFrameTypeInfo(nsLayoutAtoms::textFrame, "text", "text");
AddFrameTypeInfo(nsLayoutAtoms::textInputFrame, "textInp", "textInput");
AddFrameTypeInfo(nsLayoutAtoms::viewportFrame, "VP", "viewport");
AddFrameTypeInfo(nsnull, "unknown", "unknown");
}