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

Bug 759993. Make nsIFrame::GetTransformMatrix robust for popup frames. r=tnikkel

Browse Source 
* * *
[mq]: tmp
This commit is contained in:
Robert O'Callahan 2012-11-11 00:02:56 -08:00
parent 96193c34fa
commit 347a2e59f4
1 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
layout/generic/nsFrame.cpp
View File

@ -4765,6 +4765,46 @@ nsIFrame::GetTransformMatrix(const nsIFrame* aStopAtAncestor,
return result;
}
if (nsLayoutUtils::IsPopup(this) &&
GetType() == nsGkAtoms::listControlFrame) {
nsPresContext* presContext = PresContext();
nsIFrame* docRootFrame = presContext->PresShell()->GetRootFrame();
// Compute a matrix that transforms from the popup widget to the toplevel
// widget. We use the widgets because they're the simplest and most
// accurate approach --- this should work no matter how the widget position
// was chosen.
nsIWidget* widget = GetView()->GetWidget();
nsPresContext* rootPresContext = PresContext()->GetRootPresContext();
// Maybe the widget hasn't been created yet? Popups without widgets are
// treated as regular frames. That should work since they'll be rendered
// as part of the page if they're rendered at all.
if (widget && rootPresContext) {
nsIWidget* toplevel = rootPresContext->GetNearestWidget();
if (toplevel) {
nsIntRect screenBounds;
widget->GetClientBounds(screenBounds);
nsIntRect toplevelScreenBounds;
toplevel->GetClientBounds(toplevelScreenBounds);
nsIntPoint translation = screenBounds.TopLeft() - toplevelScreenBounds.TopLeft();
gfx3DMatrix transformToTop;
transformToTop._41 = translation.x;
transformToTop._42 = translation.y;
*aOutAncestor = docRootFrame;
gfx3DMatrix docRootTransformToTop =
nsLayoutUtils::GetTransformToAncestor(docRootFrame, nullptr);
if (docRootTransformToTop.IsSingular()) {
NS_WARNING("Containing document is invisible, we can't compute a valid transform");
} else {
gfx3DMatrix topToDocRootTransform = docRootTransformToTop.Inverse();
return transformToTop*topToDocRootTransform;
}
}
}
}
*aOutAncestor = nsLayoutUtils::GetCrossDocParentFrame(this);
/* Otherwise, we're not transformed. In that case, we'll walk up the frame
@ -4779,7 +4819,9 @@ nsIFrame::GetTransformMatrix(const nsIFrame* aStopAtAncestor,
return gfx3DMatrix();
/* Keep iterating while the frame can't possibly be transformed. */
while (!(*aOutAncestor)->IsTransformed() && *aOutAncestor != aStopAtAncestor) {
while (!(*aOutAncestor)->IsTransformed() &&
!nsLayoutUtils::IsPopup(*aOutAncestor) &&
*aOutAncestor != aStopAtAncestor) {
/* If no parent, stop iterating. Otherwise, update the ancestor. */
nsIFrame* parent = nsLayoutUtils::GetCrossDocParentFrame(*aOutAncestor);
if (!parent)