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

Change coordinate system in the float manager from content box (most of the time, but sometimes border box) to always border box. (Bug 551425) r=dbaron a2.0=blocking+

Browse Source
This commit is contained in:
fantasai
2010-08-11 12:32:53 -07:00
parent 4b7700da27
commit 3e2b1c5256
7 changed files with 78 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
layout/generic/nsLineLayout.cpp
View File

@@ -813,25 +813,16 @@ nsLineLayout::ReflowFrame(nsIFrame* aFrame,
// Let frame know that are reflowing it. Note that we don't bother
// positioning the frame yet, because we're probably going to end up
// moving it when we do the vertical alignment
nscoord x = pfd->mBounds.x;
nscoord y = pfd->mBounds.y;
aFrame->WillReflow(mPresContext);
// Adjust spacemanager coordinate system for the frame. The
// spacemanager coordinates are <b>inside</b> the current spans
// border+padding, but the x/y coordinates are not (recall that
// frame coordinates are relative to the parents origin and that the
// parents border/padding is <b>inside</b> the parent
// frame. Therefore we have to subtract out the parents
// border+padding before translating.
// Adjust spacemanager coordinate system for the frame.
nsHTMLReflowMetrics metrics;
#ifdef DEBUG
metrics.width = nscoord(0xdeadbeef);
metrics.height = nscoord(0xdeadbeef);
#endif
nscoord tx = x - psd->mReflowState->mComputedBorderPadding.left;
nscoord ty = y - psd->mReflowState->mComputedBorderPadding.top;
nscoord tx = pfd->mBounds.x;
nscoord ty = pfd->mBounds.y;
mFloatManager->Translate(tx, ty);
nsIAtom* frameType = aFrame->GetType();