diff options
| author | Jeremy Andrews <athenian200@outlook.com> | 2021-12-06 14:12:03 -0600 |
|---|---|---|
| committer | Jeremy Andrews <athenian200@outlook.com> | 2021-12-06 14:12:03 -0600 |
| commit | 6ba2252bcf00b14464f2d0f19ad1b4c6e029a5a8 (patch) | |
| tree | fa18ce1566d48cb84295482cacab6ec60a9cc7ff /layout | |
| parent | 31022b58f3c139e48636a8cf8cb2c36812c72114 (diff) | |
| download | aura-central-6ba2252bcf00b14464f2d0f19ad1b4c6e029a5a8.tar.gz | |
Issue mcp-graveyard/UXP%190 - Remove UIKit conditional code.
Diffstat (limited to 'layout')
| -rw-r--r-- | layout/base/ZoomConstraintsClient.cpp | 4 | ||||
| -rw-r--r-- | layout/base/nsDocumentViewer.cpp | 2 | ||||
| -rw-r--r-- | layout/base/nsLayoutUtils.cpp | 4 |
3 files changed, 1 insertions, 9 deletions
diff --git a/layout/base/ZoomConstraintsClient.cpp b/layout/base/ZoomConstraintsClient.cpp index 67666676b..b2124ad4e 100644 --- a/layout/base/ZoomConstraintsClient.cpp +++ b/layout/base/ZoomConstraintsClient.cpp @@ -53,13 +53,9 @@ GetWidget(nsIPresShell* aShell) return nullptr; } if (nsIFrame* rootFrame = aShell->GetRootFrame()) { -#if defined(MOZ_WIDGET_UIKIT) - return rootFrame->GetNearestWidget(); -#else if (nsView* view = rootFrame->GetView()) { return view->GetWidget(); } -#endif } return nullptr; } diff --git a/layout/base/nsDocumentViewer.cpp b/layout/base/nsDocumentViewer.cpp index d4fcd7a77..fe2b5b345 100644 --- a/layout/base/nsDocumentViewer.cpp +++ b/layout/base/nsDocumentViewer.cpp @@ -4319,7 +4319,7 @@ nsDocumentViewer::ShouldAttachToTopLevel() if (nsIWidget::UsePuppetWidgets()) return true; -#if defined(XP_WIN) || defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_UIKIT) +#if defined(XP_WIN) || defined(MOZ_WIDGET_GTK) // On windows, in the parent process we also attach, but just to // chrome items nsWindowType winType = mParentWidget->WindowType(); diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp index 6c73db7e2..a66848235 100644 --- a/layout/base/nsLayoutUtils.cpp +++ b/layout/base/nsLayoutUtils.cpp @@ -8091,12 +8091,8 @@ UpdateCompositionBoundsForRCDRSF(ParentLayerRect& aCompBounds, return false; } -#if defined(MOZ_WIDGET_UIKIT) - nsIWidget* widget = rootFrame->GetNearestWidget(); -#else nsView* view = rootFrame->GetView(); nsIWidget* widget = view ? view->GetWidget() : nullptr; -#endif if (widget) { LayoutDeviceIntRect widgetBounds = widget->GetBounds(); |