Fix for ender clip widget bug #42451

layout/html/base/src/nsScrollPortFrame.cpp

@@ -54,12 +54,12 @@ nsScrollPortFrame::NeedsClipWidget()
 
   while (parentFrame) {
     if ((NS_SUCCEEDED(parentFrame->QueryInterface(kIFormControlFrameIID, (void**)&fcFrame)))) {
-      return(PR_TRUE);
+      return(PR_FALSE);
     }
     parentFrame->GetParent(&parentFrame); 
   }
  
-  return PR_FALSE;
+  return PR_TRUE;
 }
 
 #ifdef NS_DEBUG

layout/xul/base/src/nsScrollBoxFrame.cpp

@@ -286,7 +286,9 @@ nsScrollBoxFrame::CreateScrollingView(nsIPresContext* aPresContext)
     scrollingView->SetScrollPreference(nsScrollPreference_kNeverScroll);
 
     // Have the scrolling view create its internal widgets
-    scrollingView->CreateScrollControls(); 
+    if (NeedsClipWidget()) {
+      scrollingView->CreateScrollControls(); 
+    }
 
     // Set the scrolling view's insets to whatever our border is
     nsMargin border;