Changeset 93272 in webkit


Ignore:
Timestamp:
Aug 17, 2011 6:18:55 PM (13 years ago)
Author:
leviw@chromium.org
Message:

Switch Accessibility code to new layout types
​https://bugs.webkit.org/show_bug.cgi?id=66348

Reviewed by Eric Seidel.

Converting remaining Accessibility code to the LayoutUnit abstraction.

No new tests, no change in functionality

  • accessibility/AccessibilityImageMapLink.cpp:

(WebCore::AccessibilityImageMapLink::elementRect):

  • accessibility/AccessibilityImageMapLink.h:
  • accessibility/AccessibilityListBox.cpp:

(WebCore::AccessibilityListBox::elementAccessibilityHitTest):

  • accessibility/AccessibilityListBox.h:
  • accessibility/AccessibilityListBoxOption.cpp:

(WebCore::AccessibilityListBoxOption::elementRect):

  • accessibility/AccessibilityListBoxOption.h:
  • accessibility/AccessibilityMenuListOption.cpp:

(WebCore::AccessibilityMenuListOption::elementRect):

  • accessibility/AccessibilityMenuListOption.h:

(WebCore::AccessibilityMenuListOption::size):

  • accessibility/AccessibilityMenuListPopup.h:

(WebCore::AccessibilityMenuListPopup::elementRect):
(WebCore::AccessibilityMenuListPopup::size):

  • accessibility/AccessibilityObject.cpp:

(WebCore::AccessibilityObject::clickPoint):
(WebCore::AccessibilityObject::orientation):
(WebCore::AccessibilityObject::elementAccessibilityHitTest):

  • accessibility/AccessibilityObject.h:

(WebCore::AccessibilityObject::accessibilityHitTest):
(WebCore::AccessibilityObject::boundingBoxRect):
(WebCore::AccessibilityObject::size):
(WebCore::AccessibilityObject::boundsForVisiblePositionRange):
(WebCore::AccessibilityObject::doAXBoundsForRange):

  • accessibility/AccessibilityRenderObject.cpp:

(WebCore::AccessibilityRenderObject::isOffScreen):
(WebCore::AccessibilityRenderObject::boundingBoxRect):
(WebCore::AccessibilityRenderObject::checkboxOrRadioRect):
(WebCore::AccessibilityRenderObject::elementRect):
(WebCore::AccessibilityRenderObject::size):
(WebCore::AccessibilityRenderObject::clickPoint):
(WebCore::AccessibilityRenderObject::accessibilityIsIgnored):
(WebCore::AccessibilityRenderObject::boundsForVisiblePositionRange):
(WebCore::AccessibilityRenderObject::visiblePositionForPoint):
(WebCore::AccessibilityRenderObject::doAXBoundsForRange):

  • accessibility/AccessibilityRenderObject.h:
  • accessibility/AccessibilityScrollView.cpp:

(WebCore::AccessibilityScrollView::accessibilityHitTest):
(WebCore::AccessibilityScrollView::elementRect):

  • accessibility/AccessibilityScrollView.h:
  • accessibility/AccessibilityScrollbar.cpp:

(WebCore::AccessibilityScrollbar::elementRect):

  • accessibility/AccessibilityScrollbar.h:
  • accessibility/AccessibilitySlider.cpp:

(WebCore::AccessibilitySliderThumb::elementRect):
(WebCore::AccessibilitySliderThumb::size):

  • accessibility/AccessibilitySlider.h:
  • accessibility/AccessibilityTableColumn.cpp:

(WebCore::AccessibilityTableColumn::elementRect):
(WebCore::AccessibilityTableColumn::size):

  • accessibility/AccessibilityTableColumn.h:
  • accessibility/AccessibilityTableHeaderContainer.cpp:

(WebCore::AccessibilityTableHeaderContainer::elementRect):
(WebCore::AccessibilityTableHeaderContainer::size):

  • accessibility/AccessibilityTableHeaderContainer.h:
  • accessibility/mac/AccessibilityObjectWrapper.mm:

(-[AccessibilityObjectWrapper position]):
(-[AccessibilityObjectWrapper accessibilityAttributeValue:]):
(-[AccessibilityObjectWrapper accessibilityShowContextMenu]):

Location:
trunk/Source/WebCore
Files:
25 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r93270 r93272  
     12011-08-17  Levi Weintraub  <leviw@chromium.org>
     2
     3        Switch Accessibility code to new layout types
     4        https://bugs.webkit.org/show_bug.cgi?id=66348
     5
     6        Reviewed by Eric Seidel.
     7
     8        Converting remaining Accessibility code to the LayoutUnit abstraction.
     9
     10        No new tests, no change in functionality
     11
     12        * accessibility/AccessibilityImageMapLink.cpp:
     13        (WebCore::AccessibilityImageMapLink::elementRect):
     14        * accessibility/AccessibilityImageMapLink.h:
     15        * accessibility/AccessibilityListBox.cpp:
     16        (WebCore::AccessibilityListBox::elementAccessibilityHitTest):
     17        * accessibility/AccessibilityListBox.h:
     18        * accessibility/AccessibilityListBoxOption.cpp:
     19        (WebCore::AccessibilityListBoxOption::elementRect):
     20        * accessibility/AccessibilityListBoxOption.h:
     21        * accessibility/AccessibilityMenuListOption.cpp:
     22        (WebCore::AccessibilityMenuListOption::elementRect):
     23        * accessibility/AccessibilityMenuListOption.h:
     24        (WebCore::AccessibilityMenuListOption::size):
     25        * accessibility/AccessibilityMenuListPopup.h:
     26        (WebCore::AccessibilityMenuListPopup::elementRect):
     27        (WebCore::AccessibilityMenuListPopup::size):
     28        * accessibility/AccessibilityObject.cpp:
     29        (WebCore::AccessibilityObject::clickPoint):
     30        (WebCore::AccessibilityObject::orientation):
     31        (WebCore::AccessibilityObject::elementAccessibilityHitTest):
     32        * accessibility/AccessibilityObject.h:
     33        (WebCore::AccessibilityObject::accessibilityHitTest):
     34        (WebCore::AccessibilityObject::boundingBoxRect):
     35        (WebCore::AccessibilityObject::size):
     36        (WebCore::AccessibilityObject::boundsForVisiblePositionRange):
     37        (WebCore::AccessibilityObject::doAXBoundsForRange):
     38        * accessibility/AccessibilityRenderObject.cpp:
     39        (WebCore::AccessibilityRenderObject::isOffScreen):
     40        (WebCore::AccessibilityRenderObject::boundingBoxRect):
     41        (WebCore::AccessibilityRenderObject::checkboxOrRadioRect):
     42        (WebCore::AccessibilityRenderObject::elementRect):
     43        (WebCore::AccessibilityRenderObject::size):
     44        (WebCore::AccessibilityRenderObject::clickPoint):
     45        (WebCore::AccessibilityRenderObject::accessibilityIsIgnored):
     46        (WebCore::AccessibilityRenderObject::boundsForVisiblePositionRange):
     47        (WebCore::AccessibilityRenderObject::visiblePositionForPoint):
     48        (WebCore::AccessibilityRenderObject::doAXBoundsForRange):
     49        * accessibility/AccessibilityRenderObject.h:
     50        * accessibility/AccessibilityScrollView.cpp:
     51        (WebCore::AccessibilityScrollView::accessibilityHitTest):
     52        (WebCore::AccessibilityScrollView::elementRect):
     53        * accessibility/AccessibilityScrollView.h:
     54        * accessibility/AccessibilityScrollbar.cpp:
     55        (WebCore::AccessibilityScrollbar::elementRect):
     56        * accessibility/AccessibilityScrollbar.h:
     57        * accessibility/AccessibilitySlider.cpp:
     58        (WebCore::AccessibilitySliderThumb::elementRect):
     59        (WebCore::AccessibilitySliderThumb::size):
     60        * accessibility/AccessibilitySlider.h:
     61        * accessibility/AccessibilityTableColumn.cpp:
     62        (WebCore::AccessibilityTableColumn::elementRect):
     63        (WebCore::AccessibilityTableColumn::size):
     64        * accessibility/AccessibilityTableColumn.h:
     65        * accessibility/AccessibilityTableHeaderContainer.cpp:
     66        (WebCore::AccessibilityTableHeaderContainer::elementRect):
     67        (WebCore::AccessibilityTableHeaderContainer::size):
     68        * accessibility/AccessibilityTableHeaderContainer.h:
     69        * accessibility/mac/AccessibilityObjectWrapper.mm:
     70        (-[AccessibilityObjectWrapper position]):
     71        (-[AccessibilityObjectWrapper accessibilityAttributeValue:]):
     72        (-[AccessibilityObjectWrapper accessibilityShowContextMenu]):
     73
    1742011-08-17  Emil A Eklund  <eae@chromium.org>
    275

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

    r81128 r93272  
    120120    return String();
    121121}
    122    
    123 IntRect AccessibilityImageMapLink::elementRect() const
     122
     123LayoutRect AccessibilityImageMapLink::elementRect() const
    124124{
    125125    if (!m_mapElement.get() || !m_areaElement.get())
    126         return IntRect();
     126        return LayoutRect();
    127127
    128128    RenderObject* renderer;
    … …  
    133133   
    134134    if (!renderer)
    135         return IntRect();
     135        return LayoutRect();
    136136   
    137137    return m_areaElement->computeRect(renderer);

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

    r75031 r93272  
    6969    virtual String nameForMSAA() const;
    7070
    71     virtual IntRect elementRect() const;
     71    virtual LayoutRect elementRect() const;
    7272
    7373private:   

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

    r87352 r93272  
    164164}
    165165
    166 AccessibilityObject* AccessibilityListBox::elementAccessibilityHitTest(const IntPoint& point) const
     166AccessibilityObject* AccessibilityListBox::elementAccessibilityHitTest(const LayoutPoint& point) const
    167167{
    168168    // the internal HTMLSelectElement methods for returning a listbox option at a point
    … …  
    175175        return 0;
    176176   
    177     IntRect parentRect = boundingBoxRect();
     177    LayoutRect parentRect = boundingBoxRect();
    178178   
    179179    AccessibilityObject* listBoxOption = 0;
    180180    unsigned length = m_children.size();
    181181    for (unsigned i = 0; i < length; i++) {
    182         IntRect rect = toRenderListBox(m_renderer)->itemBoundingBoxRect(parentRect.location(), i);
     182        LayoutRect rect = toRenderListBox(m_renderer)->itemBoundingBoxRect(parentRect.location(), i);
    183183        // The cast to HTMLElement below is safe because the only other possible listItem type
    184184        // would be a WMLElement, but WML builds don't use accessibility features at all.

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

    r73825 r93272  
    5757    AccessibilityObject* listBoxOptionAccessibilityObject(HTMLElement*) const;
    5858    virtual bool accessibilityIsIgnored() const;
    59     virtual AccessibilityObject* elementAccessibilityHitTest(const IntPoint&) const;
     59    virtual AccessibilityObject* elementAccessibilityHitTest(const LayoutPoint&) const;
    6060};
    6161   

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

    r87352 r93272  
    8484}
    8585
    86 IntRect AccessibilityListBoxOption::elementRect() const
    87 {
    88     IntRect rect;
     86LayoutRect AccessibilityListBoxOption::elementRect() const
     87{
     88    LayoutRect rect;
    8989    if (!m_optionElement)
    9090        return rect;
    … …  
    9898        return rect;
    9999   
    100     IntRect parentRect = listBoxRenderer->document()->axObjectCache()->getOrCreate(listBoxRenderer)->boundingBoxRect();
     100    LayoutRect parentRect = listBoxRenderer->document()->axObjectCache()->getOrCreate(listBoxRenderer)->boundingBoxRect();
    101101    int index = listBoxOptionIndex();
    102102    if (index != -1)

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

    r75031 r93272  
    6161    virtual bool canSetSelectedAttribute() const;
    6262
    63     virtual IntRect elementRect() const;
     63    virtual LayoutRect elementRect() const;
    6464    virtual AccessibilityObject* parentObject() const;
    6565    bool isListBoxOption() const { return true; }

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

    r72958 r93272  
    100100}
    101101
    102 IntRect AccessibilityMenuListOption::elementRect() const
     102LayoutRect AccessibilityMenuListOption::elementRect() const
    103103{
    104104    AccessibilityObject* parent = parentObject();

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

    r72958 r93272  
    4848    virtual AccessibilityRole roleValue() const { return MenuListOptionRole; }
    4949    virtual bool canHaveChildren() const { return false; }
    50     virtual IntSize size() const { return elementRect().size(); }
     50    virtual LayoutSize size() const { return elementRect().size(); }
    5151
    5252    virtual Element* actionElement() const;
    … …  
    5959    virtual void setSelected(bool);
    6060    virtual bool canSetSelectedAttribute() const;
    61     virtual IntRect elementRect() const;
     61    virtual LayoutRect elementRect() const;
    6262    virtual String stringValue() const;
    6363

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

    r91219 r93272  
    5252    virtual bool isMenuListPopup() const { return true; }
    5353
    54     virtual IntRect elementRect() const { return IntRect(); }
    55     virtual IntSize size() const { return IntSize(); }
     54    virtual LayoutRect elementRect() const { return LayoutRect(); }
     55    virtual LayoutSize size() const { return LayoutSize(); }
    5656    virtual AccessibilityRole roleValue() const { return MenuListPopupRole; }
    5757

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

    r93243 r93272  
    394394}
    395395
    396 IntPoint AccessibilityObject::clickPoint() const
    397 {
    398     IntRect rect = elementRect();
    399     return IntPoint(rect.x() + rect.width() / 2, rect.y() + rect.height() / 2);
     396LayoutPoint AccessibilityObject::clickPoint() const
     397{
     398    LayoutRect rect = elementRect();
     399    return LayoutPoint(rect.x() + rect.width() / 2, rect.y() + rect.height() / 2);
    400400}
    401401
    … …  
    11451145AccessibilityOrientation AccessibilityObject::orientation() const
    11461146{
    1147     IntRect bounds = elementRect();
     1147    LayoutRect bounds = elementRect();
    11481148    if (bounds.size().width() > bounds.size().height())
    11491149        return AccessibilityOrientationHorizontal;
    … …  
    12881288}
    12891289
    1290 AccessibilityObject* AccessibilityObject::elementAccessibilityHitTest(const IntPoint& point) const
     1290AccessibilityObject* AccessibilityObject::elementAccessibilityHitTest(const LayoutPoint& point) const
    12911291{
    12921292    // Send the hit test back into the sub-frame if necessary.
    … …  
    12951295        // Normalize the point for the widget's bounds.
    12961296        if (widget && widget->isFrameView())
    1297             return axObjectCache()->getOrCreate(widget)->accessibilityHitTest(IntPoint(point - widget->frameRect().location()));
     1297            return axObjectCache()->getOrCreate(widget)->accessibilityHitTest(toPoint(point - widget->frameRect().location()));
    12981298    }
    12991299

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

    r92571 r93272  
    3131#define AccessibilityObject_h
    3232
    33 #include "IntRect.h"
     33#include "LayoutTypes.h"
    3434#include "VisiblePosition.h"
    3535#include "VisibleSelection.h"
    … …  
    456456   
    457457    // Called on the root AX object to return the deepest available element.
    458     virtual AccessibilityObject* accessibilityHitTest(const IntPoint&) const { return 0; }
     458    virtual AccessibilityObject* accessibilityHitTest(const LayoutPoint&) const { return 0; }
    459459    // Called on the AX object after the render tree determines which is the right AccessibilityRenderObject.
    460     virtual AccessibilityObject* elementAccessibilityHitTest(const IntPoint&) const;
     460    virtual AccessibilityObject* elementAccessibilityHitTest(const LayoutPoint&) const;
    461461
    462462    virtual AccessibilityObject* focusedUIElement() const;
    … …  
    497497    virtual Element* anchorElement() const { return 0; }
    498498    virtual Element* actionElement() const { return 0; }
    499     virtual IntRect boundingBoxRect() const { return IntRect(); }
    500     virtual IntRect elementRect() const = 0;
    501     virtual IntSize size() const { return elementRect().size(); }
    502     virtual IntPoint clickPoint() const;
     499    virtual LayoutRect boundingBoxRect() const { return LayoutRect(); }
     500    virtual LayoutRect elementRect() const = 0;
     501    virtual LayoutSize size() const { return elementRect().size(); }
     502    virtual LayoutPoint clickPoint() const;
    503503
    504504    virtual PlainTextRange selectedTextRange() const { return PlainTextRange(); }
    … …  
    574574
    575575    String stringForVisiblePositionRange(const VisiblePositionRange&) const;
    576     virtual IntRect boundsForVisiblePositionRange(const VisiblePositionRange&) const { return IntRect(); }
     576    virtual LayoutRect boundsForVisiblePositionRange(const VisiblePositionRange&) const { return LayoutRect(); }
    577577    int lengthForVisiblePositionRange(const VisiblePositionRange&) const;
    578578    virtual void setSelectedVisiblePositionRange(const VisiblePositionRange&) const { }
    … …  
    605605
    606606    virtual String doAXStringForRange(const PlainTextRange&) const { return String(); }
    607     virtual IntRect doAXBoundsForRange(const PlainTextRange&) const { return IntRect(); }
     607    virtual LayoutRect doAXBoundsForRange(const PlainTextRange&) const { return LayoutRect(); }
    608608    String listMarkerTextForNodeAndPosition(Node*, const VisiblePosition&) const;
    609609

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

    r93246 r93272  
    686686{
    687687    ASSERT(m_renderer);
    688     IntRect contentRect = m_renderer->absoluteClippedOverflowRect();
     688    LayoutRect contentRect = m_renderer->absoluteClippedOverflowRect();
    689689    FrameView* view = m_renderer->frame()->view();
    690690    FloatRect viewRect = view->visibleContentRect();
    … …  
    14161416}
    14171417
    1418 IntRect AccessibilityRenderObject::boundingBoxRect() const
     1418LayoutRect AccessibilityRenderObject::boundingBoxRect() const
    14191419{
    14201420    RenderObject* obj = m_renderer;
    14211421   
    14221422    if (!obj)
    1423         return IntRect();
     1423        return LayoutRect();
    14241424   
    14251425    if (obj->node()) // If we are a continuation, we want to make sure to use the primary renderer.
    … …  
    14371437    const size_t n = quads.size();
    14381438    if (!n)
    1439         return IntRect();
    1440 
    1441     IntRect result;
     1439        return LayoutRect();
     1440
     1441    LayoutRect result;
    14421442    for (size_t i = 0; i < n; ++i) {
    1443         IntRect r = quads[i].enclosingBoundingBox();
     1443        LayoutRect r = quads[i].enclosingBoundingBox();
    14441444        if (!r.isEmpty()) {
    14451445            if (obj->style()->hasAppearance())
    … …  
    14561456}
    14571457   
    1458 IntRect AccessibilityRenderObject::checkboxOrRadioRect() const
    1459 {
    1460     if (!m_renderer)
    1461         return IntRect();
     1458LayoutRect AccessibilityRenderObject::checkboxOrRadioRect() const
     1459{
     1460    if (!m_renderer)
     1461        return LayoutRect();
    14621462   
    14631463    HTMLLabelElement* label = labelForElement(static_cast<Element*>(m_renderer->node()));
    … …  
    14651465        return boundingBoxRect();
    14661466   
    1467     IntRect labelRect = axObjectCache()->getOrCreate(label->renderer())->elementRect();
     1467    LayoutRect labelRect = axObjectCache()->getOrCreate(label->renderer())->elementRect();
    14681468    labelRect.unite(boundingBoxRect());
    14691469    return labelRect;
    14701470}
    14711471
    1472 IntRect AccessibilityRenderObject::elementRect() const
     1472LayoutRect AccessibilityRenderObject::elementRect() const
    14731473{
    14741474    // a checkbox or radio button should encompass its label
    … …  
    14791479}
    14801480
    1481 IntSize AccessibilityRenderObject::size() const
    1482 {
    1483     IntRect rect = elementRect();
     1481LayoutSize AccessibilityRenderObject::size() const
     1482{
     1483    LayoutRect rect = elementRect();
    14841484    return rect.size();
    14851485}
    14861486
    1487 IntPoint AccessibilityRenderObject::clickPoint() const
     1487LayoutPoint AccessibilityRenderObject::clickPoint() const
    14881488{
    14891489    // use the default position unless this is an editable web area, in which case we use the selection bounds.
    … …  
    14931493    VisibleSelection visSelection = selection();
    14941494    VisiblePositionRange range = VisiblePositionRange(visSelection.visibleStart(), visSelection.visibleEnd());
    1495     IntRect bounds = boundsForVisiblePositionRange(range);
     1495    LayoutRect bounds = boundsForVisiblePositionRange(range);
    14961496#if PLATFORM(MAC)
    14971497    bounds.setLocation(m_renderer->document()->view()->screenToContents(bounds.location()));
    14981498#endif       
    1499     return IntPoint(bounds.x() + (bounds.width() / 2), bounds.y() - (bounds.height() / 2));
     1499    return LayoutPoint(bounds.x() + (bounds.width() / 2), bounds.y() - (bounds.height() / 2));
    15001500}
    15011501   
    … …  
    18971897            // check whether rendered image was stretched from one-dimensional file image
    18981898            if (image->cachedImage()) {
    1899                 IntSize imageSize = image->cachedImage()->imageSize(image->view()->zoomFactor());
     1899                LayoutSize imageSize = image->cachedImage()->imageSize(image->view()->zoomFactor());
    19001900                return imageSize.height() <= 1 || imageSize.width() <= 1;
    19011901            }
    … …  
    25362536}
    25372537
    2538 IntRect AccessibilityRenderObject::boundsForVisiblePositionRange(const VisiblePositionRange& visiblePositionRange) const
     2538LayoutRect AccessibilityRenderObject::boundsForVisiblePositionRange(const VisiblePositionRange& visiblePositionRange) const
    25392539{
    25402540    if (visiblePositionRange.isNull())
    2541         return IntRect();
     2541        return LayoutRect();
    25422542   
    25432543    // Create a mutable VisiblePositionRange.
    25442544    VisiblePositionRange range(visiblePositionRange);
    2545     IntRect rect1 = range.start.absoluteCaretBounds();
    2546     IntRect rect2 = range.end.absoluteCaretBounds();
     2545    LayoutRect rect1 = range.start.absoluteCaretBounds();
     2546    LayoutRect rect2 = range.end.absoluteCaretBounds();
    25472547   
    25482548    // readjust for position at the edge of a line.  This is to exclude line rect that doesn't need to be accounted in the range bounds
    … …  
    25592559    }
    25602560   
    2561     IntRect ourrect = rect1;
     2561    LayoutRect ourrect = rect1;
    25622562    ourrect.unite(rect2);
    25632563   
    … …  
    25652565    if (rect1.maxY() != rect2.maxY()) {
    25662566        RefPtr<Range> dataRange = makeRange(range.start, range.end);
    2567         IntRect boundingBox = dataRange->boundingBox();
     2567        LayoutRect boundingBox = dataRange->boundingBox();
    25682568        String rangeString = plainText(dataRange.get());
    25692569        if (rangeString.length() > 1 && !boundingBox.isEmpty())
    … …  
    25922592}
    25932593
    2594 VisiblePosition AccessibilityRenderObject::visiblePositionForPoint(const IntPoint& point) const
     2594VisiblePosition AccessibilityRenderObject::visiblePositionForPoint(const LayoutPoint& point) const
    25952595{
    25962596    if (!m_renderer)
    … …  
    26132613   
    26142614    // locate the node containing the point
    2615     IntPoint pointResult;
     2615    LayoutPoint pointResult;
    26162616    while (1) {
    2617         IntPoint ourpoint;
     2617        LayoutPoint ourpoint;
    26182618#if PLATFORM(MAC)
    26192619        ourpoint = frameView->screenToContents(point);
    … …  
    27532753// specified by the given range. This is the bounding rectangle a sighted user would see
    27542754// on the display screen, in pixels.
    2755 IntRect AccessibilityRenderObject::doAXBoundsForRange(const PlainTextRange& range) const
     2755LayoutRect AccessibilityRenderObject::doAXBoundsForRange(const PlainTextRange& range) const
    27562756{
    27572757    if (allowsTextRanges())
    27582758        return boundsForVisiblePositionRange(visiblePositionRangeForRange(range));
    2759     return IntRect();
     2759    return LayoutRect();
    27602760}
    27612761

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

    r93243 r93272  
    3232
    3333#include "AccessibilityObject.h"
     34#include "LayoutTypes.h"
    3435#include <wtf/Forward.h>
    3536
    … …  
    164165    AccessibilityObject* menuButtonForMenu() const;
    165166   
    166     virtual IntRect boundingBoxRect() const;
    167     virtual IntRect elementRect() const;
    168     virtual IntSize size() const;
    169     virtual IntPoint clickPoint() const;
     167    virtual LayoutRect boundingBoxRect() const;
     168    virtual LayoutRect elementRect() const;
     169    virtual LayoutSize size() const;
     170    virtual LayoutPoint clickPoint() const;
    170171   
    171172    void setRenderer(RenderObject* renderer) { m_renderer = renderer; }
    … …  
    230231    virtual VisiblePositionRange visiblePositionRange() const;
    231232    virtual VisiblePositionRange visiblePositionRangeForLine(unsigned) const;
    232     virtual IntRect boundsForVisiblePositionRange(const VisiblePositionRange&) const;
     233    virtual LayoutRect boundsForVisiblePositionRange(const VisiblePositionRange&) const;
    233234    virtual void setSelectedVisiblePositionRange(const VisiblePositionRange&) const;
    234235    virtual bool supportsARIAFlowTo() const;
    … …  
    241242    virtual void determineARIADropEffects(Vector<String>&);
    242243   
    243     virtual VisiblePosition visiblePositionForPoint(const IntPoint&) const;
     244    virtual VisiblePosition visiblePositionForPoint(const LayoutPoint&) const;
    244245    virtual VisiblePosition visiblePositionForIndex(unsigned indexValue, bool lastIndexOK) const;   
    245246    virtual int index(const VisiblePosition&) const;
    … …  
    252253   
    253254    virtual String doAXStringForRange(const PlainTextRange&) const;
    254     virtual IntRect doAXBoundsForRange(const PlainTextRange&) const;
     255    virtual LayoutRect doAXBoundsForRange(const PlainTextRange&) const;
    255256   
    256257    virtual String stringValueForMSAA() const;
    … …  
    291292    void changeValueByStep(bool increase);
    292293    bool isNativeCheckboxOrRadio() const;
    293     IntRect checkboxOrRadioRect() const;
     294    LayoutRect checkboxOrRadioRect() const;
    294295    void addRadioButtonGroupMembers(AccessibilityChildrenVector& linkedUIElements) const;
    295296    AccessibilityObject* internalLinkElement() const;

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

    r86451 r93272  
    139139}
    140140
    141 AccessibilityObject* AccessibilityScrollView::accessibilityHitTest(const IntPoint& point) const
     141AccessibilityObject* AccessibilityScrollView::accessibilityHitTest(const LayoutPoint& point) const
    142142{
    143143    AccessibilityObject* webArea = webAreaObject();
    … …  
    153153}
    154154
    155 IntRect AccessibilityScrollView::elementRect() const
     155LayoutRect AccessibilityScrollView::elementRect() const
    156156{
    157157    return m_scrollView->frameRect();

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

    r80498 r93272  
    5252    virtual AccessibilityObject* scrollBar(AccessibilityOrientation) const;
    5353    virtual void addChildren();
    54     virtual AccessibilityObject* accessibilityHitTest(const IntPoint&) const;
     54    virtual AccessibilityObject* accessibilityHitTest(const LayoutPoint&) const;
    5555    virtual const AccessibilityChildrenVector& children();
    5656    virtual void updateChildrenIfNecessary();
    5757   
    5858    virtual FrameView* documentFrameView() const;
    59     virtual IntRect elementRect() const;
     59    virtual LayoutRect elementRect() const;
    6060    virtual AccessibilityObject* parentObject() const;
    6161   

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

    r76378 r93272  
    4949}
    5050   
    51 IntRect AccessibilityScrollbar::elementRect() const
     51LayoutRect AccessibilityScrollbar::elementRect() const
    5252{
    5353    if (!m_scrollbar)
    54         return IntRect();
     54        return LayoutRect();
    5555   
    5656    return m_scrollbar->frameRect();

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

    r75031 r93272  
    5252    virtual bool isAccessibilityScrollbar() const { return true; }
    5353    virtual AccessibilityObject* parentObject() const { return m_parent; }
    54     virtual IntRect elementRect() const;
     54    virtual LayoutRect elementRect() const;
    5555   
    5656    virtual AccessibilityRole roleValue() const { return ScrollBarRole; }

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

    r88757 r93272  
    175175}
    176176   
    177 IntRect AccessibilitySliderThumb::elementRect() const
     177LayoutRect AccessibilitySliderThumb::elementRect() const
    178178{
    179179    RenderObject* sliderRenderer = m_parentSlider->renderer();
    180180    if (!sliderRenderer || !sliderRenderer->isSlider())
    181         return IntRect();
     181        return LayoutRect();
    182182    return sliderThumbElementOf(sliderRenderer->node())->getRect();
    183183}
    184184
    185 IntSize AccessibilitySliderThumb::size() const
     185LayoutSize AccessibilitySliderThumb::size() const
    186186{
    187187    return elementRect().size();

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

    r83479 r93272  
    7878    virtual AccessibilityObject* parentObject() const { return m_parentSlider; }
    7979
    80     virtual IntSize size() const;
    81     virtual IntRect elementRect() const;
     80    virtual LayoutSize size() const;
     81    virtual LayoutRect elementRect() const;
    8282
    8383    virtual bool accessibilityIsIgnored() const;

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

    r63994 r93272  
    6464}
    6565   
    66 IntRect AccessibilityTableColumn::elementRect() const
     66LayoutRect AccessibilityTableColumn::elementRect() const
    6767{
    6868    // this will be filled in when addChildren is called
    … …  
    7070}
    7171
    72 IntSize AccessibilityTableColumn::size() const
     72LayoutSize AccessibilityTableColumn::size() const
    7373{
    7474    return elementRect().size();

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

    r55818 r93272  
    6060    virtual void addChildren();
    6161   
    62     virtual IntSize size() const;
    63     virtual IntRect elementRect() const;
     62    virtual LayoutSize size() const;
     63    virtual LayoutRect elementRect() const;
    6464   
    6565private:   
    6666    AccessibilityTable* m_parentTable;
    6767    int m_columnIndex;
    68     IntRect m_columnRect;
     68    LayoutRect m_columnRect;
    6969   
    7070    AccessibilityObject* headerObjectForSection(RenderTableSection*, bool thTagRequired);

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

    r70554 r93272  
    5757    return m_children;
    5858}
    59    
    60 IntRect AccessibilityTableHeaderContainer::elementRect() const
     59
     60LayoutRect AccessibilityTableHeaderContainer::elementRect() const
    6161{
    6262    // this will be filled in when addChildren is called
    6363    return m_headerRect;
    6464}
    65    
    66 IntSize AccessibilityTableHeaderContainer::size() const
     65
     66LayoutSize AccessibilityTableHeaderContainer::size() const
    6767{
    6868    return elementRect().size();
    6969}
    70    
     70
    7171bool AccessibilityTableHeaderContainer::accessibilityIsIgnored() const
    7272{

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

    r55818 r93272  
    5252    virtual void addChildren();
    5353   
    54     virtual IntSize size() const;
    55     virtual IntRect elementRect() const;
     54    virtual LayoutSize size() const;
     55    virtual LayoutRect elementRect() const;
    5656   
    5757private:
    5858    AccessibilityTable* m_parentTable;
    59     IntRect m_headerRect;
     59    LayoutRect m_headerRect;
    6060   
    6161    virtual bool accessibilityIsIgnored() const;

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

    r93226 r93272  
    13721372- (NSValue *)position
    13731373{
    1374     IntRect rect = m_object->elementRect();
     1374    LayoutRect rect = m_object->elementRect();
    13751375    NSPoint point;
    13761376   
    … …  
    13891389        NSPoint scrollPosition = NSMakePoint(0, 0);
    13901390        if (frameView && !m_object->isScrollbar() && !m_object->isScrollView()) {
    1391             IntPoint frameScrollPos = frameView->scrollPosition();
     1391            LayoutPoint frameScrollPos = frameView->scrollPosition();
    13921392            scrollPosition = NSMakePoint(frameScrollPos.x(), frameScrollPos.y());
    13931393        }
    … …  
    19581958
    19591959    if ([attributeName isEqualToString: NSAccessibilitySizeAttribute]) {
    1960         IntSize s = m_object->size();
     1960        LayoutSize s = m_object->size();
    19611961        return [NSValue valueWithSize: NSMakeSize(s.width(), s.height())];
    19621962    }
    … …  
    25702570
    25712571    // Simulate a click in the middle of the object.
    2572     IntPoint clickPoint = m_object->clickPoint();
     2572    LayoutPoint clickPoint = m_object->clickPoint();
    25732573   
    25742574    PlatformMouseEvent mouseEvent(clickPoint, clickPoint, RightButton, MouseEventPressed, 1, false, false, false, false, currentTime());
Note: See TracChangeset for help on using the changeset viewer.