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 578667, text not highlighting when selectiondrag is outside frame, r=mats,a=blocking

Browse Source
This commit is contained in:
Neil Deakin 2010-10-25 10:06:30 -04:00
parent 339abaaf3e
commit 902842e19b
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
layout/generic/nsSelection.cpp
View File

@ -459,15 +459,17 @@ public:
{
nsWeakFrame frame =
mContent ? mPresContext->GetPrimaryFrameFor(mContent) : nsnull;
if (!frame)
return NS_OK;
mContent = nsnull;
mFrameSelection->HandleDrag(frame, mPoint);
nsPoint pt = mPoint -
frame->GetOffsetTo(mPresContext->PresShell()->FrameManager()->GetRootFrame());
mFrameSelection->HandleDrag(frame, pt);
if (!frame.IsAlive())
return NS_OK;
NS_ASSERTION(frame->PresContext() == mPresContext, "document mismatch?");
nsPoint pt = mPoint -
frame->GetOffsetTo(mPresContext->PresShell()->FrameManager()->GetRootFrame());
mSelection->DoAutoScroll(frame, pt);
}
return NS_OK;

11
toolkit/content/tests/widgets/test_mousecapture.xul
View File

@ -69,6 +69,9 @@ function selectionScrollCheck()
otherWindow.removeEventListener("scroll", selectionScrollDone, false);
var selectedText = otherWindow.getSelection().toString().replace(/\r/g, "");
is(selectedText, "One\n\nTwo", "text is selected");
// should have scrolled 20 pixels from the mousemove above and six extra
// times from the selection scroll timer for a total of 140
var oldScrollY = otherWindow.scrollY;
@ -87,7 +90,7 @@ function selectionScrollCheck()
synthesizeMouse(document.getElementById("custom"), 2, 2, { type: "mousedown" });
// check to ensure that selection dragging scrolls the right scrollable area
otherWindow = window.open("data:text/html,<html><p style='margin-top: 4000px'>This is some text</p></html>", "_blank", "width=200,height=200,scrollbars=yes");
otherWindow = window.open("data:text/html,<html><p>One</p><p style='margin-top: 200px;'>Two</p><p style='margin-top: 4000px'>This is some text</p></html>", "_blank", "width=200,height=200,scrollbars=yes");
otherWindow.addEventListener("load", function() { SimpleTest.waitForFocus(selectionScrollCheck, otherWindow); }, false);
}
}
@ -95,7 +98,7 @@ function selectionScrollCheck()
SimpleTest.executeSoon(function () {
disableNonTestMouseEvents(true);
synthesizeMouse(element, 2, 2, { type: "mousedown" }, otherWindow);
synthesizeMouse(element, 4, otherWindow.innerHeight + 20, { type: "mousemove" }, otherWindow);
synthesizeMouse(element, 100, otherWindow.innerHeight + 20, { type: "mousemove" }, otherWindow);
otherWindow.addEventListener("scroll", selectionScrollDone, false);
});
}
@ -185,7 +188,9 @@ function runTests()
// check to ensure that selection dragging scrolls the right scrollable area.
// This should open the page in a new tab.
otherWindow = window.open("data:text/html,<html><p style='margin-top: 4000px'>This is some text</p></html>", "_blank");
var topPos = window.innerHeight;
otherWindow = window.open("data:text/html,<html><p>One</p><p style='margin-top: " + topPos + "'>Two</p><p style='margin-top: 4000px'>This is some text</p></html>", "_blank");
otherWindow.addEventListener("load", function() { SimpleTest.waitForFocus(selectionScrollCheck, otherWindow); }, false);
}