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/InProcessCompositorWidget.cpp | |
| 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/InProcessCompositorWidget.cpp')
| -rw-r--r-- | widget/InProcessCompositorWidget.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/widget/InProcessCompositorWidget.cpp b/widget/InProcessCompositorWidget.cpp index 9b301fc48..df7250d9f 100644 --- a/widget/InProcessCompositorWidget.cpp +++ b/widget/InProcessCompositorWidget.cpp @@ -5,10 +5,6 @@ #include "InProcessCompositorWidget.h" #include "nsBaseWidget.h" -#if defined(MOZ_WIDGET_ANDROID) && !defined(MOZ_WIDGET_SUPPORTS_OOP_COMPOSITING) -#include "mozilla/widget/AndroidCompositorWidget.h" -#endif - namespace mozilla { namespace widget { @@ -19,11 +15,7 @@ namespace widget { CompositorWidget::CreateLocal(const CompositorWidgetInitData& aInitData, nsIWidget* aWidget) { MOZ_ASSERT(aWidget); -#ifdef MOZ_WIDGET_ANDROID - return new AndroidCompositorWidget(static_cast<nsBaseWidget*>(aWidget)); -#else return new InProcessCompositorWidget(static_cast<nsBaseWidget*>(aWidget)); -#endif } #endif |