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

Bug 717143 - Remove bogus margins when force-reloading standalone image. r=bz

Browse Source
This commit is contained in:
Frank Yan
2012-03-07 22:11:45 -08:00
parent 395c63f847
commit 42dbc3d959
1 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
content/html/document/src/ImageDocument.cpp
View File

@@ -691,7 +691,7 @@ ImageDocument::CheckOverflowing(bool changeState)
{
/* Create a scope so that the style context gets destroyed before we might
* call RebuildStyleData. Also, holding onto pointers to the
* presentatation through style resolution is potentially dangerous.
* presentation through style resolution is potentially dangerous.
*/
{
nsIPresShell *shell = GetShell();
@@ -702,23 +702,6 @@ ImageDocument::CheckOverflowing(bool changeState)
nsPresContext *context = shell->GetPresContext();
nsRect visibleArea = context->GetVisibleArea();
Element* body = GetBodyElement();
if (!body) {
NS_WARNING("no body on image document!");
return NS_ERROR_FAILURE;
}
nsRefPtr<nsStyleContext> styleContext =
context->StyleSet()->ResolveStyleFor(body, nsnull);
nsMargin m;
if (styleContext->GetStyleMargin()->GetMargin(m))
visibleArea.Deflate(m);
m = styleContext->GetStyleBorder()->GetActualBorder();
visibleArea.Deflate(m);
if (styleContext->GetStylePadding()->GetPadding(m))
visibleArea.Deflate(m);
mVisibleWidth = nsPresContext::AppUnitsToIntCSSPixels(visibleArea.width);
mVisibleHeight = nsPresContext::AppUnitsToIntCSSPixels(visibleArea.height);
}