Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 703241. Part 3: nsLayoutUtils::GetTransformToAncestor should handle the case where aAncestor == aFrame. r=matspal

Browse Source
This commit is contained in:
Robert O'Callahan 2012-10-17 16:13:24 +13:00
parent 7ce96b9824
commit c899cd7b0c
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
layout/base/nsLayoutUtils.cpp
View File

@ -1302,7 +1302,11 @@ gfx3DMatrix
nsLayoutUtils::GetTransformToAncestor(nsIFrame *aFrame, const nsIFrame *aAncestor)
{
nsIFrame* parent;
gfx3DMatrix ctm = aFrame->GetTransformMatrix(aAncestor, &parent);
gfx3DMatrix ctm;
if (aFrame == aAncestor) {
return ctm;
}
ctm = aFrame->GetTransformMatrix(aAncestor, &parent);
while (parent && parent != aAncestor) {
if (!parent->Preserves3DChildren()) {
ctm.ProjectTo2D();

2
layout/generic/test/test_bug791616.html
View File

@ -35,7 +35,9 @@ t.scrollTop = 0;
var targetY = target.getBoundingClientRect().top;
SimpleTest.waitForFocus(function() {
is(target.getBoundingClientRect().top, targetY, "Target should not have scrolled due to waitForFocus");
t.focus();
is(target.getBoundingClientRect().top, targetY, "Target should not have scrolled due to focus change");
// Move the caret to scroll it into view
sel.collapse(target.firstChild, 2);