summaryrefslogtreecommitdiff
path: root/dom
diff options
context:
space:
mode:
Diffstat (limited to 'dom')
-rw-r--r--dom/html/HTMLInputElement.cpp18
-rw-r--r--dom/html/HTMLInputElement.h2
-rw-r--r--dom/ipc/ProcessPriorityManager.cpp15
-rw-r--r--dom/media/MediaManager.cpp25
-rw-r--r--dom/media/MediaStreamGraph.cpp9
-rw-r--r--dom/media/moz.build6
-rw-r--r--dom/media/systemservices/LoadMonitor.cpp4
-rw-r--r--dom/system/OSFileConstants.cpp11
8 files changed, 7 insertions, 83 deletions
diff --git a/dom/html/HTMLInputElement.cpp b/dom/html/HTMLInputElement.cpp
index 8cc25d064a..866a5ac8c5 100644
--- a/dom/html/HTMLInputElement.cpp
+++ b/dom/html/HTMLInputElement.cpp
@@ -3566,7 +3566,6 @@ HTMLInputElement::Focus(ErrorResult& aError)
return;
}
-#if !defined(ANDROID)
bool
HTMLInputElement::IsNodeApzAwareInternal() const
{
@@ -3575,7 +3574,6 @@ HTMLInputElement::IsNodeApzAwareInternal() const
return (mType == NS_FORM_INPUT_NUMBER) || (mType == NS_FORM_INPUT_RANGE) ||
nsINode::IsNodeApzAwareInternal();
}
-#endif
bool
HTMLInputElement::IsInteractiveHTMLContent(bool aIgnoreTabindex) const
@@ -4728,7 +4726,6 @@ HTMLInputElement::PostHandleEvent(EventChainPostVisitor& aVisitor)
}
break;
}
-#if !defined(ANDROID)
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.
@@ -4762,7 +4759,6 @@ HTMLInputElement::PostHandleEvent(EventChainPostVisitor& aVisitor)
}
break;
}
-#endif
default:
break;
}
@@ -6022,17 +6018,7 @@ HTMLInputElement::ChooseDirectory(ErrorResult& aRv)
aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
return;
}
- // Script can call this method directly, so even though we don't show the
- // "Pick Folder..." button on platforms that don't have a directory picker
- // we have to redirect to the file picker here.
- InitFilePicker(
-#if defined(ANDROID)
- // No native directory picker - redirect to plain file picker
- FILE_PICKER_FILE
-#else
- FILE_PICKER_DIRECTORY
-#endif
- );
+ InitFilePicker(FILE_PICKER_DIRECTORY);
}
already_AddRefed<Promise>
@@ -6665,11 +6651,9 @@ FireEventForAccessibility(nsIDOMHTMLInputElement* aTarget,
void
HTMLInputElement::UpdateApzAwareFlag()
{
-#if !defined(ANDROID)
if ((mType == NS_FORM_INPUT_NUMBER) || (mType == NS_FORM_INPUT_RANGE)) {
SetMayBeApzAware();
}
-#endif
}
nsresult
diff --git a/dom/html/HTMLInputElement.h b/dom/html/HTMLInputElement.h
index 275d80b3a4..d7eccc0756 100644
--- a/dom/html/HTMLInputElement.h
+++ b/dom/html/HTMLInputElement.h
@@ -137,9 +137,7 @@ public:
virtual void Focus(ErrorResult& aError) override;
// nsINode
-#if !defined(ANDROID)
virtual bool IsNodeApzAwareInternal() const override;
-#endif
// Element
virtual bool IsInteractiveHTMLContent(bool aIgnoreTabindex) const override;
diff --git a/dom/ipc/ProcessPriorityManager.cpp b/dom/ipc/ProcessPriorityManager.cpp
index 51c42f7a52..61c8192492 100644
--- a/dom/ipc/ProcessPriorityManager.cpp
+++ b/dom/ipc/ProcessPriorityManager.cpp
@@ -50,20 +50,7 @@ using namespace mozilla::hal;
// #define ENABLE_LOGGING 1
-#if defined(ANDROID) && defined(ENABLE_LOGGING)
-# include <android/log.h>
-# define LOG(fmt, ...) \
- __android_log_print(ANDROID_LOG_INFO, \
- "Gecko:ProcessPriorityManager", \
- fmt, ## __VA_ARGS__)
-# define LOGP(fmt, ...) \
- __android_log_print(ANDROID_LOG_INFO, \
- "Gecko:ProcessPriorityManager", \
- "[%schild-id=%" PRIu64 ", pid=%d] " fmt, \
- NameWithComma().get(), \
- static_cast<uint64_t>(ChildID()), Pid(), ## __VA_ARGS__)
-
-#elif defined(ENABLE_LOGGING)
+#if defined(ENABLE_LOGGING)
# define LOG(fmt, ...) \
printf("ProcessPriorityManager - " fmt "\n", ##__VA_ARGS__)
# define LOGP(fmt, ...) \
diff --git a/dom/media/MediaManager.cpp b/dom/media/MediaManager.cpp
index 6b16d698d3..54b09e6447 100644
--- a/dom/media/MediaManager.cpp
+++ b/dom/media/MediaManager.cpp
@@ -1564,28 +1564,6 @@ private:
RefPtr<MediaManager> mManager; // get ref to this when creating the runnable
};
-#if defined(ANDROID)
-class GetUserMediaRunnableWrapper : public Runnable
-{
-public:
- // This object must take ownership of task
- GetUserMediaRunnableWrapper(GetUserMediaTask* task) :
- mTask(task) {
- }
-
- ~GetUserMediaRunnableWrapper() {
- }
-
- NS_IMETHOD Run() override {
- mTask->Run();
- return NS_OK;
- }
-
-private:
- nsAutoPtr<GetUserMediaTask> mTask;
-};
-#endif
-
/**
* EnumerateRawDevices - Enumerate a list of audio & video devices that
* satisfy passed-in constraints. List contains raw id's.
@@ -2577,8 +2555,7 @@ MediaEngine*
MediaManager::GetBackend(uint64_t aWindowId)
{
MOZ_ASSERT(MediaManager::IsInMediaThread());
- // Plugin backends as appropriate. The default engine also currently
- // includes picture support for Android.
+ // Plugin backends as appropriate.
// This IS called off main-thread.
if (!mBackend) {
MOZ_RELEASE_ASSERT(!sInShutdown); // we should never create a new backend in shutdown
diff --git a/dom/media/MediaStreamGraph.cpp b/dom/media/MediaStreamGraph.cpp
index 1b9e4f6749..db5fa8fa39 100644
--- a/dom/media/MediaStreamGraph.cpp
+++ b/dom/media/MediaStreamGraph.cpp
@@ -50,15 +50,8 @@ LazyLogModule gMediaStreamGraphLog("MediaStreamGraph");
// #define ENABLE_LIFECYCLE_LOG
-// We don't use NSPR log here because we want this interleaved with adb logcat
-// on Android/B2G
#ifdef ENABLE_LIFECYCLE_LOG
-# ifdef ANDROID
-# include "android/log.h"
-# define LIFECYCLE_LOG(...) __android_log_print(ANDROID_LOG_INFO, "Gecko - MSG", ## __VA_ARGS__); printf(__VA_ARGS__);printf("\n");
-# else
-# define LIFECYCLE_LOG(...) printf(__VA_ARGS__);printf("\n");
-# endif
+# define LIFECYCLE_LOG(...) printf(__VA_ARGS__);printf("\n");
#else
# define LIFECYCLE_LOG(...)
#endif
diff --git a/dom/media/moz.build b/dom/media/moz.build
index 4c22fdb64b..cbe91c255f 100644
--- a/dom/media/moz.build
+++ b/dom/media/moz.build
@@ -296,17 +296,11 @@ if CONFIG['OS_TARGET'] == 'WINNT':
else:
DEFINES['WEBRTC_POSIX'] = True
-if CONFIG['ANDROID_VERSION'] > '15':
- DEFINES['MOZ_OMX_WEBM_DECODER'] = True
-
include('/ipc/chromium/chromium-config.mozbuild')
# Suppress some GCC warnings being treated as errors:
-# - about attributes on forward declarations for types that are already
-# defined, which complains about an important MOZ_EXPORT for android::AString
if CONFIG['GNU_CC']:
CXXFLAGS += [
- '-Wno-error=attributes',
'-Wno-error=shadow',
]
diff --git a/dom/media/systemservices/LoadMonitor.cpp b/dom/media/systemservices/LoadMonitor.cpp
index ef8d1a0cc7..9ef01999c0 100644
--- a/dom/media/systemservices/LoadMonitor.cpp
+++ b/dom/media/systemservices/LoadMonitor.cpp
@@ -346,8 +346,6 @@ void RTCLoadInfo::UpdateCpuLoad(uint64_t ticks_per_interval,
> (ticks_per_interval * 10))
|| current_total_times < loadStat->mPrevTotalTimes
|| current_cpu_times < loadStat->mPrevCpuTimes) {
- // Bug at least on the Nexus 4 and Galaxy S4
- // https://code.google.com/p/android/issues/detail?id=41630
// We do need to update our previous times, or we can get stuck
// when there is a blip upwards and then we get a bunch of consecutive
// lower times. Just skip the load calculation.
@@ -374,7 +372,7 @@ void RTCLoadInfo::UpdateCpuLoad(uint64_t ticks_per_interval,
nsresult RTCLoadInfo::UpdateSystemLoad()
{
-#if defined(LINUX) || defined(ANDROID)
+#if defined(LINUX)
nsCOMPtr<nsIFile> procStatFile = do_CreateInstance(NS_LOCAL_FILE_CONTRACTID);
procStatFile->InitWithPath(NS_LITERAL_STRING("/proc/stat"));
diff --git a/dom/system/OSFileConstants.cpp b/dom/system/OSFileConstants.cpp
index c18d9aa6de..2b8a7e5369 100644
--- a/dom/system/OSFileConstants.cpp
+++ b/dom/system/OSFileConstants.cpp
@@ -15,14 +15,9 @@
#include "dirent.h"
#include "poll.h"
#include "sys/stat.h"
-#if defined(ANDROID)
-#include <sys/vfs.h>
-#define statvfs statfs
-#else
#include "sys/statvfs.h"
#include "sys/wait.h"
#include <spawn.h>
-#endif // defined(ANDROID)
#endif // defined(XP_UNIX)
#if defined(XP_LINUX)
@@ -345,8 +340,7 @@ void CleanupOSFileConstants()
*/
#define PROP_END { nullptr, JS::UndefinedValue() }
-
-// Define missing constants for Android
+// Define missing constants on non-*nix
#if !defined(S_IRGRP)
#define S_IXOTH 0001
#define S_IWOTH 0002
@@ -362,6 +356,7 @@ void CleanupOSFileConstants()
#define S_IRWXU 0700
#endif // !defined(S_IRGRP)
+
/**
* The properties defined in libc.
*
@@ -595,10 +590,8 @@ static const dom::ConstantSpec gLibcProperties[] =
// The size of |fsblkcnt_t|.
{ "OSFILE_SIZEOF_FSBLKCNT_T", JS::Int32Value(sizeof (fsblkcnt_t)) },
-#if !defined(ANDROID)
// The size of |posix_spawn_file_actions_t|.
{ "OSFILE_SIZEOF_POSIX_SPAWN_FILE_ACTIONS_T", JS::Int32Value(sizeof (posix_spawn_file_actions_t)) },
-#endif // !defined(ANDROID)
// Defining |dirent|.
// Size
generated by cgit v1.2.3 (git 2.26.2) at 2024-11-10 09:35:52 +0000