Changeset 114031 in webkit


Ignore:
Timestamp:
Apr 12, 2012 1:56:47 PM (12 years ago)
Author:
leviw@chromium.org
Message:

Make AccessibilityObject::size non-virtual and fix platform accessibility code's LayoutUnit usage
​https://bugs.webkit.org/show_bug.cgi?id=83803

Reviewed by Eric Seidel.

AccessibilityObject::size was virtual with a number of overloads, but all the implementations were
redundant. Avoiding the virtual thunk and code duplication by declaring it non-virtual and only
implementing it in AccessibilityObject.

Also adding a pixelSnappedSize method that returns an IntSize, and using it in platform
accessibility code.

No new tests. No change in behavior.

  • accessibility/AccessibilityMenuListOption.h:

(WebCore::AccessibilityMenuListOption::canHaveChildren):

  • accessibility/AccessibilityMenuListPopup.h:

(WebCore::AccessibilityMenuListPopup::elementRect):

  • accessibility/AccessibilityObject.h:

(WebCore::AccessibilityObject::size):
(WebCore::AccessibilityObject::pixelSnappedSize):

  • accessibility/AccessibilityRenderObject.cpp:

(WebCore):

  • accessibility/AccessibilityRenderObject.h:

(AccessibilityRenderObject):

  • accessibility/AccessibilitySlider.cpp:

(WebCore):

  • accessibility/AccessibilitySlider.h:

(AccessibilitySliderThumb):

  • accessibility/AccessibilityTableColumn.cpp:

(WebCore):

  • accessibility/AccessibilityTableColumn.h:

(AccessibilityTableColumn):

  • accessibility/AccessibilityTableHeaderContainer.cpp:

(WebCore):

  • accessibility/AccessibilityTableHeaderContainer.h:

(AccessibilityTableHeaderContainer):

  • accessibility/gtk/WebKitAccessibleInterfaceComponent.cpp:

(webkitAccessibleComponentGetExtents):

  • accessibility/gtk/WebKitAccessibleInterfaceImage.cpp:

(webkitAccessibleImageGetImagePosition):
(webkitAccessibleImageGetImageSize):

  • accessibility/mac/WebAccessibilityObjectWrapper.mm:

(-[WebAccessibilityObjectWrapper position]):
(-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):

Location:
trunk/Source/WebCore
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r114026 r114031  
     12012-04-12  Levi Weintraub  <leviw@chromium.org>
     2
     3        Make AccessibilityObject::size non-virtual and fix platform accessibility code's LayoutUnit usage
     4        https://bugs.webkit.org/show_bug.cgi?id=83803
     5
     6        Reviewed by Eric Seidel.
     7
     8        AccessibilityObject::size was virtual with a number of overloads, but all the implementations were
     9        redundant. Avoiding the virtual thunk and code duplication by declaring it non-virtual and only
     10        implementing it in AccessibilityObject.
     11
     12        Also adding a pixelSnappedSize method that returns an IntSize, and using it in platform
     13        accessibility code.
     14
     15        No new tests. No change in behavior.
     16
     17        * accessibility/AccessibilityMenuListOption.h:
     18        (WebCore::AccessibilityMenuListOption::canHaveChildren):
     19        * accessibility/AccessibilityMenuListPopup.h:
     20        (WebCore::AccessibilityMenuListPopup::elementRect):
     21        * accessibility/AccessibilityObject.h:
     22        (WebCore::AccessibilityObject::size):
     23        (WebCore::AccessibilityObject::pixelSnappedSize):
     24        * accessibility/AccessibilityRenderObject.cpp:
     25        (WebCore):
     26        * accessibility/AccessibilityRenderObject.h:
     27        (AccessibilityRenderObject):
     28        * accessibility/AccessibilitySlider.cpp:
     29        (WebCore):
     30        * accessibility/AccessibilitySlider.h:
     31        (AccessibilitySliderThumb):
     32        * accessibility/AccessibilityTableColumn.cpp:
     33        (WebCore):
     34        * accessibility/AccessibilityTableColumn.h:
     35        (AccessibilityTableColumn):
     36        * accessibility/AccessibilityTableHeaderContainer.cpp:
     37        (WebCore):
     38        * accessibility/AccessibilityTableHeaderContainer.h:
     39        (AccessibilityTableHeaderContainer):
     40        * accessibility/gtk/WebKitAccessibleInterfaceComponent.cpp:
     41        (webkitAccessibleComponentGetExtents):
     42        * accessibility/gtk/WebKitAccessibleInterfaceImage.cpp:
     43        (webkitAccessibleImageGetImagePosition):
     44        (webkitAccessibleImageGetImageSize):
     45        * accessibility/mac/WebAccessibilityObjectWrapper.mm:
     46        (-[WebAccessibilityObjectWrapper position]):
     47        (-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):
     48
    1492012-04-12  Anna Cavender  <annacc@chromium.org>
    250

  • trunk/Source/WebCore/accessibility/AccessibilityMenuListOption.h

    r96966 r114031  
    4747    virtual AccessibilityRole roleValue() const { return MenuListOptionRole; }
    4848    virtual bool canHaveChildren() const { return false; }
    49     virtual LayoutSize size() const { return elementRect().size(); }
    5049
    5150    virtual Element* actionElement() const;

  • trunk/Source/WebCore/accessibility/AccessibilityMenuListPopup.h

    r96966 r114031  
    5151
    5252    virtual LayoutRect elementRect() const { return LayoutRect(); }
    53     virtual LayoutSize size() const { return LayoutSize(); }
    5453    virtual AccessibilityRole roleValue() const { return MenuListPopupRole; }
    5554

  • trunk/Source/WebCore/accessibility/AccessibilityObject.h

    r113778 r114031  
    507507    IntRect pixelSnappedBoundingBoxRect() const { return pixelSnappedIntRect(boundingBoxRect()); }
    508508    virtual LayoutRect elementRect() const = 0;
    509     virtual LayoutSize size() const { return elementRect().size(); }
     509    LayoutSize size() const { return elementRect().size(); }
     510    IntSize pixelSnappedSize() const { return elementRect().pixelSnappedSize(); }
    510511    virtual IntPoint clickPoint();
    511512    static IntRect boundingBoxForQuads(RenderObject*, const Vector<FloatQuad>&);

  • trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp

    r113990 r114031  
    15241524}
    15251525
    1526 LayoutSize AccessibilityRenderObject::size() const
    1527 {
    1528     LayoutRect rect = elementRect();
    1529     return rect.size();
    1530 }
    1531 
    15321526IntPoint AccessibilityRenderObject::clickPoint()
    15331527{

  • trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h

    r113778 r114031  
    167167    virtual LayoutRect boundingBoxRect() const;
    168168    virtual LayoutRect elementRect() const;
    169     virtual LayoutSize size() const;
    170169    virtual IntPoint clickPoint();
    171170   

  • trunk/Source/WebCore/accessibility/AccessibilitySlider.cpp

    r111699 r114031  
    179179}
    180180
    181 LayoutSize AccessibilitySliderThumb::size() const
    182 {
    183     return elementRect().size();
    184 }
    185 
    186181bool AccessibilitySliderThumb::accessibilityIsIgnored() const
    187182{

  • trunk/Source/WebCore/accessibility/AccessibilitySlider.h

    r111699 r114031  
    7676    virtual AccessibilityRole roleValue() const { return SliderThumbRole; }
    7777
    78     virtual LayoutSize size() const;
    7978    virtual LayoutRect elementRect() const;
    8079

  • trunk/Source/WebCore/accessibility/AccessibilityTableColumn.cpp

    r98676 r114031  
    6969}
    7070
    71 LayoutSize AccessibilityTableColumn::size() const
    72 {
    73     return elementRect().size();
    74 }
    75  
    7671AccessibilityObject* AccessibilityTableColumn::headerObject()
    7772{

  • trunk/Source/WebCore/accessibility/AccessibilityTableColumn.h

    r98676 r114031  
    5858    virtual void setParent(AccessibilityObject*);
    5959   
    60     virtual LayoutSize size() const;
    6160    virtual LayoutRect elementRect() const;
    6261   

  • trunk/Source/WebCore/accessibility/AccessibilityTableHeaderContainer.cpp

    r97629 r114031  
    5656}
    5757
    58 LayoutSize AccessibilityTableHeaderContainer::size() const
    59 {
    60     return elementRect().size();
    61 }
    62 
    6358bool AccessibilityTableHeaderContainer::accessibilityIsIgnored() const
    6459{

  • trunk/Source/WebCore/accessibility/AccessibilityTableHeaderContainer.h

    r97629 r114031  
    4848    virtual void addChildren();
    4949   
    50     virtual LayoutSize size() const;
    5150    virtual LayoutRect elementRect() const;
    5251   

  • trunk/Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceComponent.cpp

    r105791 r114031  
    7878static void webkitAccessibleComponentGetExtents(AtkComponent* component, gint* x, gint* y, gint* width, gint* height, AtkCoordType coordType)
    7979{
    80     IntRect rect = core(component)->elementRect();
     80    IntRect rect = pixelSnappedIntRect(core(component)->elementRect());
    8181    contentsRelativeToAtkCoordinateType(core(component), coordType, rect, x, y, width, height);
    8282}

  • trunk/Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceImage.cpp

    r105791 r114031  
    4949static void webkitAccessibleImageGetImagePosition(AtkImage* image, gint* x, gint* y, AtkCoordType coordType)
    5050{
    51     IntRect rect = core(image)->elementRect();
     51    IntRect rect = pixelSnappedIntRect(core(image)->elementRect());
    5252    contentsRelativeToAtkCoordinateType(core(image), coordType, rect, x, y);
    5353}
    … …  
    6060static void webkitAccessibleImageGetImageSize(AtkImage* image, gint* width, gint* height)
    6161{
    62     IntSize size = core(image)->size();
     62    IntSize size = core(image)->pixelSnappedSize();
    6363
    6464    if (width)

  • trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapper.mm

    r112989 r114031  
    14101410- (NSValue *)position
    14111411{
    1412     LayoutRect rect = m_object->elementRect();
     1412    IntRect rect = pixelSnappedIntRect(m_object->elementRect());
    14131413    NSPoint point;
    14141414   
    … …  
    20262026
    20272027    if ([attributeName isEqualToString: NSAccessibilitySizeAttribute]) {
    2028         LayoutSize s = m_object->size();
     2028        IntSize s = m_object->pixelSnappedSize();
    20292029        return [NSValue valueWithSize: NSMakeSize(s.width(), s.height())];
    20302030    }
Note: See TracChangeset for help on using the changeset viewer.