Check if drawFocusRingMaskWithFrame:inView: exists when drawing focus ring

Source/core/rendering/RenderThemeChromiumMac.mm

 /*
  * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Google, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 608 matching lines @@
 void RenderThemeChromiumMac::updateEnabledState(NSCell* cell, const RenderObject* o)
 {
     bool oldEnabled = [cell isEnabled];
     bool enabled = isEnabled(o);
     if (enabled != oldEnabled)
         [cell setEnabled:enabled];
 }
 
 void RenderThemeChromiumMac::updateFocusedState(NSCell* cell, const RenderObject* o)
 {
+    if ([cell respondsToSelector:@selector(drawFocusRingMaskWithFrame:inView:)])

[Robert Sesek, 2014/07/21 21:14:38]

Add a comment as to why you need to do this? You stated the reason in the review
comments, but it won't be obvious to posterity.

+        return;
     bool oldFocused = [cell showsFirstResponder];
     bool focused = isFocused(o) && o->style()->outlineStyleIsAuto();
     if (focused != oldFocused)
         [cell setShowsFirstResponder:focused];
 }
 
 void RenderThemeChromiumMac::updatePressedState(NSCell* cell, const RenderObject* o)
 {
     bool oldPressed = [cell isHighlighted];
     bool pressed = (o->node() && o->node()->active());
@@ skipping 269 matching lines @@
     if (zoomLevel != 1.0f) {
         inflatedRect.setWidth(inflatedRect.width() / zoomLevel);
         inflatedRect.setHeight(inflatedRect.height() / zoomLevel);
         paintInfo.context->translate(inflatedRect.x(), inflatedRect.y());
         paintInfo.context->scale(zoomLevel, zoomLevel);
         paintInfo.context->translate(-inflatedRect.x(), -inflatedRect.y());
     }
 
     NSView *view = documentViewFor(o);
     [popupButton drawWithFrame:inflatedRect inView:view];
-#if !BUTTON_CELL_DRAW_WITH_FRAME_DRAWS_FOCUS_RING
     if (isFocused(o) && o->style()->outlineStyleIsAuto())
         [popupButton _web_drawFocusRingWithFrame:inflatedRect inView:view];
-#endif
     [popupButton setControlView:nil];
 
     return false;
 }
 
 IntSize RenderThemeChromiumMac::meterSizeForBounds(const RenderMeter* renderMeter, const IntRect& bounds) const
 {
     if (NoControlPart == renderMeter->style()->appearance())
         return bounds.size();
 
@@ skipping 331 matching lines @@
     NSPopUpButtonCell* popupButton = this->popupButton();
 
     // Set the control size based off the rectangle we're painting into.
     setControlSize(popupButton, popupButtonSizes(), r.size(), o->style()->effectiveZoom());
 
     // Update the various states we respond to.
     updateActiveState(popupButton, o);
     updateCheckedState(popupButton, o);
     updateEnabledState(popupButton, o);
     updatePressedState(popupButton, o);
-#if BUTTON_CELL_DRAW_WITH_FRAME_DRAWS_FOCUS_RING
     updateFocusedState(popupButton, o);
-#endif
 }
 
 const IntSize* RenderThemeChromiumMac::menuListSizes() const
 {
     static const IntSize sizes[3] = { IntSize(9, 0), IntSize(5, 0), IntSize(0, 0) };
     return sizes;
 }
 
 int RenderThemeChromiumMac::minimumMenuListSize(RenderStyle* style) const
 {
@@ skipping 618 matching lines @@
 
 bool RenderThemeChromiumMac::shouldUseFallbackTheme(RenderStyle* style) const
 {
     ControlPart part = style->appearance();
     if (part == CheckboxPart || part == RadioPart)
         return style->effectiveZoom() != 1;
     return false;
 }
 
 } // namespace WebCore