diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 21:49:04 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 21:49:04 +0200 |
| commit | 39dac57259cff8b61db0b22cb2ad0a8adb02692e (patch) | |
| tree | 52a026cc8c22793eb17fd0f5e22adce1ae08a1dd /widget/CompositorWidget.h | |
| parent | a1cce3b2b00bbd9f4983013ddd8934a7bccb9e99 (diff) | |
| parent | c2d9ab62f3d097c9e0e00184cab1f546554f5eaa (diff) | |
| download | UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar.gz UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar.lz UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar.xz UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.zip | |
Merge branch 'redwood' into 28.9-platform
Diffstat (limited to 'widget/CompositorWidget.h')
| -rw-r--r-- | widget/CompositorWidget.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/widget/CompositorWidget.h b/widget/CompositorWidget.h index 93269eac6..eb657ba7f 100644 --- a/widget/CompositorWidget.h +++ b/widget/CompositorWidget.h @@ -30,7 +30,6 @@ namespace widget { class WinCompositorWidget; class X11CompositorWidget; -class AndroidCompositorWidget; class CompositorWidgetInitData; // Gecko widgets usually need to communicate with the CompositorWidget with @@ -56,12 +55,9 @@ class CompositorWidgetChild; class WidgetRenderingContext { public: -#if defined(XP_MACOSX) +#ifdef XP_MACOSX WidgetRenderingContext() : mLayerManager(nullptr) {} layers::LayerManagerComposite* mLayerManager; -#elif defined(MOZ_WIDGET_ANDROID) - WidgetRenderingContext() : mCompositor(nullptr) {} - layers::Compositor* mCompositor; #endif }; @@ -262,9 +258,6 @@ public: virtual X11CompositorWidget* AsX11() { return nullptr; } - virtual AndroidCompositorWidget* AsAndroid() { - return nullptr; - } /** * Return the platform-specific delegate for the widget, if any. |