Browse Source

fix patch

Frank-Rainer Grahl 3 months ago
parent
commit
cdf9dd7668
1 changed files with 6 additions and 2 deletions
  1. 6 2
      mozilla-release/patches/1425440-11-59a1.patch

+ 6 - 2
mozilla-release/patches/1425440-11-59a1.patch

@@ -3,7 +3,7 @@
 # Date 1515494694 -3600
 #      Tue Jan 09 11:44:54 2018 +0100
 # Node ID 30b995a49772ed07790ea802c8501bf2cee444fa
-# Parent  ad4aebf7ceea0c5d33388e493e7cd1c0d2ff5683
+# Parent  72ac2dd148bb5117924ae79035d0eda7feba2106
 Bug 1425440 - Get rid of GetChildAt_Deprecated in nsMenuX, r=catalinb
 
 diff --git a/widget/cocoa/nsMenuX.mm b/widget/cocoa/nsMenuX.mm
@@ -45,13 +45,17 @@ diff --git a/widget/cocoa/nsMenuX.mm b/widget/cocoa/nsMenuX.mm
    // printf("Done building, mMenuObjectsArray.Count() = %d \n", mMenuObjectsArray.Count());
  }
  
-@@ -639,31 +636,27 @@ bool nsMenuX::OnClose()
+@@ -637,33 +634,31 @@ bool nsMenuX::OnClose()
+ // of a very few children so we won't be iterating over a bazillion menu items to find
+ // it (so the strcmp won't kill us).
  void nsMenuX::GetMenuPopupContent(nsIContent** aResult)
  {
    if (!aResult)
      return;
    *aResult = nullptr;
  
++  int32_t dummy;
++
    // Check to see if we are a "menupopup" node (if we are a native menu).
    {
 -    int32_t dummy;