Bug 1295883 - Chase Linux scroll wheel behavior on Tier3 desktop Unix. r=smaug

MozReview-Commit-ID: 7osYJCwDQev

--HG--
extra : transplant_source : %F8%0CL%3D%C2d%92%B8%8AYd%C5%137h%ED%81Nt%3E
This commit is contained in:
Jan Beich 2016-08-17 04:55:36 +00:00
parent 626dd129aa
commit cb9811b6b4
3 changed files with 7 additions and 7 deletions

View File

@ -3442,7 +3442,7 @@ HTMLInputElement::Focus(ErrorResult& aError)
return;
}
#if defined(XP_WIN) || defined(XP_LINUX)
#if !defined(ANDROID) && !defined(XP_MACOSX)
bool
HTMLInputElement::IsNodeApzAwareInternal() const
{
@ -4538,7 +4538,7 @@ HTMLInputElement::PostHandleEvent(EventChainPostVisitor& aVisitor)
}
break;
}
#if defined(XP_WIN) || defined(XP_LINUX)
#if !defined(ANDROID) && !defined(XP_MACOSX)
case eWheel: {
// Handle wheel events as increasing / decreasing the input element's
// value when it's focused and it's type is number or range.
@ -6203,7 +6203,7 @@ FireEventForAccessibility(nsIDOMHTMLInputElement* aTarget,
void
HTMLInputElement::UpdateApzAwareFlag()
{
#if defined(XP_WIN) || defined(XP_LINUX)
#if !defined(ANDROID) && !defined(XP_MACOSX)
if ((mType == NS_FORM_INPUT_NUMBER) || (mType == NS_FORM_INPUT_RANGE)) {
SetMayBeApzAware();
}

View File

@ -135,7 +135,7 @@ public:
virtual void Focus(ErrorResult& aError) override;
// nsINode
#if defined(XP_WIN) || defined(XP_LINUX)
#if !defined(ANDROID) && !defined(XP_MACOSX)
virtual bool IsNodeApzAwareInternal() const override;
#endif

View File

@ -622,11 +622,11 @@ skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android'
[test_bug1250401.html]
[test_bug1260664.html]
[test_bug1261673.html]
skip-if = (os != 'win' && os != 'linux')
skip-if = (os == 'android' || os == 'mac')
[test_bug1261674-1.html]
skip-if = (os != 'win' && os != 'linux')
skip-if = (os == 'android' || os == 'mac')
[test_bug1261674-2.html]
skip-if = (os != 'win' && os != 'linux')
skip-if = (os == 'android' || os == 'mac')
[test_bug1260704.html]
[test_allowMedia.html]
[test_bug1292522_same_domain_with_different_port_number.html]