Bug 1421088 - Remove unused parameters from DrawFocusOutline. r?spohl draft
authorMarkus Stange <mstange@themasta.com>
Fri, 01 Dec 2017 18:07:24 -0500
changeset 782254 16d92ad3751e4be57df636e51ab6104bac6251b3
parent 782253 f98522ef73a7b1a1485e3fb43756475e3f5679ab
child 782255 b07481eab5ef40251455444db049d7c588490fe6
push id106506
push userbmo:mstange@themasta.com
push dateSun, 15 Apr 2018 03:32:46 +0000
reviewersspohl
bugs1421088
milestone61.0a1
Bug 1421088 - Remove unused parameters from DrawFocusOutline. r?spohl MozReview-Commit-ID: Kd6Rxl58Xwh
widget/cocoa/nsNativeThemeCocoa.h
widget/cocoa/nsNativeThemeCocoa.mm
--- a/widget/cocoa/nsNativeThemeCocoa.h
+++ b/widget/cocoa/nsNativeThemeCocoa.h
@@ -362,19 +362,17 @@ protected:
   void DrawHIThemeButton(CGContextRef cgContext, const HIRect& aRect,
                          ThemeButtonKind aKind, ThemeButtonValue aValue,
                          ThemeDrawState aState, ThemeButtonAdornment aAdornment,
                          const ControlParams& aParams);
   void DrawButton(CGContextRef context, const HIRect& inBoxRect,
                   const ButtonParams& aParams);
   void DrawTreeHeaderCell(CGContextRef context, const HIRect& inBoxRect,
                           const TreeHeaderCellParams& aParams);
-  void DrawFocusOutline(CGContextRef cgContext, const HIRect& inBoxRect,
-                        mozilla::EventStates inState, uint8_t aWidgetType,
-                        nsIFrame* aFrame);
+  void DrawFocusOutline(CGContextRef cgContext, const HIRect& inBoxRect);
   void DrawDropdown(CGContextRef context, const HIRect& inBoxRect,
                     const DropdownParams& aParams);
   HIThemeButtonDrawInfo SpinButtonDrawInfo(ThemeButtonKind aKind,
                                            const SpinButtonParams& aParams);
   void DrawSpinButtons(CGContextRef context, const HIRect& inBoxRect,
                        const SpinButtonParams& aParams);
   void DrawSpinButton(CGContextRef context,
                       const HIRect& inBoxRect, SpinButton aDrawnButton,
--- a/widget/cocoa/nsNativeThemeCocoa.mm
+++ b/widget/cocoa/nsNativeThemeCocoa.mm
@@ -1497,19 +1497,17 @@ nsNativeThemeCocoa::DrawDisclosureButton
   DrawCellWithScaling(mDisclosureButtonCell, cgContext, inBoxRect, NSRegularControlSize,
                       NSZeroSize, kDisclosureButtonSize, NULL, mCellDrawView,
                       false); // Don't mirror icon in RTL.
 
   NS_OBJC_END_TRY_ABORT_BLOCK;
 }
 
 void
-nsNativeThemeCocoa::DrawFocusOutline(CGContextRef cgContext, const HIRect& inBoxRect,
-                                     EventStates inState, uint8_t aWidgetType,
-                                     nsIFrame* aFrame)
+nsNativeThemeCocoa::DrawFocusOutline(CGContextRef cgContext, const HIRect& inBoxRect)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
   HIThemeFrameDrawInfo fdi;
   fdi.version = 0;
   fdi.kind = kHIThemeFrameTextFieldSquare;
   fdi.state = kThemeStateActive;
   fdi.isFocused = TRUE;
@@ -2968,17 +2966,17 @@ nsNativeThemeCocoa::DrawWidgetBackground
       } else {
         DrawButton(cgContext, macRect,
                    ButtonParams{ComputeControlParams(aFrame, eventState),
                                 ButtonType::eRoundedBezelPushButton});
       }
       break;
 
     case NS_THEME_FOCUS_OUTLINE:
-      DrawFocusOutline(cgContext, macRect, eventState, aWidgetType, aFrame);
+      DrawFocusOutline(cgContext, macRect);
       break;
 
     case NS_THEME_MAC_HELP_BUTTON:
       DrawButton(cgContext, macRect,
                  ButtonParams{ComputeControlParams(aFrame, eventState),
                               ButtonType::eHelpButton});
       break;