Backed out changeset 880f56e1656b (bug 1603839) for causing build bustages on GtkCompositorWidget.h

marco-c · marco-c · commit 37f92b26e3bc · 2020-04-25T19:08:11.000Z
CLOSED TREE

UltraBlame original commit: 97746752b28722cf211936074133ae771f760fec
diff --git a/widget/gtk/CompositorWidgetParent.cpp b/widget/gtk/CompositorWidgetParent.cpp
@@ -152,7 +152,6 @@ get_GtkCompositorWidgetInitData
 (
 )
 aOptions
-nullptr
 )
 {
 MOZ_ASSERT
diff --git a/widget/gtk/GtkCompositorWidget.cpp b/widget/gtk/GtkCompositorWidget.cpp
@@ -253,34 +253,28 @@ MOZ_WAYLAND
 if
 (
 !
-aInitData
-.
-IsX11Display
-(
-)
+mXDisplay
 )
 {
-if
+MOZ_RELEASE_ASSERT
 (
-!
 aWindow
-)
-{
-NS_WARNING
-(
 "
-GtkCompositorWidget
-:
 We
 '
 re
-missing
+running
+on
+Wayland
+and
+but
+without
+valid
 nsWindow
-!
+.
 "
 )
 ;
-}
 mProvider
 .
 Initialize
@@ -596,8 +590,6 @@ GetEGLNativeWindow
 )
 {
 return
-mWidget
-?
 (
 EGLNativeWindowType
 )
@@ -608,8 +600,6 @@ GetNativeData
 (
 NS_NATIVE_EGL_WINDOW
 )
-:
-nullptr
 ;
 }
 #
diff --git a/widget/gtk/GtkCompositorWidget.h b/widget/gtk/GtkCompositorWidget.h
@@ -202,12 +202,8 @@ aOptions
 nsWindow
 *
 aWindow
-/
-*
 =
 nullptr
-*
-/
 )
 ;
 ~
@@ -390,9 +386,6 @@ mXWindow
 WindowSurfaceProvider
 mProvider
 ;
-bool
-mIsX11Display
-;
 }
 ;
 }
diff --git a/widget/gtk/PlatformWidgetTypes.ipdlh b/widget/gtk/PlatformWidgetTypes.ipdlh
@@ -147,9 +147,6 @@ XDisplayString
 bool
 Shaped
 ;
-bool
-IsX11Display
-;
 LayoutDeviceIntSize
 InitialClientSize
 ;
diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
@@ -49391,19 +49391,6 @@ mXDisplay
 )
 ;
 }
-bool
-isShaped
-=
-mIsTransparent
-&
-&
-!
-mHasAlphaVisual
-&
-&
-!
-mTransparencyBitmapForTitlebar
-;
 *
 aInitData
 =
@@ -49441,8 +49428,15 @@ mXDisplay
 nsCString
 (
 )
-isShaped
-mIsX11Display
+mIsTransparent
+&
+&
+!
+mHasAlphaVisual
+&
+&
+!
+mTransparencyBitmapForTitlebar
 GetClientSize
 (
 )

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,6 @@ get_GtkCompositorWidgetInitData`
`152`	`152`	`(`
`153`	`153`	`)`
`154`	`154`	`aOptions`
`155`		`-nullptr`
`156`	`155`	`)`
`157`	`156`	`{`
`158`	`157`	`MOZ_ASSERT`
Original file line number	Diff line number	Diff line change
`@@ -253,34 +253,28 @@ MOZ_WAYLAND`
`253`	`253`	`if`
`254`	`254`	`(`
`255`	`255`	`!`
`256`		`-aInitData`
`257`		`-.`
`258`		`-IsX11Display`
`259`		`-(`
`260`		`-)`
	`256`	`+mXDisplay`
`261`	`257`	`)`
`262`	`258`	`{`
`263`		`-if`
	`259`	`+MOZ_RELEASE_ASSERT`
`264`	`260`	`(`
`265`		`-!`
`266`	`261`	`aWindow`
`267`		`-)`
`268`		`-{`
`269`		`-NS_WARNING`
`270`		`-(`
`271`	`262`	`"`
`272`		`-GtkCompositorWidget`
`273`		`-:`
`274`	`263`	`We`
`275`	`264`	`'`
`276`	`265`	`re`
`277`		`-missing`
	`266`	`+running`
	`267`	`+on`
	`268`	`+Wayland`
	`269`	`+and`
	`270`	`+but`
	`271`	`+without`
	`272`	`+valid`
`278`	`273`	`nsWindow`
`279`		`-!`
	`274`	`+.`
`280`	`275`	`"`
`281`	`276`	`)`
`282`	`277`	`;`
`283`		`-}`
`284`	`278`	`mProvider`
`285`	`279`	`.`
`286`	`280`	`Initialize`
`@@ -596,8 +590,6 @@ GetEGLNativeWindow`
`596`	`590`	`)`
`597`	`591`	`{`
`598`	`592`	`return`
`599`		`-mWidget`
`600`		`-?`
`601`	`593`	`(`
`602`	`594`	`EGLNativeWindowType`
`603`	`595`	`)`
`@@ -608,8 +600,6 @@ GetNativeData`
`608`	`600`	`(`
`609`	`601`	`NS_NATIVE_EGL_WINDOW`
`610`	`602`	`)`
`611`		`-:`
`612`		`-nullptr`
`613`	`603`	`;`
`614`	`604`	`}`
`615`	`605`	`#`
Original file line number	Diff line number	Diff line change
`@@ -202,12 +202,8 @@ aOptions`
`202`	`202`	`nsWindow`
`203`	`203`	`*`
`204`	`204`	`aWindow`
`205`		`-/`
`206`		`-*`
`207`	`205`	`=`
`208`	`206`	`nullptr`
`209`		`-*`
`210`		`-/`
`211`	`207`	`)`
`212`	`208`	`;`
`213`	`209`	`~`
`@@ -390,9 +386,6 @@ mXWindow`
`390`	`386`	`WindowSurfaceProvider`
`391`	`387`	`mProvider`
`392`	`388`	`;`
`393`		`-bool`
`394`		`-mIsX11Display`
`395`		`-;`
`396`	`389`	`}`
`397`	`390`	`;`
`398`	`391`	`}`
Original file line number	Diff line number	Diff line change
`@@ -147,9 +147,6 @@ XDisplayString`
`147`	`147`	`bool`
`148`	`148`	`Shaped`
`149`	`149`	`;`
`150`		`-bool`
`151`		`-IsX11Display`
`152`		`-;`
`153`	`150`	`LayoutDeviceIntSize`
`154`	`151`	`InitialClientSize`
`155`	`152`	`;`
Original file line number	Diff line number	Diff line change
`@@ -49391,19 +49391,6 @@ mXDisplay`
`49391`	`49391`	`)`
`49392`	`49392`	`;`
`49393`	`49393`	`}`
`49394`		`-bool`
`49395`		`-isShaped`
`49396`		`-=`
`49397`		`-mIsTransparent`
`49398`		`-&`
`49399`		`-&`
`49400`		`-!`
`49401`		`-mHasAlphaVisual`
`49402`		`-&`
`49403`		`-&`
`49404`		`-!`
`49405`		`-mTransparencyBitmapForTitlebar`
`49406`		`-;`
`49407`	`49394`	`*`
`49408`	`49395`	`aInitData`
`49409`	`49396`	`=`
`@@ -49441,8 +49428,15 @@ mXDisplay`
`49441`	`49428`	`nsCString`
`49442`	`49429`	`(`
`49443`	`49430`	`)`
`49444`		`-isShaped`
`49445`		`-mIsX11Display`
	`49431`	`+mIsTransparent`
	`49432`	`+&`
	`49433`	`+&`
	`49434`	`+!`
	`49435`	`+mHasAlphaVisual`
	`49436`	`+&`
	`49437`	`+&`
	`49438`	`+!`
	`49439`	`+mTransparencyBitmapForTitlebar`
`49446`	`49440`	`GetClientSize`
`49447`	`49441`	`(`
`49448`	`49442`	`)`