Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2008 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 58 AXTable::~AXTable() | 58 AXTable::~AXTable() |
| 59 { | 59 { |
| 60 } | 60 } |
| 61 | 61 |
| 62 void AXTable::init() | 62 void AXTable::init() |
| 63 { | 63 { |
| 64 AXLayoutObject::init(); | 64 AXLayoutObject::init(); |
| 65 m_isAXTable = isTableExposableThroughAccessibility(); | 65 m_isAXTable = isTableExposableThroughAccessibility(); |
| 66 } | 66 } |
| 67 | 67 |
| 68 PassRefPtr<AXTable> AXTable::create(LayoutObject* layoutObject, AXObjectCacheImp l& axObjectCache) | 68 PassRefPtrWillBeRawPtr<AXTable> AXTable::create(LayoutObject* layoutObject, AXOb jectCacheImpl& axObjectCache) |
| 69 { | 69 { |
| 70 return adoptRef(new AXTable(layoutObject, axObjectCache)); | 70 return adoptRefWillBeNoop(new AXTable(layoutObject, axObjectCache)); |
| 71 } | 71 } |
| 72 | 72 |
| 73 bool AXTable::hasARIARole() const | 73 bool AXTable::hasARIARole() const |
| 74 { | 74 { |
| 75 if (!m_layoutObject) | 75 if (!m_layoutObject) |
| 76 return false; | 76 return false; |
| 77 | 77 |
| 78 AccessibilityRole ariaRole = ariaRoleAttribute(); | 78 AccessibilityRole ariaRole = ariaRoleAttribute(); |
| 79 if (ariaRole != UnknownRole) | 79 if (ariaRole != UnknownRole) |
| 80 return true; | 80 return true; |
| (...skipping 454 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 535 pair<unsigned, unsigned> rowRange; | 535 pair<unsigned, unsigned> rowRange; |
| 536 AXTableCell* tableCellChild = toAXTableCell(child); | 536 AXTableCell* tableCellChild = toAXTableCell(child); |
| 537 tableCellChild->columnIndexRange(columnRange); | 537 tableCellChild->columnIndexRange(columnRange); |
| 538 tableCellChild->rowIndexRange(rowRange); | 538 tableCellChild->rowIndexRange(rowRange); |
| 539 | 539 |
| 540 if ((column >= columnRange.first && column < (columnRange.first + co lumnRange.second)) | 540 if ((column >= columnRange.first && column < (columnRange.first + co lumnRange.second)) |
| 541 && (row >= rowRange.first && row < (rowRange.first + rowRange.se cond))) | 541 && (row >= rowRange.first && row < (rowRange.first + rowRange.se cond))) |
| 542 return tableCellChild; | 542 return tableCellChild; |
| 543 } | 543 } |
| 544 } | 544 } |
| 545 | |
|
tkent
2015/06/25 00:20:47
unnecessary change
| |
| 546 return 0; | 545 return 0; |
| 547 } | 546 } |
| 548 | 547 |
| 549 AccessibilityRole AXTable::roleValue() const | 548 AccessibilityRole AXTable::roleValue() const |
| 550 { | 549 { |
| 551 if (!isAXTable()) | 550 if (!isAXTable()) |
| 552 return AXLayoutObject::roleValue(); | 551 return AXLayoutObject::roleValue(); |
| 553 | 552 |
| 554 return TableRole; | 553 return TableRole; |
| 555 } | 554 } |
| (...skipping 29 matching lines...) Expand all Loading... | |
| 585 title = caption->innerText(); | 584 title = caption->innerText(); |
| 586 } | 585 } |
| 587 | 586 |
| 588 // try the standard | 587 // try the standard |
| 589 if (title.isEmpty()) | 588 if (title.isEmpty()) |
| 590 title = AXLayoutObject::deprecatedTitle(mode); | 589 title = AXLayoutObject::deprecatedTitle(mode); |
| 591 | 590 |
| 592 return title; | 591 return title; |
| 593 } | 592 } |
| 594 | 593 |
| 594 DEFINE_TRACE(AXTable) | |
| 595 { | |
| 596 visitor->trace(m_rows); | |
| 597 visitor->trace(m_columns); | |
| 598 visitor->trace(m_headerContainer); | |
| 599 AXLayoutObject::trace(visitor); | |
| 600 } | |
| 601 | |
| 595 } // namespace blink | 602 } // namespace blink |
| OLD | NEW |