wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix max texture size handling in displayport clamping. (bug 1135907 follow-up, r=kats)

Browse Source
This commit is contained in:
David Anderson 2015-03-23 12:34:21 -07:00
parent 04b6d7c8d9
commit e93f5a7c0f
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
layout/base/nsLayoutUtils.cpp
View File

@ -848,7 +848,10 @@ GetMaxDisplayPortSize(nsIContent* aContent)
}
nsPresContext* presContext = frame->PresContext();
uint32_t maxSizeInDevPixels = lm->GetMaxTextureSize();
int32_t maxSizeInDevPixels = lm->GetMaxTextureSize();
if (maxSizeInDevPixels < 0 || maxSizeInDevPixels == INT_MAX) {
return nscoord_MAX;
}
return presContext->DevPixelsToAppUnits(maxSizeInDevPixels);
}
@ -1053,11 +1056,9 @@ GetDisplayPortImpl(nsIContent* aContent, nsRect *aResult, float aMultiplier)
if (!gfxPrefs::LayersTilesEnabled()) {
// Either we should have gotten a valid rect directly from the displayport
// base, or we should have computed a valid rect from the margins.
NS_ASSERTION(GetMaxDisplayPortSize(aContent) <= 0 ||
result.width < GetMaxDisplayPortSize(aContent),
NS_ASSERTION(result.width <= GetMaxDisplayPortSize(aContent),
"Displayport must be a valid texture size");
NS_ASSERTION(GetMaxDisplayPortSize(aContent) <= 0 ||
result.height < GetMaxDisplayPortSize(aContent),
NS_ASSERTION(result.height <= GetMaxDisplayPortSize(aContent),
"Displayport must be a valid texture size");
}