Issue #1638 - Part 1: Put NPAPI code behind MOZ_ENABLE_NPAPI.

Adds --disable-npapi as an additional build option. The default is still to build in NPAPI compatibility, but with this flag, it's finally possible to build without pulling in GTK2 on systems that don't have the package. This essentially ifdefs everything associated with NPAPI, following various Mozilla removal bugs. Ref: BZ 1682030, BZ 1251202, BZ 1217665, BZ 1687239
FranklinDM · Jan 10, 2024 · b787af5 · b787af5
1 parent 9dac9de
commit b787af5
Show file tree

Hide file tree

Showing 106 changed files with 1,400 additions and 273 deletions.
diff --git a/accessible/base/nsAccessibilityService.cpp b/accessible/base/nsAccessibilityService.cpp
@@ -44,7 +44,9 @@
 #ifdef XP_WIN
 #include "mozilla/a11y/Compatibility.h"
 #include "mozilla/dom/ContentChild.h"
+#ifdef MOZ_ENABLE_NPAPI
 #include "HTMLWin32ObjectAccessible.h"
+#endif
 #include "mozilla/StaticPtr.h"
 #endif
 
@@ -55,7 +57,9 @@
 #include "nsImageFrame.h"
 #include "nsIObserverService.h"
 #include "nsLayoutUtils.h"
+#ifdef MOZ_ENABLE_NPAPI
 #include "nsPluginFrame.h"
+#endif
 #include "nsSVGPathGeometryFrame.h"
 #include "nsTreeBodyFrame.h"
 #include "nsTreeColumns.h"
@@ -79,7 +83,7 @@
 #include "XULTabAccessible.h"
 #include "XULTreeGridAccessibleWrap.h"
 
-#if defined(XP_WIN) || defined(MOZ_ACCESSIBILITY_ATK)
+#if (defined(XP_WIN) || defined(MOZ_ACCESSIBILITY_ATK)) && defined(MOZ_ENABLE_NPAPI)
 #include "nsNPAPIPluginInstance.h"
 #endif
 
@@ -431,6 +435,7 @@ class PluginTimerCallBack final : public nsITimerCallback
 NS_IMPL_ISUPPORTS(PluginTimerCallBack, nsITimerCallback)
 #endif
 
+#ifdef MOZ_ENABLE_NPAPI
 already_AddRefed<Accessible>
 nsAccessibilityService::CreatePluginAccessible(nsPluginFrame* aFrame,
                                                nsIContent* aContent,
@@ -493,6 +498,7 @@ nsAccessibilityService::CreatePluginAccessible(nsPluginFrame* aFrame,
 
   return nullptr;
 }
+#endif // MOZ_ENABLE_NPAPI
 
 void
 nsAccessibilityService::DeckPanelSwitched(nsIPresShell* aPresShell,
@@ -1638,11 +1644,13 @@ nsAccessibilityService::CreateAccessibleByFrameType(nsIFrame* aFrame,
     case eOuterDocType:
       newAcc = new OuterDocAccessible(aContent, document);
       break;
+#ifdef MOZ_ENABLE_NPAPI
     case ePluginType: {
       nsPluginFrame* pluginFrame = do_QueryFrame(aFrame);
       newAcc = CreatePluginAccessible(pluginFrame, aContent, aContext);
       break;
     }
+#endif
     case eTextLeafType:
       newAcc = new TextLeafAccessibleWrap(aContent, document);
       break;

diff --git a/accessible/base/nsAccessibilityService.h b/accessible/base/nsAccessibilityService.h
@@ -20,7 +20,9 @@
 class nsImageFrame;
 class nsIArray;
 class nsIPersistentProperties;
+#ifdef MOZ_ENABLE_NPAPI
 class nsPluginFrame;
+#endif
 class nsITreeView;
 
 namespace mozilla {
@@ -87,9 +89,11 @@ class nsAccessibilityService final : public mozilla::a11y::DocManager,
 
   Accessible* GetRootDocumentAccessible(nsIPresShell* aPresShell,
                                         bool aCanCreate);
+#ifdef MOZ_ENABLE_NPAPI
   already_AddRefed<Accessible>
     CreatePluginAccessible(nsPluginFrame* aFrame, nsIContent* aContent,
                            Accessible* aContext);
+#endif
 
   /**
    * Adds/remove ATK root accessible for gtk+ native window to/from children

diff --git a/accessible/ipc/DocAccessibleParent.cpp b/accessible/ipc/DocAccessibleParent.cpp
@@ -486,13 +486,14 @@ DocAccessibleParent::SetCOMProxy(const RefPtr<IAccessible>& aCOMProxy)
   IAccessibleHolder holder(Move(ptr));
   Unused << SendParentCOMProxy(holder);
 }
-
+#ifdef MOZ_ENABLE_NPAPI
 bool
 DocAccessibleParent::RecvGetWindowedPluginIAccessible(
       const WindowsHandle& aHwnd, IAccessibleHolder* aPluginCOMProxy)
 {
   return false;
 }
+#endif
 
 #endif // defined(XP_WIN)
 

diff --git a/accessible/ipc/DocAccessibleParent.h b/accessible/ipc/DocAccessibleParent.h
@@ -143,10 +143,11 @@ class DocAccessibleParent : public ProxyAccessible,
 
 #if defined(XP_WIN)
   void SetCOMProxy(const RefPtr<IAccessible>& aCOMProxy);
-
+#ifdef MOZ_ENABLE_NPAPI
   virtual bool RecvGetWindowedPluginIAccessible(
       const WindowsHandle& aHwnd, IAccessibleHolder* aPluginCOMProxy) override;
-#endif
+#endif // MOZ_ENABLE_NPAPI
+#endif // XP_WIN
 
 private:
 

diff --git a/accessible/ipc/win/PDocAccessible.ipdl b/accessible/ipc/win/PDocAccessible.ipdl
@@ -61,8 +61,10 @@ parent:
    */
   async BindChildDoc(PDocAccessible aChildDoc, uint64_t aID);
 
+#ifdef MOZ_ENABLE_NPAPI
   sync GetWindowedPluginIAccessible(WindowsHandle aHwnd)
     returns (IAccessibleHolder aPluginCOMProxy);
+#endif
 
 child:
   async ParentCOMProxy(IAccessibleHolder aParentCOMProxy);

diff --git a/accessible/ipc/win/moz.build b/accessible/ipc/win/moz.build
@@ -8,7 +8,7 @@ if CONFIG['COMPILE_ENVIRONMENT']:
 
 # With --disable-accessibility, we need to compile PDocAccessible.ipdl (which
 # also depends on COMPtrTypes.h), but not the C++.
-IPDL_SOURCES += ['PDocAccessible.ipdl']
+PREPROCESSED_IPDL_SOURCES += ['PDocAccessible.ipdl']
 EXPORTS.mozilla.a11y += ['COMPtrTypes.h']
 
 if CONFIG['ACCESSIBILITY']:

diff --git a/accessible/windows/msaa/moz.build b/accessible/windows/msaa/moz.build
@@ -38,6 +38,13 @@ SOURCES += [
     'XULTreeGridAccessibleWrap.cpp',
 ]
 
+if CONFIG['MOZ_ENABLE_NPAPI']:
+    SOURCES += [
+        'HTMLWin32ObjectAccessible.cpp',
+    ]
+
+
+
 LOCAL_INCLUDES += [
     '/accessible/base',
     '/accessible/generic',

diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure
@@ -207,6 +207,7 @@ def old_configure_options(*options):
     '--enable-necko-wifi',
     '--enable-negotiateauth',
     '--enable-nfc',
+    '--enable-npapi',
     '--enable-nspr-build',
     '--enable-official-branding',
     '--enable-official-vendor',

diff --git a/dom/base/Navigator.cpp b/dom/base/Navigator.cpp
@@ -8,7 +8,9 @@
 
 #include "Navigator.h"
 #include "nsIXULAppInfo.h"
+#ifdef MOZ_ENABLE_NPAPI
 #include "nsPluginArray.h"
+#endif
 #include "nsMimeTypeArray.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/dom/BodyExtractor.h"
@@ -179,7 +181,9 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(Navigator)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mMimeTypes)
+#ifdef MOZ_ENABLE_NPAPI
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mPlugins)
+#endif
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mPermissions)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mGeolocation)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mNotification)
@@ -210,10 +214,12 @@ Navigator::Invalidate()
 
   mMimeTypes = nullptr;
 
+#ifdef MOZ_ENABLE_NPAPI
   if (mPlugins) {
     mPlugins->Invalidate();
     mPlugins = nullptr;
   }
+#endif
 
   mPermissions = nullptr;
 
@@ -489,6 +495,7 @@ Navigator::GetMimeTypes(ErrorResult& aRv)
   return mMimeTypes;
 }
 
+#ifdef MOZ_ENABLE_NPAPI
 nsPluginArray*
 Navigator::GetPlugins(ErrorResult& aRv)
 {
@@ -503,6 +510,7 @@ Navigator::GetPlugins(ErrorResult& aRv)
 
   return mPlugins;
 }
+#endif
 
 Permissions*
 Navigator::GetPermissions(ErrorResult& aRv)

diff --git a/dom/base/Navigator.h b/dom/base/Navigator.h
@@ -19,7 +19,9 @@
 #include "nsTArray.h"
 #include "nsWeakPtr.h"
 
+#ifdef MOZ_ENABLE_NPAPI
 class nsPluginArray;
+#endif
 class nsMimeTypeArray;
 class nsPIDOMWindowInner;
 class nsIDOMNavigatorSystemMessages;
@@ -127,7 +129,9 @@ class Navigator final : public nsIDOMNavigator
   void RegisterContentHandler(const nsAString& aMIMEType, const nsAString& aURL,
                               const nsAString& aTitle, ErrorResult& aRv);
   nsMimeTypeArray* GetMimeTypes(ErrorResult& aRv);
+#ifdef MOZ_ENABLE_NPAPI
   nsPluginArray* GetPlugins(ErrorResult& aRv);
+#endif
   Permissions* GetPermissions(ErrorResult& aRv);
   bool GlobalPrivacyControl();
   Geolocation* GetGeolocation(ErrorResult& aRv);
@@ -260,7 +264,9 @@ class Navigator final : public nsIDOMNavigator
                           ErrorResult& aRv);
 
   RefPtr<nsMimeTypeArray> mMimeTypes;
+#ifdef MOZ_ENABLE_NPAPI
   RefPtr<nsPluginArray> mPlugins;
+#endif
   RefPtr<Permissions> mPermissions;
   RefPtr<Geolocation> mGeolocation;
   RefPtr<DesktopNotificationCenter> mNotification;

diff --git a/dom/base/moz.build b/dom/base/moz.build
@@ -394,10 +394,11 @@ SOURCES += [
     'nsImageLoadingContent.cpp',
     # Because of OS X headers.
     'nsObjectLoadingContent.cpp',
-    # nsPluginArray.cpp includes npapi.h indirectly, and that includes a lot of system headers
-    'nsPluginArray.cpp',
 ]
 
+if CONFIG['MOZ_ENABLE_NPAPI']:
+    SOURCES += ['nsPluginArray.cpp']
+
 # Are we targeting x86-32 or x86-64?  If so, we want to include SSE2 code for
 # nsTextFragment.cpp
 if CONFIG['INTEL_ARCHITECTURE']:

diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp
@@ -23,7 +23,9 @@
 #include "Layers.h"
 #include "MediaDecoder.h"
 // nsNPAPIPluginInstance must be included before nsIDocument.h, which is included in mozAutoDocUpdate.h.
+#ifdef MOZ_ENABLE_NPAPI
 #include "nsNPAPIPluginInstance.h"
+#endif
 #include "gfxDrawable.h"
 #include "gfxPrefs.h"
 #include "ImageOps.h"
@@ -6950,7 +6952,7 @@ nsContentUtils::HaveEqualPrincipals(nsIDocument* aDoc1, nsIDocument* aDoc2)
 bool
 nsContentUtils::HasPluginWithUncontrolledEventDispatch(nsIContent* aContent)
 {
-#ifdef XP_MACOSX
+#if defined(XP_MACOSX) || !defined(MOZ_ENABLE_NPAPI)
   // We control dispatch to all mac plugins.
   return false;
 #else

diff --git a/dom/base/nsDOMWindowUtils.cpp b/dom/base/nsDOMWindowUtils.cpp
@@ -3145,9 +3145,11 @@ nsDOMWindowUtils::GetPaintingSuppressed(bool *aPaintingSuppressed)
   return NS_OK;
 }
 
+
 NS_IMETHODIMP
 nsDOMWindowUtils::GetPlugins(JSContext* cx, JS::MutableHandle<JS::Value> aPlugins)
 {
+#ifdef MOZ_ENABLE_NPAPI
   nsCOMPtr<nsIDocument> doc = GetDocument();
   NS_ENSURE_STATE(doc);
 
@@ -3159,6 +3161,7 @@ nsDOMWindowUtils::GetPlugins(JSContext* cx, JS::MutableHandle<JS::Value> aPlugin
   NS_ENSURE_SUCCESS(rv, rv);
 
   aPlugins.setObject(*jsPlugins);
+#endif
   return NS_OK;
 }
 

diff --git a/dom/base/nsDocument.cpp b/dom/base/nsDocument.cpp
@@ -9687,6 +9687,7 @@ nsDocument::RemovePlugin(nsIObjectLoadingContent* aPlugin)
   mPlugins.RemoveEntry(aPlugin);
 }
 
+#ifdef MOZ_ENABLE_NPAPI
 static bool
 AllSubDocumentPluginEnum(nsIDocument* aDocument, void* userArg)
 {
@@ -9706,6 +9707,7 @@ nsDocument::GetPlugins(nsTArray<nsIObjectLoadingContent*>& aPlugins)
   }
   EnumerateSubDocuments(AllSubDocumentPluginEnum, &aPlugins);
 }
+#endif
 
 nsresult
 nsDocument::AddResponsiveContent(nsIContent* aContent)
@@ -12307,4 +12309,4 @@ nsIDocument::ModuleScriptsEnabled()
   }
 
   return nsContentUtils::IsChromeDoc(this) || sEnabledForContent;
-}
+}
diff --git a/dom/base/nsDocument.h b/dom/base/nsDocument.h
@@ -829,10 +829,11 @@ class nsDocument : public nsIDocument,
   // RemovePlugin removes a plugin-related element to mPlugins when the
   // element is removed from the tree.
   virtual void RemovePlugin(nsIObjectLoadingContent* aPlugin) override;
+#ifdef MOZ_ENABLE_NPAPI
   // GetPlugins returns the plugin-related elements from
   // the frame and any subframes.
   virtual void GetPlugins(nsTArray<nsIObjectLoadingContent*>& aPlugins) override;
-
+#endif
   // Adds an element to mResponsiveContent when the element is
   // added to the tree.
   virtual nsresult AddResponsiveContent(nsIContent* aContent) override;

diff --git a/dom/base/nsFrameLoader.cpp b/dom/base/nsFrameLoader.cpp
@@ -78,8 +78,10 @@
 #include "AppProcessChecker.h"
 #include "ContentParent.h"
 #include "TabParent.h"
+#ifdef MOZ_ENABLE_NPAPI
 #include "mozilla/plugins/PPluginWidgetParent.h"
 #include "../plugins/ipc/PluginWidgetParent.h"
+#endif
 #include "mozilla/AsyncEventDispatcher.h"
 #include "mozilla/BasePrincipal.h"
 #include "mozilla/GuardObjects.h"
@@ -1153,6 +1155,7 @@ nsFrameLoader::SwapWithOtherRemoteLoader(nsFrameLoader* aOther,
   aOther->mRemoteBrowser->SetBrowserDOMWindow(browserDOMWindow);
   mRemoteBrowser->SetBrowserDOMWindow(otherBrowserDOMWindow);
 
+#ifdef MOZ_ENABLE_NPAPI
   // Native plugin windows used by this remote content need to be reparented.
   if (nsPIDOMWindowOuter* newWin = ourDoc->GetWindow()) {
     RefPtr<nsIWidget> newParent = nsGlobalWindow::Cast(newWin)->GetMainWidget();
@@ -1162,6 +1165,7 @@ nsFrameLoader::SwapWithOtherRemoteLoader(nsFrameLoader* aOther,
       static_cast<mozilla::plugins::PluginWidgetParent*>(iter.Get()->GetKey())->SetParent(newParent);
     }
   }
+#endif // MOZ_ENABLE_NPAPI
 
   MaybeUpdatePrimaryTabParent(eTabParentRemoved);
   aOther->MaybeUpdatePrimaryTabParent(eTabParentRemoved);

diff --git a/dom/base/nsIDocument.h b/dom/base/nsIDocument.h
@@ -2383,8 +2383,9 @@ class nsIDocument : public nsINode,
 
   virtual nsresult AddPlugin(nsIObjectLoadingContent* aPlugin) = 0;
   virtual void RemovePlugin(nsIObjectLoadingContent* aPlugin) = 0;
+#ifdef MOZ_ENABLE_NPAPI
   virtual void GetPlugins(nsTArray<nsIObjectLoadingContent*>& aPlugins) = 0;
-
+#endif
   virtual nsresult AddResponsiveContent(nsIContent* aContent) = 0;
   virtual void RemoveResponsiveContent(nsIContent* aContent) = 0;
   virtual void NotifyMediaFeatureValuesChanged() = 0;

diff --git a/dom/base/nsIObjectLoadingContent.idl b/dom/base/nsIObjectLoadingContent.idl
@@ -114,6 +114,7 @@ interface nsIObjectLoadingContent : nsISupports
    * printing the plugin. The returned nsIFrame is in the original document,
    * not in the static clone.
    */
+
   [noscript] nsIFrame getPrintFrame();
 
   /*
-Original file line number
+Diff line change
@@ Expand Up / @@ -114,6 +114,7 @@ interface nsIObjectLoadingContent : nsISupports @@
        * printing the plugin. The returned nsIFrame is in the original document,
        * not in the static clone.
        */
       [noscript] nsIFrame getPrintFrame();
       /*
@@ Expand Down @@