focus rects should now be hidden

r=pollmann sr=buster

layout/forms/nsComboboxControlFrame.cpp

@@ -2502,6 +2502,9 @@ nsComboboxControlFrame::Paint(nsIPresContext* aPresContext,
       /////////////////////
       // draw focus
       // XXX This is only temporary
+      const nsStyleDisplay* disp = (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display);
+      // Only paint the focus if we're visible
+      if (disp->IsVisible()) {
         nsCOMPtr<nsIEventStateManager> stateManager;
         nsresult rv = mPresContext->GetEventStateManager(getter_AddRefs(stateManager));
         if (NS_SUCCEEDED(rv)) {
@@ -2530,6 +2533,7 @@ nsComboboxControlFrame::Paint(nsIPresContext* aPresContext,
           aRenderingContext.DrawLine(clipRect.x, clipRect.y+clipRect.height, 
                                      clipRect.x, clipRect.y);
         }
+      }
       /////////////////////
       aRenderingContext.PopState(clipEmpty);
     }

layout/html/forms/src/nsComboboxControlFrame.cpp

@@ -2502,6 +2502,9 @@ nsComboboxControlFrame::Paint(nsIPresContext* aPresContext,
       /////////////////////
       // draw focus
       // XXX This is only temporary
+      const nsStyleDisplay* disp = (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display);
+      // Only paint the focus if we're visible
+      if (disp->IsVisible()) {
         nsCOMPtr<nsIEventStateManager> stateManager;
         nsresult rv = mPresContext->GetEventStateManager(getter_AddRefs(stateManager));
         if (NS_SUCCEEDED(rv)) {
@@ -2530,6 +2533,7 @@ nsComboboxControlFrame::Paint(nsIPresContext* aPresContext,
           aRenderingContext.DrawLine(clipRect.x, clipRect.y+clipRect.height, 
                                      clipRect.x, clipRect.y);
         }
+      }
       /////////////////////
       aRenderingContext.PopState(clipEmpty);
     }