diff --git a/mozilla/content/html/content/src/nsHTMLAnchorElement.cpp b/mozilla/content/html/content/src/nsHTMLAnchorElement.cpp
index 8ad63c21e01..640cabd0060 100644
--- a/mozilla/content/html/content/src/nsHTMLAnchorElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLAnchorElement.cpp
@@ -338,7 +338,8 @@ nsHTMLAnchorElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsresult ret = mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);
- if ((NS_OK == ret) && (nsEventStatus_eIgnore == aEventStatus)) {
+ if ((NS_OK == ret) && (nsEventStatus_eIgnore == aEventStatus) &&
+ !(aFlags & NS_EVENT_FLAG_CAPTURE)) {
// If this anchor element has an HREF then it is sensitive to
// mouse events (otherwise ignore them).
nsAutoString href;
diff --git a/mozilla/content/html/content/src/nsHTMLButtonElement.cpp b/mozilla/content/html/content/src/nsHTMLButtonElement.cpp
index 32b4ae8f65f..b19a86b226c 100644
--- a/mozilla/content/html/content/src/nsHTMLButtonElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLButtonElement.cpp
@@ -417,7 +417,8 @@ nsHTMLButtonElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsresult ret = mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);
- if ((NS_OK == ret) && (nsEventStatus_eIgnore == aEventStatus)) {
+ if ((NS_OK == ret) && (nsEventStatus_eIgnore == aEventStatus) &&
+ !(aFlags & NS_EVENT_FLAG_CAPTURE)) {
switch (aEvent->message) {
case NS_MOUSE_LEFT_BUTTON_DOWN:
{
diff --git a/mozilla/content/html/content/src/nsHTMLInputElement.cpp b/mozilla/content/html/content/src/nsHTMLInputElement.cpp
index acc247363fd..2c7e3958a15 100644
--- a/mozilla/content/html/content/src/nsHTMLInputElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLInputElement.cpp
@@ -624,7 +624,8 @@ nsHTMLInputElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsresult ret = mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);
- if ((NS_OK == ret) && (nsEventStatus_eIgnore == aEventStatus)) {
+ if ((NS_OK == ret) && (nsEventStatus_eIgnore == aEventStatus) &&
+ !(aFlags & NS_EVENT_FLAG_CAPTURE)) {
switch (aEvent->message) {
case NS_FOCUS_CONTENT:
{
diff --git a/mozilla/content/xml/content/src/nsXMLElement.cpp b/mozilla/content/xml/content/src/nsXMLElement.cpp
index 1d8be5d3614..638d9a6efe1 100644
--- a/mozilla/content/xml/content/src/nsXMLElement.cpp
+++ b/mozilla/content/xml/content/src/nsXMLElement.cpp
@@ -123,7 +123,8 @@ nsXMLElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsresult ret = mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);
- if (mIsLink && (NS_OK == ret) && (nsEventStatus_eIgnore == aEventStatus)) {
+ if (mIsLink && (NS_OK == ret) && (nsEventStatus_eIgnore == aEventStatus) &&
+ !(aFlags & NS_EVENT_FLAG_CAPTURE)) {
switch (aEvent->message) {
case NS_MOUSE_LEFT_BUTTON_DOWN:
{
diff --git a/mozilla/layout/html/content/src/nsHTMLAnchorElement.cpp b/mozilla/layout/html/content/src/nsHTMLAnchorElement.cpp
index 8ad63c21e01..640cabd0060 100644
--- a/mozilla/layout/html/content/src/nsHTMLAnchorElement.cpp
+++ b/mozilla/layout/html/content/src/nsHTMLAnchorElement.cpp
@@ -338,7 +338,8 @@ nsHTMLAnchorElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsresult ret = mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);
- if ((NS_OK == ret) && (nsEventStatus_eIgnore == aEventStatus)) {
+ if ((NS_OK == ret) && (nsEventStatus_eIgnore == aEventStatus) &&
+ !(aFlags & NS_EVENT_FLAG_CAPTURE)) {
// If this anchor element has an HREF then it is sensitive to
// mouse events (otherwise ignore them).
nsAutoString href;
diff --git a/mozilla/layout/html/content/src/nsHTMLButtonElement.cpp b/mozilla/layout/html/content/src/nsHTMLButtonElement.cpp
index 32b4ae8f65f..b19a86b226c 100644
--- a/mozilla/layout/html/content/src/nsHTMLButtonElement.cpp
+++ b/mozilla/layout/html/content/src/nsHTMLButtonElement.cpp
@@ -417,7 +417,8 @@ nsHTMLButtonElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsresult ret = mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);
- if ((NS_OK == ret) && (nsEventStatus_eIgnore == aEventStatus)) {
+ if ((NS_OK == ret) && (nsEventStatus_eIgnore == aEventStatus) &&
+ !(aFlags & NS_EVENT_FLAG_CAPTURE)) {
switch (aEvent->message) {
case NS_MOUSE_LEFT_BUTTON_DOWN:
{
diff --git a/mozilla/layout/html/content/src/nsHTMLInputElement.cpp b/mozilla/layout/html/content/src/nsHTMLInputElement.cpp
index acc247363fd..2c7e3958a15 100644
--- a/mozilla/layout/html/content/src/nsHTMLInputElement.cpp
+++ b/mozilla/layout/html/content/src/nsHTMLInputElement.cpp
@@ -624,7 +624,8 @@ nsHTMLInputElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsresult ret = mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);
- if ((NS_OK == ret) && (nsEventStatus_eIgnore == aEventStatus)) {
+ if ((NS_OK == ret) && (nsEventStatus_eIgnore == aEventStatus) &&
+ !(aFlags & NS_EVENT_FLAG_CAPTURE)) {
switch (aEvent->message) {
case NS_FOCUS_CONTENT:
{
diff --git a/mozilla/layout/xml/content/src/nsXMLElement.cpp b/mozilla/layout/xml/content/src/nsXMLElement.cpp
index 1d8be5d3614..638d9a6efe1 100644
--- a/mozilla/layout/xml/content/src/nsXMLElement.cpp
+++ b/mozilla/layout/xml/content/src/nsXMLElement.cpp
@@ -123,7 +123,8 @@ nsXMLElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsresult ret = mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);
- if (mIsLink && (NS_OK == ret) && (nsEventStatus_eIgnore == aEventStatus)) {
+ if (mIsLink && (NS_OK == ret) && (nsEventStatus_eIgnore == aEventStatus) &&
+ !(aFlags & NS_EVENT_FLAG_CAPTURE)) {
switch (aEvent->message) {
case NS_MOUSE_LEFT_BUTTON_DOWN:
{