diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2020-02-20 12:12:30 -0500 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 12:49:08 +0200 |
| commit | 496fbaf738fb00824d7e972e874bfdbe85caaee5 (patch) | |
| tree | d1ee93e14f49f8ff5e05cd1e0f52693df4721b93 /widget/CompositorWidget.h | |
| parent | 85621ee9b30dd325b85eecb7137a0d3cb1d38c27 (diff) | |
| download | UXP-496fbaf738fb00824d7e972e874bfdbe85caaee5.tar UXP-496fbaf738fb00824d7e972e874bfdbe85caaee5.tar.gz UXP-496fbaf738fb00824d7e972e874bfdbe85caaee5.tar.lz UXP-496fbaf738fb00824d7e972e874bfdbe85caaee5.tar.xz UXP-496fbaf738fb00824d7e972e874bfdbe85caaee5.zip | |
Issue #1053 - Remove conditional android code from widget/
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. |