Commit b44d1c03 authored by Emilio Cobos Álvarez's avatar Emilio Cobos Álvarez
Browse files

Bug 1772432 - Clean up nsWidgetInitData. r=stransky 

Use inline initializers, remove dead code, use consistent naming.

No behavior change.

Differential Revision: https://phabricator.services.mozilla.com/D148209
parent e9375334

layout/xul/nsMenuPopupFrame.cpp

+1 −1
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ nsresult nsMenuPopupFrame::CreateWidgetForView(nsView* aView) { 
  nsWidgetInitData widgetData;

  widgetData.mWindowType = eWindowType_popup;

  widgetData.mBorderStyle = eBorderStyle_default;

  widgetData.clipSiblings = true;

  widgetData.mClipSiblings = true;

  widgetData.mPopupHint = mPopupType;

  widgetData.mNoAutoHide = IsNoAutoHide();

toolkit/components/browser/nsWebBrowser.cpp

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ nsIWidget* nsWebBrowser::EnsureWidget() { 
  }



  nsWidgetInitData widgetInit;

  widgetInit.clipChildren = true;

  widgetInit.mClipChildren = true;

  widgetInit.mWindowType = eWindowType_child;

  LayoutDeviceIntRect bounds(0, 0, 0, 0);

view/nsView.cpp

+2 −2
Original line number Diff line number Diff line
@@ -517,8 +517,8 @@ static int32_t FindNonAutoZIndex(nsView* aView) { 
struct DefaultWidgetInitData : public nsWidgetInitData {

  DefaultWidgetInitData() : nsWidgetInitData() {

    mWindowType = eWindowType_child;

    clipChildren = true;

    clipSiblings = true;

    mClipChildren = true;

    mClipSiblings = true;

  }

};

widget/nsBaseWidget.cpp

+1 −4
Original line number Diff line number Diff line
@@ -146,7 +146,6 @@ nsBaseWidget::nsBaseWidget(nsBorderStyle aBorderStyle) 
      mPopupLevel(ePopupLevelTop),

      mPopupType(ePopupTypeAny),

      mHasRemoteContent(false),

      mFissionWindow(false),

      mUpdateCursor(true),

      mUseAttachedEvents(false),

      mIMEHasFocus(false),
@@ -414,14 +413,12 @@ nsBaseWidget::~nsBaseWidget() { 
//

//-------------------------------------------------------------------------

void nsBaseWidget::BaseCreate(nsIWidget* aParent, nsWidgetInitData* aInitData) {

  // keep a reference to the device context

  if (nullptr != aInitData) {

  if (aInitData) {

    mWindowType = aInitData->mWindowType;

    mBorderStyle = aInitData->mBorderStyle;

    mPopupLevel = aInitData->mPopupLevel;

    mPopupType = aInitData->mPopupHint;

    mHasRemoteContent = aInitData->mHasRemoteContent;

    mFissionWindow = aInitData->mFissionWindow;

  }



  if (aParent) {

widget/nsBaseWidget.h

+0 −1
Original line number Diff line number Diff line
@@ -714,7 +714,6 @@ class nsBaseWidget : public nsIWidget, public nsSupportsWeakReference { 
  nsPopupType mPopupType;

  SizeConstraints mSizeConstraints;

  bool mHasRemoteContent;

  bool mFissionWindow;



  bool mUpdateCursor;

  bool mUseAttachedEvents;