Merge to M58: AXObject::performDefaultAction() should focus if it can't click

third_party/WebKit/Source/modules/accessibility/AXObject.h

 /*
  * Copyright (C) 2008, 2009, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nuanti Ltd.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 972 matching lines @@
   IntPoint minimumScrollOffset() const;
   IntPoint maximumScrollOffset() const;
   void setScrollOffset(const IntPoint&) const;
 
   // If this object itself scrolls, return its ScrollableArea.
   virtual ScrollableArea* getScrollableAreaIfScrollable() const { return 0; }
 
   // Modify or take an action on an object.
   virtual void increment() {}
   virtual void decrement() {}
-  bool performDefaultAction() const { return press(); }
-  virtual bool press() const;
+  bool performDefaultAction() { return press(); }
+  virtual bool press();
   // Make this object visible by scrolling as many nested scrollable views as
   // needed.
   void scrollToMakeVisible() const;
   // Same, but if the whole object can't be made visible, try for this subrect,
   // in local coordinates.
   void scrollToMakeVisibleWithSubFocus(const IntRect&) const;
   // Scroll this object to a given point in global coordinates of the top-level
   // window.
   void scrollToGlobalPoint(const IntPoint&) const;
   virtual void setFocused(bool) {}
@@ skipping 101 matching lines @@
   static unsigned s_numberOfLiveAXObjects;
 };
 
 #define DEFINE_AX_OBJECT_TYPE_CASTS(thisType, predicate)           \
   DEFINE_TYPE_CASTS(thisType, AXObject, object, object->predicate, \
                     object.predicate)
 
 }  // namespace blink
 
 #endif  // AXObject_h