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

Backed out 3 changesets (bug 1327097) for eslint failures toolkit/content/tests/widgets/test_videocontrols.html:228 r=backout on a CLOSED TREE

Browse Source 
Backed out changeset 09c0a4c56c78 (bug 1327097)
Backed out changeset c0c5ee67b3ef (bug 1327097)
Backed out changeset 82a6e4dc5da7 (bug 1327097)
This commit is contained in:
Gurzau Raul
2017-11-16 14:23:20 +02:00
parent a84d1a4798
commit 3fea16876e
15 changed files with 213 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
dom/html/HTMLMediaElement.cpp
View File

@@ -14,7 +14,6 @@
#include "mozilla/AsyncEventDispatcher.h"
#include "mozilla/dom/MediaEncryptedEvent.h"
#include "mozilla/EMEUtils.h"
#include "mozilla/EventDispatcher.h"
#include "mozilla/Sprintf.h"
#include "base/basictypes.h"
@@ -136,7 +135,6 @@ static mozilla::LazyLogModule gMediaElementEventsLog("nsMediaElementEvents");
#include "mozilla/EventStateManager.h"
#include "mozilla/dom/HTMLInputElement.h"
#include "mozilla/dom/HTMLVideoElement.h"
#include "mozilla/dom/VideoPlaybackQuality.h"
#include "HTMLMediaElement.h"
@@ -4387,60 +4385,6 @@ HTMLMediaElement::OutputMediaStream::~OutputMediaStream()
}
}
nsresult
HTMLMediaElement::GetEventTargetParent(EventChainPreVisitor& aVisitor)
{
if (!this->Controls() || !aVisitor.mEvent->mFlags.mIsTrusted) {
return nsGenericHTMLElement::GetEventTargetParent(aVisitor);
}
HTMLInputElement* el = nullptr;
nsCOMPtr<nsINode> node;
// We will need to trap pointer, touch, and mouse events within the media
// element, allowing media control exclusive consumption on these events,
// and preventing the content from handling them.
switch (aVisitor.mEvent->mMessage) {
case ePointerDown:
case ePointerUp:
case eTouchEnd:
// Always prevent touchmove captured in video element from being handled by content,
// since we always do that for touchstart.
case eTouchMove:
case eTouchStart:
case eMouseClick:
case eMouseDoubleClick:
case eMouseDown:
case eMouseUp:
aVisitor.mCanHandle = false;
return NS_OK;
// The *move events however are only comsumed when the range input is being
// dragged.
case ePointerMove:
case eMouseMove:
node = do_QueryInterface(aVisitor.mEvent->mOriginalTarget);
if (node->IsInNativeAnonymousSubtree()) {
if (node->IsHTMLElement(nsGkAtoms::input)) {
// The node is a <input type="range">
el = static_cast<HTMLInputElement*>(node.get());
} else if (node->GetParentNode() &&
node->GetParentNode()->IsHTMLElement(nsGkAtoms::input)) {
// The node is a child of <input type="range">
el = static_cast<HTMLInputElement*>(node->GetParentNode());
}
}
if (el && el->IsDraggingRange()) {
aVisitor.mCanHandle = false;
return NS_OK;
}
return nsGenericHTMLElement::GetEventTargetParent(aVisitor);
default:
return nsGenericHTMLElement::GetEventTargetParent(aVisitor);
}
}
bool HTMLMediaElement::ParseAttribute(int32_t aNamespaceID,
nsAtom* aAttribute,
const nsAString& aValue,