Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-27 04:38:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 654369 - Part 10: Make nsFloatManager::StoreRegionFor return void r=bz

Browse Source 
--HG--
extra : rebase_source : dcf1babec6d26cfaee2e050e1fbd8abca941c8eb
This commit is contained in:
Craig Topper 2011-05-08 01:00:29 -07:00
parent 1166c130bf
commit 7becba39df
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
layout/generic/nsBlockReflowState.cpp
View File

@ -882,8 +882,7 @@ nsBlockReflowState::FlowAndPlaceFloat(nsIFrame* aFloat)
mFloatManager->AddFloat(aFloat, region);
NS_ABORT_IF_FALSE(NS_SUCCEEDED(rv), "bad float placement");
// store region
rv = nsFloatManager::StoreRegionFor(aFloat, region);
NS_ABORT_IF_FALSE(NS_SUCCEEDED(rv), "float region storage failed");
nsFloatManager::StoreRegionFor(aFloat, region);
// If the float's dimensions have changed, note the damage in the
// float manager.

4
layout/generic/nsFloatManager.cpp
View File

@ -338,11 +338,10 @@ nsFloatManager::GetRegionFor(nsIFrame* aFloat)
return region;
}
nsresult
void
nsFloatManager::StoreRegionFor(nsIFrame* aFloat,
nsRect& aRegion)
{
nsresult rv = NS_OK;
nsRect rect = aFloat->GetRect();
FrameProperties props = aFloat->Properties();
if (aRegion.IsEqualEdges(rect)) {
@ -357,7 +356,6 @@ nsFloatManager::StoreRegionFor(nsIFrame* aFloat,
}
*storedMargin = aRegion - rect;
}
return rv;
}
nsresult

3
layout/generic/nsFloatManager.h
View File

@ -100,8 +100,7 @@ public:
* as a delta against the mRect, so repositioning the frame will
* also reposition the float region.
*/
static nsresult StoreRegionFor(nsIFrame* aFloat,
nsRect& aRegion);
static void StoreRegionFor(nsIFrame* aFloat, nsRect& aRegion);
// Structure that stores the current state of a frame manager for
// Save/Restore purposes.