Commit ed93bd50 authored by Daniel Holbert's avatar Daniel Holbert
Browse files

Bug 1733465 part 2: Modernize nsViewManager::GetRootWidget() to use... 

Bug 1733465 part 2: Modernize nsViewManager::GetRootWidget() to use already_AddRefed return value, instead of requiring getter_AddRefs at callsite. r=tnikkel

This patch shouldn't change behavior at all.

This patch replaces a manual NS_ADDREF call with typesafe code that manages the
reference count for us.  This reduces repeated boilerplate code, in the
implementation as well as the callsites.

Differential Revision: https://phabricator.services.mozilla.com/D127179
parent bfb72ec4

accessible/android/SessionAccessibility.cpp

+1 −2
Original line number Diff line number Diff line
@@ -182,8 +182,7 @@ RefPtr<SessionAccessibility> SessionAccessibility::GetInstanceFor( 
    return nullptr;

  }



  nsCOMPtr<nsIWidget> rootWidget;

  vm->GetRootWidget(getter_AddRefs(rootWidget));

  nsCOMPtr<nsIWidget> rootWidget = vm->GetRootWidget();

  // `rootWidget` can be one of several types. Here we make sure it is an

  // android nsWindow.

  if (RefPtr<nsWindow> window = nsWindow::From(rootWidget)) {

accessible/generic/DocAccessible.cpp

+1 −2
Original line number Diff line number Diff line
@@ -932,8 +932,7 @@ void* DocAccessible::GetNativeWindow() const { 
  nsViewManager* vm = mPresShell->GetViewManager();

  if (!vm) return nullptr;



  nsCOMPtr<nsIWidget> widget;

  vm->GetRootWidget(getter_AddRefs(widget));

  nsCOMPtr<nsIWidget> widget = vm->GetRootWidget();

  if (widget) return widget->GetNativeData(NS_NATIVE_WINDOW);



  return nullptr;

accessible/windows/msaa/MsaaAccessible.cpp

+1 −2
Original line number Diff line number Diff line
@@ -251,8 +251,7 @@ HWND MsaaAccessible::GetHWNDFor(Accessible* aAccessible) { 
    nsIWidget* widget = frame->GetNearestWidget();

    if (widget && widget->IsVisible()) {

      if (nsViewManager* vm = document->PresShellPtr()->GetViewManager()) {

        nsCOMPtr<nsIWidget> rootWidget;

        vm->GetRootWidget(getter_AddRefs(rootWidget));

        nsCOMPtr<nsIWidget> rootWidget = vm->GetRootWidget();

        // Make sure the accessible belongs to popup. If not then use

        // document HWND (which might be different from root widget in the

        // case of window emulation).

dom/base/nsContentSink.cpp

+1 −2
Original line number Diff line number Diff line
@@ -1032,8 +1032,7 @@ nsresult nsContentSink::DidProcessATokenImpl() { 
      (mDeflectedCount % StaticPrefs::content_sink_event_probe_rate()) == 0) {

    nsViewManager* vm = presShell->GetViewManager();

    NS_ENSURE_TRUE(vm, NS_ERROR_FAILURE);

    nsCOMPtr<nsIWidget> widget;

    vm->GetRootWidget(getter_AddRefs(widget));

    nsCOMPtr<nsIWidget> widget = vm->GetRootWidget();

    mHasPendingEvent = widget && widget->HasPendingInputEvent();

  }

dom/base/nsFocusManager.cpp

+3 −6
Original line number Diff line number Diff line
@@ -1370,8 +1370,7 @@ void nsFocusManager::EnsureCurrentWidgetFocused(CallerType aCallerType) { 
  if (!vm) {

    return;

  }

  nsCOMPtr<nsIWidget> widget;

  vm->GetRootWidget(getter_AddRefs(widget));

  nsCOMPtr<nsIWidget> widget = vm->GetRootWidget();

  if (!widget) {

    return;

  }
@@ -2581,8 +2580,7 @@ void nsFocusManager::Focus( 


  if (aAdjustWidget && !sTestMode) {

    if (nsViewManager* vm = presShell->GetViewManager()) {

      nsCOMPtr<nsIWidget> widget;

      vm->GetRootWidget(getter_AddRefs(widget));

      nsCOMPtr<nsIWidget> widget = vm->GetRootWidget();

      if (widget)

        widget->SetFocus(nsIWidget::Raise::No, aFlags & FLAG_NONSYSTEMCALLER

                                                   ? CallerType::NonSystem
@@ -2966,8 +2964,7 @@ void nsFocusManager::RaiseWindow(nsPIDOMWindowOuter* aWindow, 
  }



  if (nsViewManager* vm = presShell->GetViewManager()) {

    nsCOMPtr<nsIWidget> widget;

    vm->GetRootWidget(getter_AddRefs(widget));

    nsCOMPtr<nsIWidget> widget = vm->GetRootWidget();

    if (widget) {

      widget->SetFocus(nsIWidget::Raise::Yes, aCallerType);

    }