corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 582771 - Drag & drop email to folder fails in hotmail, r=enndeakin, a=blocking

Browse Source
This commit is contained in:
Olli Pettay
2010-10-15 19:41:02 +03:00
parent f72d5ff545
commit 4e56530404
5 changed files with 158 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
content/events/src/nsEventStateManager.cpp
View File

@@ -2828,9 +2828,9 @@ nsEventStateManager::PostHandleEvent(nsPresContext* aPresContext,
break;
}
nsCOMPtr<nsIContent> activeContent;
if (nsEventStatus_eConsumeNoDefault != *aStatus) {
nsCOMPtr<nsIContent> newFocus;
nsCOMPtr<nsIContent> activeContent;
PRBool suppressBlur = PR_FALSE;
if (mCurrentTarget) {
mCurrentTarget->GetContentForEvent(mPresContext, aEvent, getter_AddRefs(newFocus));
@@ -2935,7 +2935,6 @@ nsEventStateManager::PostHandleEvent(nsPresContext* aPresContext,
if (par)
activeContent = par;
}
SetGlobalActiveContent(this, activeContent);
}
}
else {
@@ -2943,11 +2942,12 @@ nsEventStateManager::PostHandleEvent(nsPresContext* aPresContext,
// any of our own processing of a drag. Workaround for bug 43258.
StopTrackingDragGesture();
}
SetGlobalActiveContent(this, activeContent);
}
break;
case NS_MOUSE_BUTTON_UP:
{
SetGlobalActiveContent(this, nsnull);
ClearGlobalActiveContent();
if (IsMouseEventReal(aEvent)) {
if (!mCurrentTarget) {
nsIFrame* targ;
@@ -4716,3 +4716,12 @@ nsEventStateManager::SetGlobalActiveContent(nsEventStateManager* aNewESM,
sActiveESM->SetContentState(aContent, NS_EVENT_STATE_ACTIVE);
}
}
void
nsEventStateManager::ClearGlobalActiveContent()
{
if (sActiveESM) {
sActiveESM->SetContentState(nsnull, NS_EVENT_STATE_ACTIVE);
}
sActiveESM = nsnull;
}

2
content/events/src/nsEventStateManager.h
View File

@@ -155,6 +155,7 @@ public:
static nsIDocument* sMouseOverDocument;
static nsIEventStateManager* GetActiveEventStateManager() { return sActiveESM; }
protected:
void UpdateCursor(nsPresContext* aPresContext, nsEvent* aEvent, nsIFrame* aTargetFrame, nsEventStatus* aStatus);
/**
@@ -411,6 +412,7 @@ protected:
static void SetGlobalActiveContent(nsEventStateManager* aNewESM,
nsIContent* aContent);
static void ClearGlobalActiveContent();
// Functions used for click hold context menus
PRBool mClickHoldContextMenu;

7
layout/base/nsPresShell.cpp
View File

@@ -6904,6 +6904,11 @@ PresShell::HandleEventInternal(nsEvent* aEvent, nsIView *aView,
nsAutoHandlingUserInputStatePusher userInpStatePusher(isHandlingUserInput,
aEvent->message == NS_MOUSE_BUTTON_DOWN);
if (NS_IS_TRUSTED_EVENT(aEvent) && aEvent->message == NS_MOUSE_MOVE) {
nsIPresShell::AllowMouseCapture(
nsEventStateManager::GetActiveEventStateManager() == manager);
}
nsAutoPopupStatePusher popupStatePusher(nsDOMEvent::GetEventPopupControlState(aEvent));
// FIXME. If the event was reused, we need to clear the old target,
@@ -6961,6 +6966,8 @@ PresShell::HandleEventInternal(nsEvent* aEvent, nsIView *aView,
if (aEvent->message == NS_MOUSE_BUTTON_UP) {
// reset the capturing content now that the mouse button is up
SetCapturingContent(nsnull, 0);
} else if (aEvent->message == NS_MOUSE_MOVE) {
nsIPresShell::AllowMouseCapture(PR_FALSE);
}
}
return rv;

1
layout/base/tests/Makefile.in
View File

@@ -124,6 +124,7 @@ _TEST_FILES = \
test_flush_on_paint.html \
test_mozPaintCount.html \
test_scroll_selection_into_view.html \
test_bug582771.html \
$(NULL)
# Tests for bugs 441782, 467672 and 570378 don't pass reliably on Windows, because of bug 469208

135
layout/base/tests/test_bug582771.html Normal file
View File

@@ -0,0 +1,135 @@
<!DOCTYPE HTML>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=582771
-->
<head>
<title>Test for Bug 582771</title>
<script type="application/javascript" src="/MochiKit/packed.js"></script>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
<style>
.test {
width: 20px;
height: 20px;
border: 1px solid black;
-moz-user-select: none;
}
</style>
</head>
<body onload="setTimeout('runTest()', 0)">
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=582771">Mozilla Bug 582771</a>
<p id="display"></p>
<div id="content" style="display: none">
</div>
<pre id="test">
<script type="application/javascript">
/** Test for Bug 582771 **/
SimpleTest.waitForExplicitFinish();
var d1;
var d2;
var d1mousemovecount = 0;
var d2mousemovecount = 0;
function sendMouseMove(el) {
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
var rect = el.getBoundingClientRect();
var utils = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
.getInterface(Components.interfaces.nsIDOMWindowUtils);
utils.sendMouseEvent('mousemove', rect.left + 5, rect.top + 5, 0, 0, 0);
}
function sendMouseDown(el) {
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
var rect = el.getBoundingClientRect();
var utils = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
.getInterface(Components.interfaces.nsIDOMWindowUtils);
utils.sendMouseEvent('mousedown', rect.left + 5, rect.top + 5, 0, 1, 0);
}
function sendMouseUp(el) {
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
var rect = el.getBoundingClientRect();
var utils = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
.getInterface(Components.interfaces.nsIDOMWindowUtils);
utils.sendMouseEvent('mouseup', rect.left + 5, rect.top + 5, 0, 1, 0);
}
function log(s) {
document.getElementById("l").textContent += s + "\n";
}
function d2Listener(e) {
log(e.type + ", " + e.target.id);
is(e.target, d2, "d2 should have got mousemove.");
++d2mousemovecount;
}
function d1Listener(e) {
log(e.type + ", " + e.target.id);
d1.setCapture(true);
}
function d1Listener2(e) {
log(e.type + ", " + e.target.id);
d2.setCapture(true);
}
function d1MouseMoveListener(e) {
log(e.type + ", " + e.target.id);
++d1mousemovecount;
}
function runTest() {
d1 = document.getElementById("d1");
d2 = document.getElementById("d2");
d2.addEventListener("mousemove", d2Listener, true);
document.body.offsetLeft;
sendMouseMove(d2);
is(d2mousemovecount, 1, "Should have got mousemove");
// This shouldn't enable capturing, since we're not in a right kind of
// event listener.
d1.setCapture(true);
sendMouseDown(d1);
sendMouseMove(d2);
sendMouseUp(d1);
is(d2mousemovecount, 2, "Should have got mousemove");
d1.addEventListener("mousedown", d1Listener, true);
d1.addEventListener("mousemove", d1MouseMoveListener, true);
sendMouseDown(d1);
sendMouseMove(d2);
is(d2mousemovecount, 2, "Shouldn't have got mousemove");
is(d1mousemovecount, 1, "Should have got mousemove");
sendMouseUp(d1);
d1.removeEventListener("mousedown", d1Listener, true);
d1.removeEventListener("mousemove", d1MouseMoveListener, true);
// Nothing should be capturing the event.
sendMouseMove(d2);
is(d2mousemovecount, 3, "Should have got mousemove");
d1.addEventListener("mousemove", d1Listener2, true);
sendMouseDown(d1);
sendMouseMove(d1); // This should call setCapture to d2!
d1.removeEventListener("mousemove", d1Listener2, true);
d1.addEventListener("mousemove", d1MouseMoveListener, true);
sendMouseMove(d1); // This should send mouse event to d2.
is(d1mousemovecount, 1, "Shouldn't have got mousemove");
is(d2mousemovecount, 4, "Should have got mousemove");
sendMouseUp(d1);
SimpleTest.finish();
}
</script>
</pre>
<div class="test" id="d1">&nbsp;</div><br><div class="test" id="d2">&nbsp;</div>
<pre id="l"></pre>
</body>
</html>