summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2020-04-22 20:04:53 +0000
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-04-26 10:19:22 +0200
commita4ba2609049d30aa8c5cc552e4137ad73af897f2 (patch)
tree566dddee61f9e30052891f84c31237911a1af835
parent4a8c186eea0b25416ce3e47719658a42df9fddcf (diff)
downloadUXP-a4ba2609049d30aa8c5cc552e4137ad73af897f2.tar
UXP-a4ba2609049d30aa8c5cc552e4137ad73af897f2.tar.gz
UXP-a4ba2609049d30aa8c5cc552e4137ad73af897f2.tar.lz
UXP-a4ba2609049d30aa8c5cc552e4137ad73af897f2.tar.xz
UXP-a4ba2609049d30aa8c5cc552e4137ad73af897f2.zip
Issue #80 - De-unify dom/plugins/base
-rw-r--r--dom/plugins/base/moz.build17
-rw-r--r--dom/plugins/base/nsNPAPIPluginInstance.cpp1
-rw-r--r--dom/plugins/base/nsNPAPIPluginStreamListener.cpp2
-rw-r--r--dom/plugins/base/nsNPAPIPluginStreamListener.h1
-rw-r--r--dom/plugins/base/nsPluginInstanceOwner.cpp2
-rw-r--r--dom/plugins/base/nsPluginNativeWindowWin.cpp1
-rw-r--r--dom/plugins/base/nsPluginStreamListenerPeer.cpp1
-rw-r--r--dom/plugins/base/nsPluginTags.cpp2
8 files changed, 17 insertions, 10 deletions
diff --git a/dom/plugins/base/moz.build b/dom/plugins/base/moz.build
index a159d6fc1..d63ca51ce 100644
--- a/dom/plugins/base/moz.build
+++ b/dom/plugins/base/moz.build
@@ -38,10 +38,12 @@ EXPORTS.mozilla += [
'PluginPRLibrary.h',
]
-UNIFIED_SOURCES += [
+SOURCES += [
'nsJSNPRuntime.cpp',
+ 'nsNPAPIPlugin.cpp',
'nsNPAPIPluginInstance.cpp',
'nsNPAPIPluginStreamListener.cpp',
+ 'nsPluginHost.cpp',
'nsPluginInstanceOwner.cpp',
'nsPluginModule.cpp',
'nsPluginStreamListenerPeer.cpp',
@@ -49,24 +51,19 @@ UNIFIED_SOURCES += [
'PluginPRLibrary.cpp',
]
-SOURCES += [
- 'nsNPAPIPlugin.cpp', # Conflict with X11 headers
- 'nsPluginHost.cpp', # Conflict with NS_NPAPIPLUGIN_CALLBACK
-]
-
if CONFIG['OS_ARCH'] == 'WINNT':
- UNIFIED_SOURCES += [
+ SOURCES += [
'nsPluginDirServiceProvider.cpp',
'nsPluginNativeWindowWin.cpp',
'nsPluginsDirWin.cpp',
]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
- UNIFIED_SOURCES += [
+ SOURCES += [
'nsPluginNativeWindow.cpp',
'nsPluginsDirDarwin.cpp',
]
else:
- UNIFIED_SOURCES += [
+ SOURCES += [
'nsPluginsDirUnix.cpp',
]
if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
@@ -75,7 +72,7 @@ else:
'nsPluginNativeWindowGtk.cpp',
]
else:
- UNIFIED_SOURCES += [
+ SOURCES += [
'nsPluginNativeWindow.cpp',
]
diff --git a/dom/plugins/base/nsNPAPIPluginInstance.cpp b/dom/plugins/base/nsNPAPIPluginInstance.cpp
index ce24b6296..7ee71c8f7 100644
--- a/dom/plugins/base/nsNPAPIPluginInstance.cpp
+++ b/dom/plugins/base/nsNPAPIPluginInstance.cpp
@@ -36,6 +36,7 @@
#include "nsILoadContext.h"
#include "mozilla/dom/HTMLObjectElementBinding.h"
#include "AudioChannelService.h"
+#include "GeckoProfiler.h"
using namespace mozilla;
using namespace mozilla::dom;
diff --git a/dom/plugins/base/nsNPAPIPluginStreamListener.cpp b/dom/plugins/base/nsNPAPIPluginStreamListener.cpp
index 0f500a1ae..2b5f65ef4 100644
--- a/dom/plugins/base/nsNPAPIPluginStreamListener.cpp
+++ b/dom/plugins/base/nsNPAPIPluginStreamListener.cpp
@@ -9,11 +9,13 @@
#include "nsDirectoryServiceDefs.h"
#include "nsDirectoryServiceUtils.h"
#include "nsIFile.h"
+#include "nsIHttpChannel.h"
#include "nsNetUtil.h"
#include "nsPluginHost.h"
#include "nsNPAPIPlugin.h"
#include "nsPluginLogging.h"
#include "nsPluginStreamListenerPeer.h"
+#include "GeckoProfiler.h"
#include <stdint.h>
#include <algorithm>
diff --git a/dom/plugins/base/nsNPAPIPluginStreamListener.h b/dom/plugins/base/nsNPAPIPluginStreamListener.h
index dd567f99b..cb9c616d0 100644
--- a/dom/plugins/base/nsNPAPIPluginStreamListener.h
+++ b/dom/plugins/base/nsNPAPIPluginStreamListener.h
@@ -10,6 +10,7 @@
#include "nsIHTTPHeaderListener.h"
#include "nsIRequest.h"
#include "nsITimer.h"
+#include "nsCOMPtr.h"
#include "nsCOMArray.h"
#include "nsIOutputStream.h"
#include "nsIPluginInstanceOwner.h"
diff --git a/dom/plugins/base/nsPluginInstanceOwner.cpp b/dom/plugins/base/nsPluginInstanceOwner.cpp
index 22c4783ca..0d4dc68cc 100644
--- a/dom/plugins/base/nsPluginInstanceOwner.cpp
+++ b/dom/plugins/base/nsPluginInstanceOwner.cpp
@@ -64,6 +64,7 @@ using mozilla::DefaultXDisplay;
#include "mozilla/IMEStateManager.h"
#include "mozilla/TextComposition.h"
#include "mozilla/AutoRestore.h"
+#include "mozilla/plugins/PluginAsyncSurrogate.h"
#include "nsContentCID.h"
#include "nsWidgetsCID.h"
@@ -90,6 +91,7 @@ static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID);
using namespace mozilla;
using namespace mozilla::dom;
using namespace mozilla::layers;
+using namespace mozilla::plugins;
static inline nsPoint AsNsPoint(const nsIntPoint &p) {
return nsPoint(p.x, p.y);
diff --git a/dom/plugins/base/nsPluginNativeWindowWin.cpp b/dom/plugins/base/nsPluginNativeWindowWin.cpp
index 106dcaf77..82f851174 100644
--- a/dom/plugins/base/nsPluginNativeWindowWin.cpp
+++ b/dom/plugins/base/nsPluginNativeWindowWin.cpp
@@ -5,6 +5,7 @@
#include "mozilla/BasicEvents.h"
#include "mozilla/DebugOnly.h"
+#include "nsPluginHost.h"
#include "windows.h"
#include "windowsx.h"
diff --git a/dom/plugins/base/nsPluginStreamListenerPeer.cpp b/dom/plugins/base/nsPluginStreamListenerPeer.cpp
index 0476315d5..603f2408c 100644
--- a/dom/plugins/base/nsPluginStreamListenerPeer.cpp
+++ b/dom/plugins/base/nsPluginStreamListenerPeer.cpp
@@ -34,6 +34,7 @@
#include "nsPluginInstanceOwner.h"
#include "nsDataHashtable.h"
#include "nsNullPrincipal.h"
+#include "prtime.h"
#define BYTERANGE_REQUEST_CONTEXT 0x01020304
diff --git a/dom/plugins/base/nsPluginTags.cpp b/dom/plugins/base/nsPluginTags.cpp
index 58b413388..5fd63f377 100644
--- a/dom/plugins/base/nsPluginTags.cpp
+++ b/dom/plugins/base/nsPluginTags.cpp
@@ -13,6 +13,7 @@
#include "nsIBlocklistService.h"
#include "nsIUnicodeDecoder.h"
#include "nsIPlatformCharset.h"
+#include "nsIURI.h"
#include "nsPluginLogging.h"
#include "nsNPAPIPlugin.h"
#include "nsCharSeparatedTokenizer.h"
@@ -26,6 +27,7 @@
using mozilla::dom::EncodingUtils;
using mozilla::dom::FakePluginTagInit;
+using mozilla::dom::FakePluginMimeEntry;
using namespace mozilla;
// These legacy flags are used in the plugin registry. The states are now