diff options
Diffstat (limited to 'dom/html')
| -rw-r--r-- | dom/html/HTMLMediaElement.cpp | 30 | ||||
| -rw-r--r-- | dom/html/nsIFormControl.h | 6 |
2 files changed, 1 insertions, 35 deletions
diff --git a/dom/html/HTMLMediaElement.cpp b/dom/html/HTMLMediaElement.cpp index 1ff1fd7a45..a483198655 100644 --- a/dom/html/HTMLMediaElement.cpp +++ b/dom/html/HTMLMediaElement.cpp @@ -846,28 +846,7 @@ private: bool CanOwnerPlayUnsupportedTypeMedia() const { -#if defined(MOZ_WIDGET_ANDROID) - // On Fennec, we will user an external app to open unsupported media types. - if (!Preferences::GetBool("media.openUnsupportedTypeWithExternalApp")) { - return false; - } - - if (!mError) { - return false; - } - - uint16_t errorCode = mError->Code(); - if (errorCode != MEDIA_ERR_SRC_NOT_SUPPORTED) { - return false; - } - - // If media doesn't start playing, we don't need to open it. - if (mOwner->Paused()) { - return false; - } - - return true; -#endif + // This was only something to check on Android. Stubbed now. return false; } @@ -6204,13 +6183,6 @@ HTMLMediaElement::IsAllowedToPlay() if (!mHasUserInteraction && !IsAutoplayEnabled() && !EventStateManager::IsHandlingUserInput()) { -#if defined(MOZ_WIDGET_ANDROID) - nsContentUtils::DispatchTrustedEvent(OwnerDoc(), - static_cast<nsIContent*>(this), - NS_LITERAL_STRING("MozAutoplayMediaBlocked"), - false, - false); -#endif return false; } diff --git a/dom/html/nsIFormControl.h b/dom/html/nsIFormControl.h index 0a844a5671..067ac7cae8 100644 --- a/dom/html/nsIFormControl.h +++ b/dom/html/nsIFormControl.h @@ -265,12 +265,6 @@ nsIFormControl::IsSingleLineTextControl(bool aExcludePassword, uint32_t aType) aType == NS_FORM_INPUT_SEARCH || aType == NS_FORM_INPUT_TEL || aType == NS_FORM_INPUT_URL || - // TODO: those are temporary until bug 773205 is fixed. -#if defined(MOZ_WIDGET_ANDROID) - // On Android, date/time input appears as a normal text box. - aType == NS_FORM_INPUT_TIME || - aType == NS_FORM_INPUT_DATE || -#endif aType == NS_FORM_INPUT_MONTH || aType == NS_FORM_INPUT_WEEK || aType == NS_FORM_INPUT_DATETIME_LOCAL || |