Bug 1825010 Remove NS_NATIVE_DISPLAY as it's not used r=emilio,geckov…

…iew-reviewers,m_kato Differential Revision: https://phabricator.services.mozilla.com/D173841
iaxat · Mar 29, 2023 · 5fadb72 · 5fadb72
1 parent 1efc885
commit 5fadb72
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 18 deletions.
diff --git a/widget/android/nsWindow.cpp b/widget/android/nsWindow.cpp
@@ -2579,9 +2579,6 @@ void nsWindow::UpdateOverscrollOffset(const float aX, const float aY) {
 void* nsWindow::GetNativeData(uint32_t aDataType) {
   switch (aDataType) {
     // used by GLContextProviderEGL, nullptr is EGL_DEFAULT_DISPLAY
-    case NS_NATIVE_DISPLAY:
-      return nullptr;
-
     case NS_NATIVE_WIDGET:
       return (void*)this;
 

diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm
@@ -415,7 +415,6 @@ static void PrintViewHierarchy(NSView *view)
 
   switch (aDataType) {
     case NS_NATIVE_WIDGET:
-    case NS_NATIVE_DISPLAY:
       retVal = (void*)mView;
       break;
 

diff --git a/widget/cocoa/nsCocoaWindow.mm b/widget/cocoa/nsCocoaWindow.mm
@@ -666,7 +666,6 @@ static unsigned int WindowMaskForBorderStyle(BorderStyle aBorderStyle) {
     // to emulate how windows works, we always have to return a NSView
     // for NS_NATIVE_WIDGET
     case NS_NATIVE_WIDGET:
-    case NS_NATIVE_DISPLAY:
       retVal = [mWindow contentView];
       break;
 

diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
@@ -3379,17 +3379,6 @@ void* nsWindow::GetNativeData(uint32_t aDataType) {
       return mGdkWindow;
     }
 
-    case NS_NATIVE_DISPLAY: {
-#ifdef MOZ_X11
-      GdkDisplay* gdkDisplay = gdk_display_get_default();
-      if (GdkIsX11Display(gdkDisplay)) {
-        return GDK_DISPLAY_XDISPLAY(gdkDisplay);
-      }
-#endif /* MOZ_X11 */
-      // Don't bother to return native display on Wayland as it's for
-      // X11 only NPAPI plugins.
-      return nullptr;
-    }
     case NS_NATIVE_SHELLWIDGET:
       return GetToplevelWidget();
 

diff --git a/widget/nsIWidget.h b/widget/nsIWidget.h
@@ -119,7 +119,6 @@ typedef void* nsNativeWidget;
 #define NS_NATIVE_GRAPHIC 1
 #define NS_NATIVE_TMP_WINDOW 2
 #define NS_NATIVE_WIDGET 3
-#define NS_NATIVE_DISPLAY 4
 #define NS_NATIVE_REGION 5
 #define NS_NATIVE_OFFSETX 6
 #define NS_NATIVE_OFFSETY 7

diff --git a/widget/uikit/nsWindow.mm b/widget/uikit/nsWindow.mm
@@ -672,7 +672,6 @@ - (void)drawRect:(CGRect)aRect inContext:(CGContextRef)aContext {
 
   switch (aDataType) {
     case NS_NATIVE_WIDGET:
-    case NS_NATIVE_DISPLAY:
       retVal = (void*)mNativeView;
       break;