зеркало из https://github.com/mozilla/pjs.git
Bug 125837 - mIntrinsicSize setup missing pixel->twip conversion.
r=pavlov, sr=blizzard
This commit is contained in:
Родитель
53704b3bd5
Коммит
a7a7fbb998
|
@ -749,8 +749,14 @@ nsImageFrame::GetDesiredSize(nsIPresContext* aPresContext,
|
||||||
nsCOMPtr<imgIContainer> con;
|
nsCOMPtr<imgIContainer> con;
|
||||||
mLoads[0].mRequest->GetImage(getter_AddRefs(con));
|
mLoads[0].mRequest->GetImage(getter_AddRefs(con));
|
||||||
if (con) {
|
if (con) {
|
||||||
con->GetWidth(&mLoads[0].mIntrinsicSize.width);
|
float p2t;
|
||||||
con->GetHeight(&mLoads[0].mIntrinsicSize.height);
|
nscoord width, height;
|
||||||
|
|
||||||
|
aPresContext->GetPixelsToTwips(&p2t);
|
||||||
|
con->GetWidth(&width);
|
||||||
|
con->GetHeight(&height);
|
||||||
|
mLoads[0].mIntrinsicSize.width = NSIntPixelsToTwips(width, p2t);
|
||||||
|
mLoads[0].mIntrinsicSize.height = NSIntPixelsToTwips(height, p2t);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -749,8 +749,14 @@ nsImageFrame::GetDesiredSize(nsIPresContext* aPresContext,
|
||||||
nsCOMPtr<imgIContainer> con;
|
nsCOMPtr<imgIContainer> con;
|
||||||
mLoads[0].mRequest->GetImage(getter_AddRefs(con));
|
mLoads[0].mRequest->GetImage(getter_AddRefs(con));
|
||||||
if (con) {
|
if (con) {
|
||||||
con->GetWidth(&mLoads[0].mIntrinsicSize.width);
|
float p2t;
|
||||||
con->GetHeight(&mLoads[0].mIntrinsicSize.height);
|
nscoord width, height;
|
||||||
|
|
||||||
|
aPresContext->GetPixelsToTwips(&p2t);
|
||||||
|
con->GetWidth(&width);
|
||||||
|
con->GetHeight(&height);
|
||||||
|
mLoads[0].mIntrinsicSize.width = NSIntPixelsToTwips(width, p2t);
|
||||||
|
mLoads[0].mIntrinsicSize.height = NSIntPixelsToTwips(height, p2t);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче